diff options
author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-02-08 11:31:31 -0800 |
---|---|---|
committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-02-08 11:31:31 -0800 |
commit | 9f9a63cecdc6ac4f449d3eacda6c591f0de9fbf3 (patch) | |
tree | 18e6fef8b6e8640db261b6448eb7f25411139474 /include | |
parent | 66da74b336fe66472f9b5d16f730e0261c5ef4af (diff) | |
parent | 167eb3e2028561ab2cc0f2b7b6ff9d24c56514f6 (diff) | |
download | conntrack-tools-9f9a63cecdc6ac4f449d3eacda6c591f0de9fbf3.tar.gz conntrack-tools-9f9a63cecdc6ac4f449d3eacda6c591f0de9fbf3.zip |
Merge branch 'master' of git://git.netfilter.org/conntrack-tools into upstream
Diffstat (limited to 'include')
-rw-r--r-- | include/network.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/network.h b/include/network.h index ab95499..41c35af 100644 --- a/include/network.h +++ b/include/network.h @@ -239,6 +239,7 @@ enum nta_attr { NTA_ICMP_ID, /* uint16_t */ NTA_TCP_WSCALE_ORIG, /* uint8_t */ NTA_TCP_WSCALE_REPL, /* uint8_t */ + NTA_HELPER_NAME, /* string (variable length) */ NTA_MAX }; @@ -269,6 +270,13 @@ enum nta_exp_attr { NTA_EXP_MASK_PORT, /* struct nfct_attr_grp_port */ NTA_EXP_TIMEOUT, /* uint32_t */ NTA_EXP_FLAGS, /* uint32_t */ + NTA_EXP_CLASS, /* uint32_t */ + NTA_EXP_NAT_IPV4, /* struct nfct_attr_grp_ipv4 */ + NTA_EXP_NAT_PORT, /* struct nfct_attr_grp_port */ + NTA_EXP_NAT_L4PROTO, /* uint8_t */ + NTA_EXP_NAT_DIR, /* uint32_t */ + NTA_EXP_HELPER_NAME, /* string (variable length) */ + NTA_EXP_FN, /* string (variable length) */ NTA_EXP_MAX }; |