diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-02-17 22:12:05 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-02-17 22:12:05 +0100 |
| commit | 752a1af93da1381a5ecb921e7519cd9997eb27bc (patch) | |
| tree | 49d7c7f9e04022dd5d3f24028e76cca69ad711c2 /src | |
| parent | 6fbf883d990947d9f7e3b856e5db7f03d45d3aa6 (diff) | |
src: remove reminiscent of NFCT_DIR_ORIGINAL and old prototypes
This patch removes a reminiscent constant of the old API whose value
is the same of __DIR_ORIG. This patch also removes the prototype
definition from libnetfilter_conntrack.h.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/conntrack/build.c | 4 | ||||
| -rw-r--r-- | src/expect/build.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/conntrack/build.c b/src/conntrack/build.c index 35abe05..9611508 100644 --- a/src/conntrack/build.c +++ b/src/conntrack/build.c @@ -194,7 +194,7 @@ void __build_protonat(struct nfnlhdr *req, nest = nfnl_nest(&req->nlh, size, CTA_NAT_PROTO); - switch (ct->tuple[NFCT_DIR_ORIGINAL].protonum) { + switch (ct->tuple[__DIR_ORIG].protonum) { case IPPROTO_TCP: case IPPROTO_UDP: nfnl_addattr_l(&req->nlh, size, CTA_PROTONAT_PORT_MIN, @@ -333,7 +333,7 @@ int __build_conntrack(struct nfnl_subsys_handle *ssh, u_int16_t flags, const struct nf_conntrack *ct) { - u_int8_t l3num = ct->tuple[NFCT_DIR_ORIGINAL].l3protonum; + u_int8_t l3num = ct->tuple[__DIR_ORIG].l3protonum; if (!test_bit(ATTR_ORIG_L3PROTO, ct->set)) { errno = EINVAL; diff --git a/src/expect/build.c b/src/expect/build.c index 2f9cb84..cb9071d 100644 --- a/src/expect/build.c +++ b/src/expect/build.c @@ -24,9 +24,9 @@ int __build_expect(struct nfnl_subsys_handle *ssh, u_int8_t l3num; if (test_bit(ATTR_ORIG_L3PROTO, exp->master.set)) - l3num = exp->master.tuple[NFCT_DIR_ORIGINAL].l3protonum; + l3num = exp->master.tuple[__DIR_ORIG].l3protonum; else if (test_bit(ATTR_ORIG_L3PROTO, exp->expected.set)) - l3num = exp->expected.tuple[NFCT_DIR_ORIGINAL].l3protonum; + l3num = exp->expected.tuple[__DIR_ORIG].l3protonum; else return -1; |