summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org>2006-01-15 03:08:46 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org>2006-01-15 03:08:46 +0000
commit0afc25526d9803d857217bc0b9a9c87e6efb5e77 (patch)
tree97f60bca3b806dcbda73d81c90778a6e5d77a00a
parenta83adf7c7db9d5e059f9fd135e918cd2193aae49 (diff)
o Add missing layer-3 protocol flags for the expectation tuple
o Update copyright date
-rw-r--r--include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h8
-rw-r--r--include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h8
-rw-r--r--include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h7
-rw-r--r--src/libnetfilter_conntrack.c4
4 files changed, 21 insertions, 6 deletions
diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
index 366bc9c..e9026e9 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
@@ -28,7 +28,13 @@ enum sctp_flags {
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
diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h
index 7231417..1fde6cc 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h
@@ -28,7 +28,13 @@ enum tcp_flags {
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
diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h
index 895095e..19df450 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h
@@ -27,8 +27,11 @@ enum udp_flags {
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
diff --git a/src/libnetfilter_conntrack.c b/src/libnetfilter_conntrack.c
index 4a72592..cce33c1 100644
--- a/src/libnetfilter_conntrack.c
+++ b/src/libnetfilter_conntrack.c
@@ -1,6 +1,6 @@
/*
- * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
- * Harald Welte <laforge@netfilter.org>
+ * (C) 2005-2006 by Pablo Neira Ayuso <pablo@netfilter.org>
+ * Harald Welte <laforge@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