aboutsummaryrefslogtreecommitdiffstats
path: root/net/key
diff options
context:
space:
mode:
authorMasahide NAKAMURA <nakam@linux-ipv6.org>2006-09-22 18:05:15 -0400
committerDavid S. Miller <davem@davemloft.net>2006-09-22 18:05:15 -0400
commit7e49e6de30efa716614e280d97963c570f3acf29 (patch)
tree8eaef9d40300d16a7675722e082c5d8ab2a53d40 /net/key
parent77d16f450ae0452d7d4b009f78debb1294fb435c (diff)
[XFRM]: Add XFRM_MODE_xxx for future use.
Transformation mode is used as either IPsec transport or tunnel. It is required to add two more items, route optimization and inbound trigger for Mobile IPv6. Based on MIPL2 kernel patch. This patch was also written by: Ville Nuorvala <vnuorval@tcs.hut.fi> 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>
Diffstat (limited to 'net/key')
-rw-r--r--net/key/af_key.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 797c744a843..19e047b0e67 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1765,7 +1765,7 @@ parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq)
1765 } 1765 }
1766 1766
1767 /* addresses present only in tunnel mode */ 1767 /* addresses present only in tunnel mode */
1768 if (t->mode) { 1768 if (t->mode == XFRM_MODE_TUNNEL) {
1769 switch (xp->family) { 1769 switch (xp->family) {
1770 case AF_INET: 1770 case AF_INET:
1771 sin = (void*)(rq+1); 1771 sin = (void*)(rq+1);
@@ -1997,7 +1997,7 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
1997 int req_size; 1997 int req_size;
1998 1998
1999 req_size = sizeof(struct sadb_x_ipsecrequest); 1999 req_size = sizeof(struct sadb_x_ipsecrequest);
2000 if (t->mode) 2000 if (t->mode == XFRM_MODE_TUNNEL)
2001 req_size += 2*socklen; 2001 req_size += 2*socklen;
2002 else 2002 else
2003 size -= 2*socklen; 2003 size -= 2*socklen;
@@ -2013,7 +2013,7 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
2013 if (t->optional) 2013 if (t->optional)
2014 rq->sadb_x_ipsecrequest_level = IPSEC_LEVEL_USE; 2014 rq->sadb_x_ipsecrequest_level = IPSEC_LEVEL_USE;
2015 rq->sadb_x_ipsecrequest_reqid = t->reqid; 2015 rq->sadb_x_ipsecrequest_reqid = t->reqid;
2016 if (t->mode) { 2016 if (t->mode == XFRM_MODE_TUNNEL) {
2017 switch (xp->family) { 2017 switch (xp->family) {
2018 case AF_INET: 2018 case AF_INET:
2019 sin = (void*)(rq+1); 2019 sin = (void*)(rq+1);