From: Jan Engelhardt Date: Mon, 26 Oct 2009 17:43:54 +0000 (+0100) Subject: libiptc: fix wrong maptype of base chain counters on restore X-Git-Tag: v1.4.6~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c4d668c9c2ee007c82063b7fc784cbbf46b2ec4;p=thirdparty%2Fiptables.git libiptc: fix wrong maptype of base chain counters on restore When a ruleset that does not reset any chain policies/counters, such as *filter COMMIT is sourced by iptables-restore, the previous policy and counters (i.e. the ones read from the kernel) are reused. The counter skew offsetting is wrong however, causing the read value to be readded to the kernel value. This manifests itself in practice by the counter value almost doubling everytime iptables-restore is called. Signed-off-by: Jan Engelhardt --- diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c index 670acf53..7a9c7428 100644 --- a/libiptc/libiptc.c +++ b/libiptc/libiptc.c @@ -829,7 +829,7 @@ static int __iptcc_p_del_policy(struct xtc_handle *h, unsigned int num) /* save counter and counter_map information */ h->chain_iterator_cur->counter_map.maptype = - COUNTER_MAP_NORMAL_MAP; + COUNTER_MAP_ZEROED; h->chain_iterator_cur->counter_map.mappos = num-1; memcpy(&h->chain_iterator_cur->counters, &pr->entry->counters, sizeof(h->chain_iterator_cur->counters));