[Ipsec-tools-commits] htdocs freebsd6-natt.diff,1.1,1.2

[VANHULLEBUS Y. <va...@us...>]

Update of /cvsroot/ipsec-tools/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5466

Modified Files:
	freebsd6-natt.diff 
Log Message:
ENABLE_NATT -> IPSEC_NAT_T

Index: freebsd6-natt.diff
===================================================================
RCS file: /cvsroot/ipsec-tools/htdocs/freebsd6-natt.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freebsd6-natt.diff	25 Jul 2005 08:32:57 -0000	1.1
+++ freebsd6-natt.diff	20 Aug 2005 13:44:40 -0000	1.2
@@ -102,7 +102,7 @@
  		return;
  	}
  #endif /*IPSEC || FAST_IPSEC*/
-+#ifdef ENABLE_NATT
++#ifdef IPSEC_NAT_T
 +	/* Handle ESP over UDP */
 +	if (inp->inp_flags & INP_ESPINUDP_ALL) {
 +		struct sockaddr_in src;
@@ -368,7 +368,7 @@
  		hdrsiz = sizeof(struct newesp) + ivlen + 9 + authlen;
  	}
  
-+#ifdef ENABLE_NATT
++#ifdef IPSEC_NAT_T
 +	/*
 +	 * If NAT-T is enabled, add the space for UDP encapsulation
 +	 */
@@ -388,7 +388,7 @@
  	 *	16 = maximum ICV we support.
 +	 *  sizeof(struct udphdr) in case NAT traversal is used
  	 */
-+#if defined (ENABLE_NATT)
++#if defined (IPSEC_NAT_T)
 + 	return sizeof(struct newesp) + esp_max_ivlen() + 9 + 16 +
 +	    sizeof(u_int64_t) + sizeof(struct udphdr);
 +#else
@@ -401,7 +401,7 @@
  	size_t extendsiz;
  	int error = 0;
  	struct ipsecstat *stat;
-+#ifdef ENABLE_NATT
++#ifdef IPSEC_NAT_T
 +	struct udphdr *udp = NULL;
 +#endif
  
@@ -411,7 +411,7 @@
  
  	espoff = m->m_pkthdr.len - plen;
  
-+#ifdef ENABLE_NATT
++#ifdef IPSEC_NAT_T
 +	if (sav->natt_type != 0) {
 +		esphlen += sizeof(struct udphdr);
 +		espoff += sizeof(struct udphdr);
@@ -438,7 +438,7 @@
  		esp = mtod(md, struct esp *);
  	}
  
-+#ifdef ENABLE_NATT
++#ifdef IPSEC_NAT_T
 +	if (sav->natt_type != 0) {
 +		udp = (struct udphdr *)esp;
 +		esp = (struct esp *)(udp + 1);
@@ -460,7 +460,7 @@
  		break;
  	}
  
-+#ifdef ENABLE_NATT
++#ifdef IPSEC_NAT_T
 +	if (sav->natt_type != 0) {
 +		*nexthdrp = IPPROTO_UDP;
 +
@@ -488,7 +488,7 @@
  	}
      }
 +
-+#ifdef ENABLE_NATT
++#ifdef IPSEC_NAT_T
 +	if (sav->natt_type != 0) {
 +		struct ip *ip;
 +		ip = mtod(m, struct ip *);
@@ -671,7 +671,7 @@
  		case SADB_EXT_SPIRANGE:
  		case SADB_X_EXT_POLICY:
  		case SADB_X_EXT_SA2:
-+#ifdef ENABLE_NATT
++#ifdef IPSEC_NAT_T
 +		case SADB_X_EXT_NAT_T_TYPE:
 +		case SADB_X_EXT_NAT_T_SPORT:
 +		case SADB_X_EXT_NAT_T_DPORT:
@@ -700,7 +700,7 @@
  INET6			opt_inet6.h
  IPSEC			opt_ipsec.h
  IPSEC_ESP		opt_ipsec.h
-+ENABLE_NATT		opt_ipsec.h
++IPSEC_NAT_T		opt_ipsec.h
  IPSEC_DEBUG		opt_ipsec.h
  IPSEC_FILTERGIF		opt_ipsec.h
  FAST_IPSEC		opt_ipsec.h