...

[svn/Prometheus-QoS/.git] / prometheus.c

diff --git a/prometheus.c b/prometheus.c
index a3619dbea84844729b7b71daaf41b16f3906e8e6..4c8b8eaa42892b4cf389c9ea9a77719cda50d5bd 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -290,7 +290,7 @@ void get_config(char *config_filename)
   option("hosts",hosts);\r
   option("downstream-interfaces-list-filename",downstreamfile);\r
   option("upstream-interfaces-list-filename",upstreamfile);\r
-  option("macros-filename",upstreamfile);\r
+  option("macros-filename",macrosfile);\r
   option("ip6-prefix",ip6prefix);\r
   option("medium",medium);\r
   ioption("hall-of-fame-enable",hall_of_fame);\r
@@ -540,7 +540,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/\r
  printf("Parsing downstream interfaces list %s ...\n", downstreamfile);\r
  /*-----------------------------------------------------------------*/\r
- parse(upstreamfile)\r
+ parse(downstreamfile)\r
  {\r
   ptr = parse_datafile_line(_);\r
   if(ptr)\r
@@ -558,7 +558,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    interface->chain = "POSTROUTING";\r
    interface->idxprefix = "post";\r
    push(interface, interfaces);\r
-   printf("Upstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);\r
+   printf("Downstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);\r
   }\r
  }\r
  done; /* ugly macro end */\r
@@ -1369,14 +1369,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    /* tc handle 1 fw flowid */\r
    sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, interface->name, FREE_CLASS, FREE_CLASS);\r
    safe_run(str);\r
-\r
-   /*-----------------------------------------------------------------*/\r
-   puts("Generating bandwith class for overlimit packets...");\r
-   /*-----------------------------------------------------------------*/\r
-   sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
-                tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);\r
-   safe_run(str);\r
   }\r
+  /*-----------------------------------------------------------------*/\r
+  puts("Generating bandwith class for overlimit packets...");\r
+  /*-----------------------------------------------------------------*/\r
+  sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+               tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);\r
+  safe_run(str);\r
  } \r
  printf("Total IP count: %d\n", i);\r
  run_iptables_restore();\r