[netfilter-cvslog] r6416 - in trunk/libnetfilter_conntrack: include/libnetfilter_conntrack src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2006-01-15 04:08:46 +0100 (Sun, 15 Jan 2006)
New Revision: 6416

Modified:
   trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
   trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h
   trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h
   trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
o Add missing layer-3 protocol flags for the expectation tuple
o Update copyright date



Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h	2006-01-14 21:29:14 UTC (rev 6415)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h	2006-01-15 03:08:46 UTC (rev 6416)
@@ -28,7 +28,13 @@
 	SCTP_MASK_DPORT = (1 << SCTP_MASK_DPORT_BIT),
 
 	SCTP_STATE_BIT = 6,
-	SCTP_STATE = (1 << SCTP_STATE_BIT)
+	SCTP_STATE = (1 << SCTP_STATE_BIT),
+
+	SCTP_EXPTUPLE_SPORT_BIT = 7,
+	SCTP_EXPTUPLE_SPORT = (1 << SCTP_EXPTUPLE_SPORT_BIT),
+
+	SCTP_EXPTUPLE_DPORT_BIT = 8,
+	SCTP_EXPTUPLE_DPORT = (1 << SCTP_EXPTUPLE_DPORT_BIT)
 };
 
 #endif

Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h	2006-01-14 21:29:14 UTC (rev 6415)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h	2006-01-15 03:08:46 UTC (rev 6416)
@@ -28,7 +28,13 @@
 	TCP_MASK_DPORT = (1 << TCP_MASK_DPORT_BIT),
 
 	TCP_STATE_BIT = 6,
-	TCP_STATE = (1 << TCP_STATE_BIT)
+	TCP_STATE = (1 << TCP_STATE_BIT),
+
+	TCP_EXPTUPLE_SPORT_BIT = 7,
+	TCP_EXPTUPLE_SPORT = (1 << TCP_EXPTUPLE_SPORT_BIT),
+
+	TCP_EXPTUPLE_DPORT_BIT = 8,
+	TCP_EXPTUPLE_DPORT = (1 << TCP_EXPTUPLE_DPORT_BIT)
 };
 
 #endif

Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h	2006-01-14 21:29:14 UTC (rev 6415)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h	2006-01-15 03:08:46 UTC (rev 6416)
@@ -27,8 +27,11 @@
 	UDP_MASK_DPORT_BIT = 5,
 	UDP_MASK_DPORT = (1 << UDP_MASK_DPORT_BIT),
 
-	UDP_STATE_BIT = 6,
-	UDP_STATE = (1 << UDP_STATE_BIT)
+	UDP_EXPTUPLE_SPORT_BIT = 6,
+	UDP_EXPTUPLE_SPORT = (1 << UDP_EXPTUPLE_SPORT_BIT),
+
+	UDP_EXPTUPLE_DPORT_BIT = 7,
+	UDP_EXPTUPLE_DPORT = (1 << UDP_EXPTUPLE_DPORT_BIT)
 };
 
 #endif

Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2006-01-14 21:29:14 UTC (rev 6415)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2006-01-15 03:08:46 UTC (rev 6416)
@@ -1,6 +1,6 @@
 /*
- * (C) 2005 by Pablo Neira Ayuso <pablo at netfilter.org>
- *             Harald Welte <laforge at netfilter.org>
+ * (C) 2005-2006 by Pablo Neira Ayuso <pablo at netfilter.org>
+ *                  Harald Welte <laforge at netfilter.org>
  *
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by