diff options
| author | Alex Harpin <development@landsofshadow.co.uk> | 2015-11-21 14:44:29 +0000 |
|---|---|---|
| committer | Alex Harpin <development@landsofshadow.co.uk> | 2015-11-21 14:44:29 +0000 |
| commit | 2a53b5dfee3c80b4c4940ad4c73c82248b4571bb (patch) | |
| tree | 73a4fe81edc619a6180ee8d1a02ef5b1942ba910 /tests | |
| parent | 1e0476f8157fc09c6f9ff086e7b55452b39ea48d (diff) | |
| parent | e61ac9a2e58cdcf6dc9a12d32b1f221e078e5d05 (diff) | |
| download | conntrack-tools-2a53b5dfee3c80b4c4940ad4c73c82248b4571bb.tar.gz conntrack-tools-2a53b5dfee3c80b4c4940ad4c73c82248b4571bb.zip | |
Merge tag 'conntrack-tools-1.4.0' into lithium
conntrack-tools 1.4.0 release
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conntrackd/cthelper/expect.c | 3 | ||||
| -rwxr-xr-x | tests/conntrackd/cthelper/main.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/conntrackd/cthelper/expect.c b/tests/conntrackd/cthelper/expect.c index c667293..d1d1d28 100644 --- a/tests/conntrackd/cthelper/expect.c +++ b/tests/conntrackd/cthelper/expect.c @@ -25,7 +25,8 @@ 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) + uint8_t l4proto, uint16_t *sport, uint16_t *dport, + uint32_t flags) { struct nf_conntrack *expected, *mask; diff --git a/tests/conntrackd/cthelper/main.c b/tests/conntrackd/cthelper/main.c index f229c5d..7021f00 100755 --- a/tests/conntrackd/cthelper/main.c +++ b/tests/conntrackd/cthelper/main.c @@ -119,10 +119,10 @@ cthelper_process_packet(const uint8_t *pkt, uint32_t pktlen, ct->myct->ct = tmp; if (pktb_mangled(pktb)) { - int i; + uint32_t i; uint8_t *data = pktb_network_header(pktb); - printf("\e[1;31mmangled content: ", pktb_len(pktb)); + printf("\e[1;31mmangled content: "); for (i=0; i < pktb_len(pktb); i++) printf("%c", data[i]); |