src/patches/openswan-2.6.14-kernel-2.6.24.7-natt.patch

   1 --- /dev/null   Tue Mar 11 13:02:56 2003
   2 +++ nat-t/include/net/xfrmudp.h     Mon Feb  9 13:51:03 2004
   3 @@ -0,0 +1,10 @@
   4 +/*
   5 + * pointer to function for type that xfrm4_input wants, to permit
   6 + * decoupling of XFRM from udp.c
   7 + */
   8 +#define HAVE_XFRM4_UDP_REGISTER
   9 +
  10 +typedef int (*xfrm4_rcv_encap_t)(struct sk_buff *skb, __u16 encap_type);
  11 +extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
  12 +                                     , xfrm4_rcv_encap_t *oldfunc);
  13 +extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
  14 --- /distros/kernel/linux-2.6.11.2/net/ipv4/Kconfig     2005-03-09 03:12:33.000000000 -0500
  15 +++ swan26/net/ipv4/Kconfig     2005-04-04 18:46:13.000000000 -0400
  16 @@ -351,2 +351,8 @@
  17
  18 +config IPSEC_NAT_TRAVERSAL
  19 +       bool "IPSEC NAT-Traversal (KLIPS compatible)"
  20 +       depends on INET
  21 +       ---help---
  22 +          Includes support for RFC3947/RFC3948 NAT-Traversal of ESP over UDP.
  23 +
  24  config IP_TCPDIAG
  25 --- plain26/net/ipv4/udp.c.orig 2006-12-28 20:53:17.000000000 -0500
  26 +++ plain26/net/ipv4/udp.c      2007-05-11 10:22:50.000000000 -0400
  27 @@ -108,6 +108,7 @@
  28  #include <net/inet_common.h>
  29  #include <net/checksum.h>
  30  #include <net/xfrm.h>
  31 +#include <net/xfrmudp.h>
  32
  33  /*
  34   *     Snmp MIB for the UDP layer
  35 @@ -881,6 +882,31 @@
  36         sk_common_release(sk);
  37  }
  38
  39 +#if defined(CONFIG_XFRM) || defined(CONFIG_IPSEC_NAT_TRAVERSAL)
  40 +
  41 +static xfrm4_rcv_encap_t xfrm4_rcv_encap_func = NULL;
  42 +int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
  43 +                              , xfrm4_rcv_encap_t *oldfunc)
  44 +{
  45 +  if(oldfunc != NULL) {
  46 +    *oldfunc = xfrm4_rcv_encap_func;
  47 +  }
  48 +
  49 +  xfrm4_rcv_encap_func = func;
  50 +  return 0;
  51 +}
  52 +
  53 +int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func)
  54 +{
  55 +  if(xfrm4_rcv_encap_func != func)
  56 +    return -1;
  57 +
  58 +  xfrm4_rcv_encap_func = NULL;
  59 +  return 0;
  60 +}
  61 +#endif /* CONFIG_XFRM_MODULE || CONFIG_IPSEC_NAT_TRAVERSAL */
  62 +
  63 +
  64  /* return:
  65   *     1  if the the UDP system should process it
  66   *     0  if we should drop this packet
  67 @@ -888,9 +914,9 @@
  68   */
  69  static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
  70  {
  71 -#ifndef CONFIG_XFRM
  72 +#if !defined(CONFIG_XFRM) && !defined(CONFIG_IPSEC_NAT_TRAVERSAL)
  73         return 1;
  74 -#else
  75 +#else /* either CONFIG_XFRM or CONFIG_IPSEC_NAT_TRAVERSAL */
  76         struct udp_sock *up = udp_sk(sk);
  77         struct udphdr *uh;
  78         struct iphdr *iph;
  79 @@ -1018,10 +1044,27 @@
  80                         return 0;
  81                 }
  82                 if (ret < 0) {
  83 -                       /* process the ESP packet */
  84 -                       ret = xfrm4_rcv_encap(skb, up->encap_type);
  85 -                       UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
  86 -                       return -ret;
  87 +                       if(xfrm4_rcv_encap_func != NULL)
  88 +                               ret = (*xfrm4_rcv_encap_func)(skb, up->encap_type);
  89 +
  90 +                       switch(ret) {
  91 +                       case 1:
  92 +                               /* FALLTHROUGH to send-up */;
  93 +                               break;
  94 +
  95 +                       case 0:
  96 +                                /* PROCESSED, free it */
  97 +                               UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
  98 +                               return 0;
  99 +
 100 +                       case -1:
 101 +                               /* PACKET wasn't for _func, or no func, pass it
 102 +                                * to stock function
 103 +                                */
 104 +                               ret = xfrm4_rcv_encap(skb, up->encap_type);
 105 +                               UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
 106 +                               return -ret;
 107 +                       }
 108                 }
 109                 /* FALLTHROUGH -- it's a UDP Packet */
 110         }
 111 @@ -1110,7 +1153,6 @@
 112  /*
 113   *     All we need to do is get the socket, and then do a checksum.
 114   */
 115 -
 116  int udp_rcv(struct sk_buff *skb)
 117  {
 118         struct sock *sk;
 119 @@ -1599,3 +1641,9 @@
 120  EXPORT_SYMBOL(udp_proc_register);
 121  EXPORT_SYMBOL(udp_proc_unregister);
 122  #endif
 123 +
 124 +#if defined(CONFIG_IPSEC_NAT_TRAVERSAL)
 125 +EXPORT_SYMBOL(udp4_register_esp_rcvencap);
 126 +EXPORT_SYMBOL(udp4_unregister_esp_rcvencap);
 127 +#endif
 128 +
 129 make[1]: Leaving directory `/usr/src/openswan-2.6.14'