more refucktoring (into multiple modules)

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

diff --git a/prometheus.c b/prometheus.c
index 07980f637bfbd4a3762065dc7e3b812b974678f6..717971410549b1ce35de9bc6eadc77ce1ae55fe3 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -181,31 +181,9 @@ struct Index
 } *idxs=NULL, *idx, *metaindex;\r
 \r
 \r
-/* Damned, this must be object oriented! This looks almost like constructor ;-) */\r
 \r
-void TheIP(void)\r
-{\r
- create(ip,IP);\r
- ip->name        = "";\r
- ip->addr        = "";\r
- ip->sharing     = NULL;\r
- ip->prio        = highest_priority+1;\r
- ip->lmsid       = -1;\r
- ip->fixedprio   = \\r
- ip->mark        = \\r
- ip->min         = \\r
- ip->max         = \\r
- ip->desired     = \\r
- ip->credit      = \\r
- ip->upload      = \\r
- ip->proxy       = \\r
- ip->direct      = \\r
- ip->traffic     = \\r
- ip->pktsup      = \\r
- ip->pktsdown    = 0;\r
- ip->keyword     = keywords;\r
- push(ip,ips);\r
-}\r
+void TheIP(void);\r
+/* function implemented in parsehosts.c */\r
 \r
 /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */\r
 \r
@@ -881,11 +859,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    if(qos_proxy)\r
    {\r
     save_line(":post_noproxy - [0:0]");\r
-    sprintf(str,"-A POSTROUTING -p ! tcp -o %s -j post_noproxy", lan);\r
+    sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan);\r
     save_line(str);   \r
-    sprintf(str,"-A POSTROUTING -s ! %s -o %s -j post_noproxy", proxy_ip, lan);\r
+    sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan);\r
     save_line(str);   \r
-    sprintf(str,"-A POSTROUTING -s %s -p tcp --sport ! %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan);\r
+    sprintf(str,"-A POSTROUTING -s %s -p tcp ! --sport %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan);\r
     save_line(str);   \r
 \r
     chain="post_noproxy";    \r