final bug fix - works now

git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@263 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/htmlandlogs.c b/htmlandlogs.c
index bff5cb3a5ec3de2479eb23ce5261bb6a071b3135..798544db52b6e0480dbe4166625c5cb3228057fb 100644 (file)
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -411,6 +411,10 @@ style=\"cursor: pointer;\">+%d</a>]</span>",
      append_log(sharedip);\r
     }\r
    }\r
+   else\r
+   {\r
+    printf(".");\r
+   }\r
   }\r
   fprintf(f, "</tbody><thead><tr>\n\\r
 <th colspan=\"5\" style=\"text-align: left\">%d CLASSES</th>", i);\r

diff --git a/prometheus.c b/prometheus.c
index 71b2a32e13c9a8188cac8dea38a67d22d0736e42..a41ba723a92e71e37ba4a7cfbb1725036645737f 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -747,7 +747,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   {\r
    for_each(interface, interfaces)\r
    {\r
-    sprintf(str,"-A %s -s %s -o %s -j ACCEPT", interface->chain, qos_free_zone, interface->name);\r
+    sprintf(str,"-A %s -%c %s -o %s -j ACCEPT", interface->chain, (interface->is_upstream?'d':'s'), qos_free_zone, interface->name);\r
     iptables_save_line(str, FALSE);\r
    }\r
   }\r
@@ -868,10 +868,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
       buf = interface->chain;\r
      }\r
 \r
-     sprintf(str,"-A %s -d %s/%d -o %s -j %s_%s", buf, subnet, idx->bitmask, interface->name, interface->idxprefix, idx->id);\r
+     sprintf(str, "-A %s -%c %s/%d -o %s -j %s_%s", \r
+                  buf, (interface->is_upstream?'s':'d'), subnet, idx->bitmask, interface->name, interface->idxprefix, idx->id);\r
      iptables_save_line(str, idx->ipv6);\r
 \r
-     sprintf(str,"-A %s -d %s/%d -o %s -j %s_common", buf, subnet, idx->bitmask, interface->name, interface->idxprefix);\r
+     sprintf(str, "-A %s -%c %s/%d -o %s -j %s_common",\r
+                  buf, (interface->is_upstream?'s':'d'), subnet, idx->bitmask, interface->name, interface->idxprefix);\r
      iptables_save_line(str, idx->ipv6);\r
     }\r
    }\r
@@ -1257,25 +1259,27 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  #endif\r
 \r
    /* ------------------------------------------------ iptables classify */\r
-   sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
-                chain, ip->addr, ip->mask,\r
+   sprintf(str, "-A %s -%c %s/%d -o %s -j %s%d",\r
+                chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,\r
                 interface->name, mark_iptables, ip->mark);\r
    iptables_save_line(str, ip->v6);\r
 \r
-   sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT",\r
-                chain, ip->addr, ip->mask, interface->name, limit_pkts);\r
+   sprintf(str, "-A %s -%c %s/%d -o %s %s-j ACCEPT",\r
+                chain, (interface->is_upstream?'s':'d'),ip->addr, ip->mask,\r
+                interface->name, limit_pkts);\r
    iptables_save_line(str, ip->v6);\r
 \r
    if(limit_pkts)\r
    {\r
     /* classify overlimit packets to separate overlimit class */\r
-    sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
-                 chain, ip->addr, ip->mask,\r
+    sprintf(str, "-A %s -%c %s/%d -o %s -j %s%d",\r
+                 chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,\r
                  interface->name, mark_iptables, OVERLIMIT_CLASS);\r
     iptables_save_line(str, ip->v6);\r
 \r
-    sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",\r
-                 chain, ip->addr, ip->mask, interface->name);\r
+    sprintf(str, "-A %s -%c %s/%d -o %s -j ACCEPT",\r
+                 chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,\r
+                 interface->name);\r
     iptables_save_line(str, ip->v6);\r
    }\r
 \r