Skip to contentSkip to conversation

: Rename secpath_has_tunnel to secpath_has_nontransport.

PATCH In review Masahide NAKAMURA 1 participant 1 message Jul 29, 2006

Subsystems (3)
Networking Network drivers Networking IPsec
lore
Share & tools
lore

Masahide NAKAMURA

author
#0 lore raw

PATCH 16/23 : Rename secpath_has_tunnel to secpath_has_nontransport.

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.

---
 net/xfrm/xfrm_policy.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
net/xfrm/xfrm_policy.c +3 -3
index e3c71b6..7368f8a 100644
@@ -1002,7 +1002,7 @@ xfrm_decode_session(struct sk_buff *skb,
 }
 EXPORT_SYMBOL(xfrm_decode_session);
 
-static inline int secpath_has_tunnel(struct sec_path *sp, int k, int *idxp)
+static inline int secpath_has_nontransport(struct sec_path *sp, int k, int *idxp)
 {
 	for (; k < sp->len; k++) {
 		if (sp->xvec[k]->props.mode != XFRM_MODE_TRANSPORT) {

@@ -1055,7 +1055,7 @@ #endif
 					xfrm_policy_lookup);
 
 	if (!pol) {
-		if (skb->sp && secpath_has_tunnel(skb->sp, 0, xerr_idxp)) {
+		if (skb->sp && secpath_has_nontransport(skb->sp, 0, xerr_idxp)) {
 			xfrm_secpath_reject(xerr_idx, skb, &fl);
 			return 0;
 		}

@@ -1087,7 +1087,7 @@ #endif
 			}
 		}
 
-		if (secpath_has_tunnel(sp, k, xerr_idxp))
+		if (secpath_has_nontransport(sp, k, xerr_idxp))
 			goto reject;
 
 		xfrm_pol_put(pol);
Signature · 1 line
1.4.1