diff options
author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-02-08 11:43:43 -0800 |
---|---|---|
committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-02-08 11:43:43 -0800 |
commit | 21e68c7e4653ff077d0f0182b5d1da2f8645b6c6 (patch) | |
tree | 3e86c2264d2180f373dea397dabd69aff2c7b744 /include/network.h | |
parent | d77e9945ef364e7bc38aea018f0be80ca2d39250 (diff) | |
parent | 9f9a63cecdc6ac4f449d3eacda6c591f0de9fbf3 (diff) | |
download | conntrack-tools-21e68c7e4653ff077d0f0182b5d1da2f8645b6c6.tar.gz conntrack-tools-21e68c7e4653ff077d0f0182b5d1da2f8645b6c6.zip |
Merge branch 'upstream' into oxnard
Diffstat (limited to 'include/network.h')
-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 }; |