diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-06-15 02:33:28 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-06-15 02:33:28 +0200 |
| commit | 5dee97536258d3334b9c0ffeb59ec4ad076dc6c3 (patch) | |
| tree | 1f45ace7246059313ca16766160ec26f803b70a7 | |
| parent | 2a838790b8a545e95841cb216a7623b3d9560bce (diff) | |
| download | conntrack-tools-5dee97536258d3334b9c0ffeb59ec4ad076dc6c3.tar.gz conntrack-tools-5dee97536258d3334b9c0ffeb59ec4ad076dc6c3.zip | |
check if entries already exist in kernel before injection
| -rw-r--r-- | src/cache_iterators.c | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/src/cache_iterators.c b/src/cache_iterators.c index c26d349..562d9a2 100644 --- a/src/cache_iterators.c +++ b/src/cache_iterators.c @@ -91,20 +91,29 @@ static int do_commit(void *data1, void *data2) */ nfct_set_attr_u32(ct, ATTR_TIMEOUT, CONFIG(commit_timeout)); - ret = nl_create_conntrack(ct); - if (ret == -1) { - switch(errno) { - case EEXIST: - c->commit_exist++; - break; - default: - dlog(LOG_ERR, "commit: %s", strerror(errno)); - dlog_ct(STATE(log), u->ct, NFCT_O_PLAIN); - c->commit_fail++; - break; - } - } else { - c->commit_ok++; + ret = nl_exist_conntrack(ct); + switch (ret) { + case -1: + dlog(LOG_ERR, "commit-exist: %s", strerror(errno)); + dlog_ct(STATE(log), ct, NFCT_O_PLAIN); + break; + case 0: + if (nl_create_conntrack(ct) == -1) { + dlog(LOG_ERR, "commit-create: %s", strerror(errno)); + dlog_ct(STATE(log), ct, NFCT_O_PLAIN); + c->commit_fail++; + } else + c->commit_ok++; + break; + case 1: + c->commit_exist++; + if (nl_update_conntrack(ct) == -1) { + dlog(LOG_ERR, "commit-update: %s", strerror(errno)); + dlog_ct(STATE(log), ct, NFCT_O_PLAIN); + c->commit_fail++; + } else + c->commit_ok++; + break; } /* keep iterating even if we have found errors */ @@ -128,7 +137,7 @@ void cache_commit(struct cache *c) dlog(LOG_NOTICE, "Committed %u new entries", commit_ok); if (commit_exist) - dlog(LOG_NOTICE, "%u entries ignored, " + dlog(LOG_NOTICE, "%u entries updated, " "already exist", commit_exist); if (commit_fail) dlog(LOG_NOTICE, "%u entries can't be " |