[Ipsec-tools-commits] ipsec-tools/src/racoon ChangeLog.natt,1.2.2.10,1.2.2.11 handler.h,1.1.1.2.6.2,1.1.1.2.6.3

[<lu...@us...>]

Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27588

Modified Files:
      Tag: nat-t_branch
	ChangeLog.natt handler.h 
Log Message:
2004-02-06  Michal Ludvig  <ml...@su...>

	* handler.h: Removed field (struct ph1handle)->natt.



Index: ChangeLog.natt
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/Attic/ChangeLog.natt,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.11
diff -u -d -r1.2.2.10 -r1.2.2.11
--- ChangeLog.natt	6 Feb 2004 15:16:39 -0000	1.2.2.10
+++ ChangeLog.natt	6 Feb 2004 15:18:39 -0000	1.2.2.11
@@ -1,5 +1,6 @@
 2004-02-06  Michal Ludvig  <ml...@su...>
 
+	* handler.h: Removed field (struct ph1handle)->natt.
 	* pfkey.c (pk_sendadd, pk_sendupdate): Fill-in NAT-T parameters 
 	  when pr->udp_encap is set (no OA support yet).
 	  (ipsecdoi2pfkey_mode): Treat UDP modes as non-UDP.

Index: handler.h
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/handler.h,v
retrieving revision 1.1.1.2.6.2
retrieving revision 1.1.1.2.6.3
diff -u -d -r1.1.1.2.6.2 -r1.1.1.2.6.3
--- handler.h	5 Feb 2004 12:44:03 -0000	1.1.1.2.6.2
+++ handler.h	6 Feb 2004 15:18:39 -0000	1.1.1.2.6.3
@@ -248,8 +248,6 @@
 	u_int8_t flags;			/* Flags for phase 2 */
 	u_int32_t msgid;		/* msgid for phase 2 */
 
-	u_int32_t udp_encap;		/* UDP encapsulation for NAT-T */
-
 	struct sainfo *sainfo;		/* place holder of sainfo */
 	struct saprop *proposal;	/* SA(s) proposal. */
 	struct saprop *approval;	/* SA(s) approved. */