more modularization

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

diff --git a/prometheus.c b/prometheus.c
index 40b886528d77a3d72fe97684faf1df1f7bdf9e2c..814da9e4cb0fe9de6527fb98ad4e216d357961ba 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -80,7 +80,7 @@ char          *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */
 char        *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */\r
 char            *html = "/var/www/traffic.html"; /* hall of fame - html version */\r
 char         *preview = "/var/www/preview.html"; /* hall of fame preview - html version */\r
-char            *json = "/var/www/logs/traffic.json"; /* hall of fame - json version */\r
+char    *json_traffic = "/var/www/logs/traffic.json"; /* hall of fame - json version */\r
 char    *json_preview = "/var/www/logs/preview.json"; /* hall of fame preview - json version */\r
 char          *cmdlog = "/var/log/prometheuslog"; /* command log filename */\r
 char         *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */\r
@@ -149,10 +149,13 @@ struct Group *groups = NULL, *group;
 struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL;\r
 \r
 void parse_ip_log(int argc, char **argv);\r
-/* implementid in parselog.c */\r
+/* implemented in parselog.c */\r
 \r
 void parse_hosts(char *hosts);\r
-/* implementid in parsehosts.c */\r
+/* implemented in parsehosts.c */\r
+\r
+void write_json_traffic(char *json);\r
+/* implemented in json.c */\r
 \r
 const char *tr_odd_even(void)\r
 {\r
@@ -179,111 +182,18 @@ struct Index
  list(Index);\r
 } *idxs=NULL, *idx, *metaindex;\r
 \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
-char *very_ugly_ipv4_code(char *inip, int bitmask, int format_as_chainname)\r
-{\r
- /* warning: this function was debugged only for bitmask values 20,24,28 !!!*/\r
- int dot=0, n;\r
- char *ip,*outip,*outptr,*fmt;\r
+char *index_id(char *ip, int bitmask);\r
+/* function implemented in ipv4subnets.c */\r
 \r
- duplicate(inip,ip);\r
- /* debug printf("(%s,%d) -> ",ip,bitmask); */\r
+char *subnet_id(char *ip, int bitmask);\r
+/* function implemented in ipv4subnets.c */\r
 \r
- if(ip && *ip && bitmask>=0 && bitmask<=32)\r
- {\r
-  string(outip,strlen(ip)+10); /*fuck unicode? assertion: 10>strlen("_%d_%d") */\r
- }\r
- else \r
- {\r
-  /* should never exit here */\r
-  return "undefined";\r
- }\r
- outptr=outip;\r
- while(ip && *ip)\r
- {\r
-  if(*ip=='.')\r
-  {\r
-   if(dot<(bitmask/8-1)) \r
-   {\r
-    if(format_as_chainname)\r
-    {\r
-     *outptr='_';\r
-    }\r
-    else\r
-    {\r
-     *outptr='.';\r
-    }\r
-    outptr++;\r
-    dot++;\r
-   }\r
-   else\r
-   {\r
-    char *cutdot=strchr(ip+1,'.'); /*for bitmask<24*/    \r
-    if(cutdot)\r
-    {\r
-     *cutdot = '\0';\r
-    }\r
-    \r
-    if(format_as_chainname)\r
-    {\r
-     fmt = "_%d_%d";\r
-    }\r
-    else\r
-    {\r
-     fmt = ".%d";\r
-    }\r
-    \r
-    if(bitmask%8)\r
-    {\r
-     n = atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8));\r
-    }\r
-    else\r
-    {\r
-     n = 0;\r
-    }\r
-\r
-    /*debug  printf("%d/%d => [_%d_%d]\n",atoi(ip+1),bitmask,n,bitmask); */\r
-    sprintf(outptr,fmt,n,bitmask);\r
-    if(!format_as_chainname)\r
-    {\r
-     while(bitmask<24)\r
-     {\r
-      strcat(outip,".0");\r
-      bitmask+=8;\r
-     }\r
-    }\r
-    /* debug printf("[%s]\n",outip); */\r
-    return outip;\r
-   }\r
-  }\r
-  else \r
-  {\r
-   *outptr=*ip;\r
-   outptr++;\r
-  }\r
-  ip++;\r
- }\r
- /*should never exit here*/\r
- *outptr='\0';\r
- return outip;\r
-}\r
-\r
-char *index_id(char *ip,int bitmask)\r
-{ \r
- return very_ugly_ipv4_code(ip,bitmask,1);\r
-}\r
-\r
-char *subnet_id(char *ip,int bitmask)\r
-{\r
- return very_ugly_ipv4_code(ip,bitmask,0);\r
-}\r
-\r
-/* ================= Let's parse configuration file here =================== */\r
+/* ================= Let's parse configuration file here ================ */\r
 \r
 void reject_config_and_exit(char *filename)\r
 {\r
@@ -371,7 +281,7 @@ void get_config(char *config_filename)
   ioption("hall-of-fame-enable",hall_of_fame);\r
   option("hall-of-fame-title",title);\r
   option("hall-of-fame-filename",html);\r
-  option("json-filename",json);\r
+  option("json-filename",json_traffic);\r
   option("hall-of-fame-preview",preview);\r
   option("json-preview",json_preview);\r
   option("log-filename",cmdlog);\r
@@ -1179,41 +1089,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    done; /* ugly macro end */\r
   }\r
   html=preview;\r
-  json=json_preview;\r
+  json_traffic=json_preview;\r
  }\r
 \r
  if(!dry_run && !just_flush)\r
  {\r
   /*-----------------------------------------------------------------*/\r
-  printf("Writing json overview  %s ... ", json);\r
+  printf("Writing json traffic overview  %s ... ", json_traffic);\r
   /*-----------------------------------------------------------------*/\r
-  f=fopen(json, "w");\r
-  if(f > 0)\r
-  {\r
-   int jsoncount=0;\r
-   fprintf(f, "{\n");\r
-   for_each(ip, ips)\r
-   {\r
-    if(     ip->lmsid > 0 \r
-        && (ip->traffic || ip->direct || ip->proxy || ip->upload))\r
-    {\r
-     if(jsoncount)\r
-     {\r
-      fprintf(f, ",\n");\r
-     }\r
-     fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu, \"min\":%d, \"max\":%d, \"limit\":%d }",\r
-                ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload, ip->min, ip->desired, ip->max);\r
-     jsoncount++;\r
-    }\r
-   }\r
-   fprintf(f, "}\n");\r
-   fclose(f);\r
-   puts("done.");\r
-  }\r
-  else\r
-  {\r
-   perror(json);\r
-  }\r
+  write_json_traffic(json_traffic);\r
  }\r
 \r
  f=fopen(html,"w");\r