version 1.0.0.-a - significat iptables parsing speed improvement

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

diff --git a/parseiptables.c b/parseiptables.c
index db984fa923035a878541da78ac597c17f2f11ff4..36859289e14a9d8a40b70a5346d72095674b194d 100644 (file)
--- a/parseiptables.c
+++ b/parseiptables.c
@@ -3,7 +3,7 @@
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
 \r
-#define STRLEN 512\r
+#define STRLEN 256\r
 \r
 /* globals declared in prometheus.c */\r
 extern struct IP *ips, *ip, *sharedip;\r
@@ -14,6 +14,7 @@ extern int free_max;
 extern int include_upload;\r
 \r
 int traffic_detected = 0;\r
+extern char *iptablesdump;\r
 \r
 /* ===================== traffic analyser - uses iptables  ================ */ \r
 \r
@@ -21,29 +22,31 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
 {\r
  char *str,*cmd;\r
  int downloadflag = 0;\r
-\r
- textfile(Pipe,str) *line,*lines=NULL;\r
- string(str,STRLEN);\r
+ FILE *f;\r
  string(cmd,STRLEN);\r
 \r
- sprintf(cmd,"%s -L -v -x -n -t mangle", whichiptables);\r
- shell(cmd);\r
- input(str,STRLEN)\r
- {\r
-  create(line,Pipe);\r
-  line->str=str;\r
-  string(str,STRLEN);\r
-  append(line,lines);\r
- }\r
+ sprintf(cmd, "%s -L -v -x -n -t mangle>%s", whichiptables, iptablesdump);\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Running %s ...\n", cmd);\r
+ /*-----------------------------------------------------------------*/\r
+ system(cmd);\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Processing %s ...\n", iptablesdump);\r
+ /*-----------------------------------------------------------------*/\r
+ f = fopen(iptablesdump,"r");\r
+ if(!f)\r
+  perror(iptablesdump);\r
 \r
- for_each(line,lines)\r
+ while(!feof(f))\r
  {\r
   int col, accept = 0, /*proxyflag = 0, */valid = 1, setchainname = 0, commonflag = 0; \r
   unsigned long long traffic = 0;\r
   unsigned long pkts = 0;\r
   char *ipaddr = NULL,*ptr;\r
   \r
-  valid_columns(ptr, line->str, ' ', col)\r
+  string(str, STRLEN);\r
+  fgets(str, STRLEN, f);\r
+  valid_columns(ptr, str, ' ', col)\r
   if(valid) switch(col)\r
   { \r
    case 1: if(eq(ptr,"Chain"))\r