diff options
| author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2007-05-01 18:30:03 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2007-05-01 18:30:03 +0000 |
| commit | 4db878d6f81fd64029c48003f4e1ae57069a7c65 (patch) | |
| tree | b15b1aa433fdd9284fed8db9a02a19b8d1aa46a0 /src/conntrack | |
| parent | 7736631fef63efde9c0fd68af89c3e2900286428 (diff) | |
introduce the new expectation API
Diffstat (limited to 'src/conntrack')
| -rw-r--r-- | src/conntrack/parse.c | 17 | ||||
| -rw-r--r-- | src/conntrack/snprintf_default.c | 6 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/conntrack/parse.c b/src/conntrack/parse.c index 5cbd302..b9bc095 100644 --- a/src/conntrack/parse.c +++ b/src/conntrack/parse.c @@ -133,10 +133,10 @@ static void __parse_proto(const struct nfattr *attr, } } -static void __parse_tuple(const struct nfattr *attr, - struct __nfct_tuple *tuple, - int dir, - u_int32_t *set) +void __parse_tuple(const struct nfattr *attr, + struct __nfct_tuple *tuple, + int dir, + u_int32_t *set) { struct nfattr *tb[CTA_TUPLE_MAX]; @@ -148,15 +148,6 @@ static void __parse_tuple(const struct nfattr *attr, __parse_proto(tb[CTA_TUPLE_PROTO-1], tuple, dir, set); } -static void __parse_mask(const struct nfattr *attr, - struct __nfct_tuple *tuple, - const u_int8_t l3protonum, - const u_int16_t protonum, - u_int32_t *set) -{ - __parse_tuple(attr, tuple, __DIR_ORIG, set); -} - static void __parse_protoinfo_tcp(const struct nfattr *attr, struct nf_conntrack *ct) { diff --git a/src/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c index e826511..7f63d4c 100644 --- a/src/conntrack/snprintf_default.c +++ b/src/conntrack/snprintf_default.c @@ -42,9 +42,9 @@ static int __snprintf_l3protocol(char *buf, ct->tuple[__DIR_ORIG].l3protonum)); } -static int __snprintf_protocol(char *buf, - unsigned int len, - const struct nf_conntrack *ct) +int __snprintf_protocol(char *buf, + unsigned int len, + const struct nf_conntrack *ct) { return (snprintf(buf, len, "%-8s %u ", proto2str[ct->tuple[__DIR_ORIG].protonum] == NULL ? |