X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=814da9e4cb0fe9de6527fb98ad4e216d357961ba;hb=1ab008b9af1556f1bcba85b2d262fa83b617f01e;hp=40b886528d77a3d72fe97684faf1df1f7bdf9e2c;hpb=b6fb849acbdcca50df04223a6f31336cc101de2e;p=svn%2FPrometheus-QoS%2F.git

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