diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-01 11:53:27 -0700 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-01 11:53:27 -0700 |
| commit | a73f21e48caff390fde2c1a31e55fe1fba2c82fa (patch) | |
| tree | 3aaacd833b4f3031844145536aee38f4b14d24bb /src/helpers | |
| parent | e280eb85e28fae26cb3ae44b70dfba91b6c55867 (diff) | |
| parent | aa7568b25453f75740fa9239185052f152af36d6 (diff) | |
| download | conntrack-tools-user_space_helpers.tar.gz conntrack-tools-user_space_helpers.zip | |
Merge branch 'cthelper10' of git://git.netfilter.org/conntrack-tools into user_space_helpersuser_space_helpers
Conflicts:
src/cthelper.c
src/helpers/ftp.c
src/helpers/tns.c
Diffstat (limited to 'src/helpers')
| -rw-r--r-- | src/helpers/ftp.c | 2 | ||||
| -rw-r--r-- | src/helpers/tns.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/helpers/ftp.c b/src/helpers/ftp.c index c6ad7da..2772199 100644 --- a/src/helpers/ftp.c +++ b/src/helpers/ftp.c @@ -423,7 +423,7 @@ static unsigned int nf_nat_ftp(struct pkt_buff *pkt, if (!buflen) goto out; - if (!nfq_tcp_mangle(pkt, matchoff, matchlen, buffer, buflen)) + if (!nfq_tcp_mangle_ipv4(pkt, matchoff, matchlen, buffer, buflen)) goto out; return NF_ACCEPT; diff --git a/src/helpers/tns.c b/src/helpers/tns.c index 77f01d9..c4bfb91 100644 --- a/src/helpers/tns.c +++ b/src/helpers/tns.c @@ -242,7 +242,7 @@ nf_nat_tns(struct pkt_buff *pkt, struct tns_header *tns, struct nf_expect *exp, if (!buflen) goto out; - if (!nfq_tcp_mangle(pkt, matchoff, matchlen, buffer, buflen)) + if (!nfq_tcp_mangle_ipv4(pkt, matchoff, matchlen, buffer, buflen)) goto out; if (buflen != matchlen) { |