Skip to content

Commit

Permalink
[XFRM]: Rename secpath_has_tunnel to secpath_has_nontransport.
Browse files Browse the repository at this point in the history
On current kernel inbound transformation state is allowed transport and
disallowed tunnel mode when mismatch is occurred between tempates and states.
As the result of adding two more modes by Mobile IPv6, this function name
is misleading. Inbound transformation can allow only transport mode
when mismatch is occurred between template and secpath.
Based on MIPL2 kernel patch.

Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Masahide NAKAMURA authored and David S. Miller committed Sep 22, 2006
1 parent fbd9a5b commit 9e51fd3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/xfrm/xfrm_policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, unsigned short family
}
EXPORT_SYMBOL(xfrm_decode_session);

static inline int secpath_has_tunnel(struct sec_path *sp, int k)
static inline int secpath_has_nontransport(struct sec_path *sp, int k)
{
for (; k < sp->len; k++) {
if (sp->xvec[k]->props.mode != XFRM_MODE_TRANSPORT)
Expand Down Expand Up @@ -1087,7 +1087,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
xfrm_policy_lookup);

if (!pol)
return !skb->sp || !secpath_has_tunnel(skb->sp, 0);
return !skb->sp || !secpath_has_nontransport(skb->sp, 0);

pol->curlft.use_time = (unsigned long)xtime.tv_sec;

Expand All @@ -1111,7 +1111,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
goto reject;
}

if (secpath_has_tunnel(sp, k))
if (secpath_has_nontransport(sp, k))
goto reject;

xfrm_pol_put(pol);
Expand Down

0 comments on commit 9e51fd3

Please sign in to comment.