X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=blobdiff_plain;f=linux%2Fnet%2Fipv4%2Fnetfilter%2Fipt_ACCOUNT.c;h=665ac0f60638daf346e1f2c215f92e4167dfcf26;hp=0497fd7ae86061858b18e09f7b98e613de29f9ac;hb=5dbfa65d6075e6f94dc38522cec28e72eeaa5e9a;hpb=bea3921ba41eb9294b02462de2fe9856c05530e5

diff --git a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c
index 0497fd7..665ac0f 100644
--- a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c
+++ b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c
@@ -265,33 +265,44 @@ void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, unsigned int
     }
         
     // Check if this entry is new
-    char is_new_ip = 0;
+    char is_src_new_ip = 0, is_dst_new_ip = 0;
+
+    // Calculate array positions
+    unsigned char src_slot = (unsigned char)((src_ip&0xFF000000) >> 24);
+    unsigned char dst_slot = (unsigned char)((dst_ip&0xFF000000) >> 24);
     
     // Increase size counters
     if (is_src)
     {
         // Calculate network slot
-        unsigned char slot = (unsigned char)((src_ip&0xFF000000) >> 24);
-        DEBUGP("ACCOUNT: Calculated SRC 8 bit network slot: %d\n", slot);
-        if (!mask_24->ip[slot].src_packets && !mask_24->ip[slot].dst_packets)
-            is_new_ip = 1;
+        DEBUGP("ACCOUNT: Calculated SRC 8 bit network slot: %d\n", src_slot);
+        if (!mask_24->ip[src_slot].src_packets && !mask_24->ip[src_slot].dst_packets)
+            is_src_new_ip = 1;
         
-        mask_24->ip[slot].src_packets++;
-        mask_24->ip[slot].src_bytes+=size;
+        mask_24->ip[src_slot].src_packets++;
+        mask_24->ip[src_slot].src_bytes+=size;
     }
     if (is_dst)
     {
-        unsigned char slot = (unsigned char)((dst_ip&0xFF000000) >> 24);
-        DEBUGP("ACCOUNT: Calculated DST 8 bit network slot: %d\n", slot);
-        if (!mask_24->ip[slot].src_packets && !mask_24->ip[slot].dst_packets)
-            is_new_ip = 1;
+        DEBUGP("ACCOUNT: Calculated DST 8 bit network slot: %d\n", dst_slot);
+        if (!mask_24->ip[dst_slot].src_packets && !mask_24->ip[dst_slot].dst_packets)
+            is_dst_new_ip = 1;
         
-        mask_24->ip[slot].dst_packets++;
-        mask_24->ip[slot].dst_bytes+=size;
+        mask_24->ip[dst_slot].dst_packets++;
+        mask_24->ip[dst_slot].dst_bytes+=size;
     }
     
-    if (is_new_ip)
-        (*itemcount)++;
+    // Increase itemcounter
+    if (src_slot == dst_slot)
+    {
+        if (is_src_new_ip || is_dst_new_ip)
+            (*itemcount)++;
+    } else {
+        if (is_src_new_ip)
+            (*itemcount)++;
+        if (is_dst_new_ip)
+            (*itemcount)++;
+    }
 }
 
 void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, unsigned int net_ip, unsigned int netmask,