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>2005-12-21 09:02:49 +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>2005-12-21 09:02:49 +0000
commit5875e04f38e0e5c09e497dc735e287fc6cc626b3 (patch)
treeb788df0153598c8365221ae602b0964a6cc0b7e4
parent1d1624d49fbf3327aa6086f3f3ef256ad796fa75 (diff)
Yasuyuki confirmed that l3protonum must be u_int8_t instead of u_int16t.svn_t_libnetfilter_conntrack-0.0.29
Another reason to use such type: the nfnetlink header uses u_int8_t to set the layer 3 protocol family, so let's keep some consistency.
-rw-r--r--include/libnetfilter_conntrack/libnetfilter_conntrack.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
index 7f0b7e0..4b751a2 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
@@ -50,18 +50,16 @@ union nfct_l4 {
} sctp;
};
-struct nfct_tuple {
- union {
- u_int32_t v4;
- u_int32_t v6[4];
- } src;
+union nfct_address {
+ u_int32_t v4;
+ u_int32_t v6[4];
+};
- union {
- u_int32_t v4;
- u_int32_t v6[4];
- } dst;
+struct nfct_tuple {
+ union nfct_address src;
+ union nfct_address dst;
- u_int16_t l3protonum;
+ u_int8_t l3protonum;
u_int8_t protonum;
union nfct_l4 l4src;
union nfct_l4 l4dst;