Merge git://oss.sgi.com:8090/xfs/xfs-2.6
[linux-drm-fsl-dcu.git] / net / ipv6 / xfrm6_state.c
index b33296b3f6de5ddd25a818ba6ae306444770cfe8..baa461b9f74eebf97c654aa858203dcf010aa7e8 100644 (file)
@@ -8,7 +8,7 @@
  *             IPv6 support
  *     YOSHIFUJI Hideaki @USAGI
  *             Split up af-specific portion
- *     
+ *
  */
 
 #include <net/xfrm.h>
@@ -29,9 +29,9 @@ __xfrm6_init_tempsel(struct xfrm_state *x, struct flowi *fl,
        ipv6_addr_copy((struct in6_addr *)&x->sel.daddr, &fl->fl6_dst);
        ipv6_addr_copy((struct in6_addr *)&x->sel.saddr, &fl->fl6_src);
        x->sel.dport = xfrm_flowi_dport(fl);
-       x->sel.dport_mask = ~0;
+       x->sel.dport_mask = htons(0xffff);
        x->sel.sport = xfrm_flowi_sport(fl);
-       x->sel.sport_mask = ~0;
+       x->sel.sport_mask = htons(0xffff);
        x->sel.prefixlen_d = 128;
        x->sel.prefixlen_s = 128;
        x->sel.proto = fl->proto;
@@ -42,102 +42,136 @@ __xfrm6_init_tempsel(struct xfrm_state *x, struct flowi *fl,
        memcpy(&x->props.saddr, &tmpl->saddr, sizeof(x->props.saddr));
        if (ipv6_addr_any((struct in6_addr*)&x->props.saddr))
                memcpy(&x->props.saddr, saddr, sizeof(x->props.saddr));
-       if (tmpl->mode && ipv6_addr_any((struct in6_addr*)&x->props.saddr)) {
-               struct rt6_info *rt;
-               struct flowi fl_tunnel = {
-                       .nl_u = {
-                               .ip6_u = {
-                                       .daddr = *(struct in6_addr *)daddr,
-                               }
-                       }
-               };
-               if (!xfrm_dst_lookup((struct xfrm_dst **)&rt,
-                                    &fl_tunnel, AF_INET6)) {
-                       ipv6_get_saddr(&rt->u.dst, (struct in6_addr *)daddr,
-                                      (struct in6_addr *)&x->props.saddr);
-                       dst_release(&rt->u.dst);
-               }
-       }
        x->props.mode = tmpl->mode;
        x->props.reqid = tmpl->reqid;
        x->props.family = AF_INET6;
 }
 
-static struct xfrm_state *
-__xfrm6_state_lookup(xfrm_address_t *daddr, u32 spi, u8 proto)
+static int
+__xfrm6_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n)
 {
-       unsigned h = __xfrm6_spi_hash(daddr, spi, proto);
-       struct xfrm_state *x;
-
-       list_for_each_entry(x, xfrm6_state_afinfo.state_byspi+h, byspi) {
-               if (x->props.family == AF_INET6 &&
-                   spi == x->id.spi &&
-                   ipv6_addr_equal((struct in6_addr *)daddr, (struct in6_addr *)x->id.daddr.a6) &&
-                   proto == x->id.proto) {
-                       xfrm_state_hold(x);
-                       return x;
+       int i;
+       int j = 0;
+
+       /* Rule 1: select IPsec transport except AH */
+       for (i = 0; i < n; i++) {
+               if (src[i]->props.mode == XFRM_MODE_TRANSPORT &&
+                   src[i]->id.proto != IPPROTO_AH) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
+               }
+       }
+       if (j == n)
+               goto end;
+
+       /* Rule 2: select MIPv6 RO or inbound trigger */
+#ifdef CONFIG_IPV6_MIP6
+       for (i = 0; i < n; i++) {
+               if (src[i] &&
+                   (src[i]->props.mode == XFRM_MODE_ROUTEOPTIMIZATION ||
+                    src[i]->props.mode == XFRM_MODE_IN_TRIGGER)) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
+               }
+       }
+       if (j == n)
+               goto end;
+#endif
+
+       /* Rule 3: select IPsec transport AH */
+       for (i = 0; i < n; i++) {
+               if (src[i] &&
+                   src[i]->props.mode == XFRM_MODE_TRANSPORT &&
+                   src[i]->id.proto == IPPROTO_AH) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
+               }
+       }
+       if (j == n)
+               goto end;
+
+       /* Rule 4: select IPsec tunnel */
+       for (i = 0; i < n; i++) {
+               if (src[i] &&
+                   src[i]->props.mode == XFRM_MODE_TUNNEL) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
+               }
+       }
+       if (likely(j == n))
+               goto end;
+
+       /* Final rule */
+       for (i = 0; i < n; i++) {
+               if (src[i]) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
                }
        }
-       return NULL;
+
+ end:
+       return 0;
 }
 
-static struct xfrm_state *
-__xfrm6_find_acq(u8 mode, u32 reqid, u8 proto, 
-                xfrm_address_t *daddr, xfrm_address_t *saddr, 
-                int create)
+static int
+__xfrm6_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n)
 {
-       struct xfrm_state *x, *x0;
-       unsigned h = __xfrm6_dst_hash(daddr);
-
-       x0 = NULL;
-
-       list_for_each_entry(x, xfrm6_state_afinfo.state_bydst+h, bydst) {
-               if (x->props.family == AF_INET6 &&
-                   ipv6_addr_equal((struct in6_addr *)daddr, (struct in6_addr *)x->id.daddr.a6) &&
-                   mode == x->props.mode &&
-                   proto == x->id.proto &&
-                   ipv6_addr_equal((struct in6_addr *)saddr, (struct in6_addr *)x->props.saddr.a6) &&
-                   reqid == x->props.reqid &&
-                   x->km.state == XFRM_STATE_ACQ &&
-                   !x->id.spi) {
-                           x0 = x;
-                           break;
-                   }
+       int i;
+       int j = 0;
+
+       /* Rule 1: select IPsec transport */
+       for (i = 0; i < n; i++) {
+               if (src[i]->mode == XFRM_MODE_TRANSPORT) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
+               }
+       }
+       if (j == n)
+               goto end;
+
+       /* Rule 2: select MIPv6 RO or inbound trigger */
+#ifdef CONFIG_IPV6_MIP6
+       for (i = 0; i < n; i++) {
+               if (src[i] &&
+                   (src[i]->mode == XFRM_MODE_ROUTEOPTIMIZATION ||
+                    src[i]->mode == XFRM_MODE_IN_TRIGGER)) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
+               }
        }
-       if (!x0 && create && (x0 = xfrm_state_alloc()) != NULL) {
-               ipv6_addr_copy((struct in6_addr *)x0->sel.daddr.a6,
-                              (struct in6_addr *)daddr);
-               ipv6_addr_copy((struct in6_addr *)x0->sel.saddr.a6,
-                              (struct in6_addr *)saddr);
-               x0->sel.prefixlen_d = 128;
-               x0->sel.prefixlen_s = 128;
-               ipv6_addr_copy((struct in6_addr *)x0->props.saddr.a6,
-                              (struct in6_addr *)saddr);
-               x0->km.state = XFRM_STATE_ACQ;
-               ipv6_addr_copy((struct in6_addr *)x0->id.daddr.a6,
-                              (struct in6_addr *)daddr);
-               x0->id.proto = proto;
-               x0->props.family = AF_INET6;
-               x0->props.mode = mode;
-               x0->props.reqid = reqid;
-               x0->lft.hard_add_expires_seconds = XFRM_ACQ_EXPIRES;
-               xfrm_state_hold(x0);
-               x0->timer.expires = jiffies + XFRM_ACQ_EXPIRES*HZ;
-               add_timer(&x0->timer);
-               xfrm_state_hold(x0);
-               list_add_tail(&x0->bydst, xfrm6_state_afinfo.state_bydst+h);
-               wake_up(&km_waitq);
+       if (j == n)
+               goto end;
+#endif
+
+       /* Rule 3: select IPsec tunnel */
+       for (i = 0; i < n; i++) {
+               if (src[i] &&
+                   src[i]->mode == XFRM_MODE_TUNNEL) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
+               }
        }
-       if (x0)
-               xfrm_state_hold(x0);
-       return x0;
+       if (likely(j == n))
+               goto end;
+
+       /* Final rule */
+       for (i = 0; i < n; i++) {
+               if (src[i]) {
+                       dst[j++] = src[i];
+                       src[i] = NULL;
+               }
+       }
+
+ end:
+       return 0;
 }
 
 static struct xfrm_state_afinfo xfrm6_state_afinfo = {
        .family                 = AF_INET6,
        .init_tempsel           = __xfrm6_init_tempsel,
-       .state_lookup           = __xfrm6_state_lookup,
-       .find_acq               = __xfrm6_find_acq,
+       .tmpl_sort              = __xfrm6_tmpl_sort,
+       .state_sort             = __xfrm6_state_sort,
+       .output                 = xfrm6_output,
 };
 
 void __init xfrm6_state_init(void)