diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-02-13 22:38:01 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-02-13 22:38:01 +0100 |
| commit | 98756c2608f0879a2322919c7441973216565272 (patch) | |
| tree | b4766069bf29701082fff5ed2950161388c52145 /src | |
| parent | 9173be30c4716ce6c1a4c9b73a3657bb8fc3327a (diff) | |
| download | conntrack-tools-98756c2608f0879a2322919c7441973216565272.tar.gz conntrack-tools-98756c2608f0879a2322919c7441973216565272.zip | |
cache: close commit request if we already have one in progress
We close a commit request if there's already one in progress. This
patch fixes a problem that may be triggered if two consecutive commit
requests are received.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cache_iterators.c | 6 | ||||
| -rw-r--r-- | src/sync-mode.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/cache_iterators.c b/src/cache_iterators.c index c7183fd..2707366 100644 --- a/src/cache_iterators.c +++ b/src/cache_iterators.c @@ -184,6 +184,11 @@ void cache_commit(struct cache *c, struct nfct_handle *h, int clientfd) }; struct timeval commit_stop, res; + /* we already have one commit in progress, close this request. */ + if (clientfd && STATE_SYNC(commit).clientfd != -1) { + close(clientfd); + return; + } switch(STATE_SYNC(commit).state) { case COMMIT_STATE_INACTIVE: gettimeofday(&STATE_SYNC(commit).stats.start, NULL); @@ -241,6 +246,7 @@ void cache_commit(struct cache *c, struct nfct_handle *h, int clientfd) /* Close the client socket now that we're done. */ close(STATE_SYNC(commit).clientfd); + STATE_SYNC(commit).clientfd = -1; } } diff --git a/src/sync-mode.c b/src/sync-mode.c index 1250a08..4b48449 100644 --- a/src/sync-mode.c +++ b/src/sync-mode.c @@ -346,6 +346,7 @@ static int init_sync(void) STATE(fds)) == -1) { return -1; } + STATE_SYNC(commit).clientfd = -1; init_alarm(&STATE_SYNC(reset_cache_alarm), NULL, do_reset_cache_alarm); |