From 64823c027ee22b51f8d82e238679cb299222931b Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Sun, 6 May 2007 18:00:06 +0000 Subject: - update changelog - use positive logic in error handling --- ChangeLog | 12 ++++++++++++ src/conntrack.c | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ef0535..59b297b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ version 0.9.3 (yet unreleased) ------------------------------ + += conntrackd = o fix commit of confirmed expectations (reported by Nishit Shah) o fix double increment of counters in cache_update_force() (Niko Tyni) o nl_dump_handler must return NFCT_CB_CONTINUE (Niko Tyni) @@ -28,6 +30,16 @@ o kill cache feature abuse: introduce nicer cache hooks for sync algorithms o fix oversized buffer allocated in the stack in the cache functions o add support to dump internal/external cache in XML format '-x' += conntrack = +o port conntrack to the new libnetfilter_conntrack API +o introduce '--xml' option for '-L', '-G' and '-E' +o deprecated '--id' +o replace '-a' by '--src-nat' and '--dst-nat' +o use positive logic in error handling +o remove sctp support until is fully supported in the kernel side +o update conntrack manpage +o update test.sh file in examples/cli/ + version 0.9.2 (2006/01/17) -------------------------- o remove spamming packet lost messages diff --git a/src/conntrack.c b/src/conntrack.c index f3aa06f..e9e8167 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -319,18 +319,18 @@ err2str(int err, enum action command) int err; const char *message; } table [] = - { { CT_LIST, -ENOTSUPP, "function not implemented" }, - { 0xFFFF, -EINVAL, "invalid parameters" }, - { CT_CREATE, -EEXIST, "Such conntrack exists, try -U to update" }, - { CT_CREATE|CT_GET|CT_DELETE, -ENOENT, + { { CT_LIST, ENOTSUPP, "function not implemented" }, + { 0xFFFF, EINVAL, "invalid parameters" }, + { CT_CREATE, EEXIST, "Such conntrack exists, try -U to update" }, + { CT_CREATE|CT_GET|CT_DELETE, ENOENT, "such conntrack doesn't exist" }, - { CT_CREATE|CT_GET, -ENOMEM, "not enough memory" }, - { CT_GET, -EAFNOSUPPORT, "protocol not supported" }, - { CT_CREATE, -ETIME, "conntrack has expired" }, - { EXP_CREATE, -ENOENT, "master conntrack not found" }, - { EXP_CREATE, -EINVAL, "invalid parameters" }, - { ~0UL, -EPERM, "sorry, you must be root or get " - "CAP_NET_ADMIN capability to do this"} + { CT_CREATE|CT_GET, ENOMEM, "not enough memory" }, + { CT_GET, EAFNOSUPPORT, "protocol not supported" }, + { CT_CREATE, ETIME, "conntrack has expired" }, + { EXP_CREATE, ENOENT, "master conntrack not found" }, + { EXP_CREATE, EINVAL, "invalid parameters" }, + { ~0UL, EPERM, "sorry, you must be root or get " + "CAP_NET_ADMIN capability to do this"} }; for (i = 0; i < sizeof(table)/sizeof(struct table_struct); i++) { @@ -338,7 +338,7 @@ err2str(int err, enum action command) return table[i].message; } - return strerror(-err); + return strerror(err); } #define PARSE_STATUS 0 @@ -1238,7 +1238,7 @@ int main(int argc, char *argv[]) } if (res < 0) { - fprintf(stderr, "Operation failed: %s\n", err2str(-errno, command)); + fprintf(stderr, "Operation failed: %s\n", err2str(errno, command)); exit(OTHER_PROBLEM); } -- cgit v1.2.3