diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-07 10:36:39 -0700 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-07 10:36:39 -0700 |
| commit | 375a9a47f361a5abc7aa8674979a0ac881d45d90 (patch) | |
| tree | 5ba0655e074c81026f93662f53207c02e53ce0cc /include | |
| parent | 8be92f09aadafa0cd2d946145ac5f86711229e70 (diff) | |
| parent | ee7cde037f8c39981df1237db4e8d8abfc06692d (diff) | |
| download | conntrack-tools-375a9a47f361a5abc7aa8674979a0ac881d45d90.tar.gz conntrack-tools-375a9a47f361a5abc7aa8674979a0ac881d45d90.zip | |
Merge branch 'cthelper12' of git://git.netfilter.org/conntrack-tools into pacifica
Conflicts:
include/helper.h
src/expect.c
src/helpers/ftp.c
src/helpers/rpc.c
src/helpers/tns.c
tests/conntrackd/cthelper/main.c
tests/conntrackd/cthelper/run-test.sh
Diffstat (limited to 'include')
| -rw-r--r-- | include/helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/helper.h b/include/helper.h index ce5ae9b..02ff3df 100644 --- a/include/helper.h +++ b/include/helper.h @@ -41,7 +41,7 @@ struct ctd_helper_instance { struct ctd_helper_policy policy[CTD_HELPER_POLICY_MAX]; }; -extern int cthelper_expect_init(struct nf_expect *exp, struct nf_conntrack *master, uint32_t class, union nfct_attr_grp_addr *saddr, union nfct_attr_grp_addr *daddr, uint8_t l4proto, uint16_t *sport, uint16_t *dport); +extern int cthelper_expect_init(struct nf_expect *exp, struct nf_conntrack *master, uint32_t class, union nfct_attr_grp_addr *saddr, union nfct_attr_grp_addr *daddr, uint8_t l4proto, uint16_t *sport, uint16_t *dport, uint32_t flags); extern int cthelper_add_expect(struct nf_expect *exp); extern int cthelper_del_expect(struct nf_expect *exp); |