some formatting, cleanup

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

diff --git a/prometheus.c b/prometheus.c
index 0c0d93bbb7d85d6f81f6490f24ace26d95a62010..7ab712f737f15fa340c797d35e4656581e6c0273 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -148,6 +148,7 @@ struct IP
  int prio;\r
  int fixedprio;\r
  int group;\r
  int prio;\r
  int fixedprio;\r
  int group;\r

+ int lmsid;\r

  unsigned long long direct;\r
  unsigned long long proxy;\r
  unsigned long long upload;\r
  unsigned long long direct;\r
  unsigned long long proxy;\r
  unsigned long long upload;\r


@@ -209,7 +210,8 @@ void TheIP(void)
  ip->addr        = "";\r
  ip->sharing     = NULL;\r
  ip->prio        = highest_priority+1;\r
  ip->addr        = "";\r
  ip->sharing     = NULL;\r
  ip->prio        = highest_priority+1;\r

- ip->fixedprio   = 0;\r
+ ip->lmsid       = \\r
+ ip->fixedprio   = \\r

  ip->mark        = \\r
  ip->min         = \\r
  ip->max         = \\r
  ip->mark        = \\r
  ip->min         = \\r
  ip->max         = \\r


@@ -237,10 +239,14 @@ char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)
  /* debug printf("(%s,%d) -> ",ip,bitmask); */\r
 \r
  if(ip && *ip && bitmask>=0 && bitmask<=32)\r
  /* debug printf("(%s,%d) -> ",ip,bitmask); */\r
 \r
  if(ip && *ip && bitmask>=0 && bitmask<=32)\r

+ {\r

   string(outip,strlen(ip)+10); /*fuck unicode? assertion: 10>strlen("_%d_%d") */\r
   string(outip,strlen(ip)+10); /*fuck unicode? assertion: 10>strlen("_%d_%d") */\r

+ }\r

  else \r
  else \r

+ {\r

   /* should never exit here */\r
   return "undefined";\r
   /* should never exit here */\r
   return "undefined";\r

+ }\r

  outptr=outip;\r
  while(ip && *ip)\r
  {\r
  outptr=outip;\r
  while(ip && *ip)\r
  {\r


@@ -249,9 +255,13 @@ char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)
    if(dot<(bitmask/8-1)) \r
    {\r
     if(format_as_chainname)\r
    if(dot<(bitmask/8-1)) \r
    {\r
     if(format_as_chainname)\r

+    {\r

      *outptr='_';\r
      *outptr='_';\r

+    }\r

     else\r
     else\r

+    {\r

      *outptr='.';\r
      *outptr='.';\r

+    }\r

     outptr++;\r
     dot++;\r
    }\r
     outptr++;\r
     dot++;\r
    }\r


@@ -327,9 +337,6 @@ void get_config(char *config_filename)
    keyword->fixed_prio=0;              /* fixed data limit for setting lower HTB prio */\r
    keyword->reserve_min=8;            /* bonus for nominal HTB rate bandwidth (in kbps) */\r
    keyword->reserve_max=0;            /* malus for nominal HTB ceil (in kbps) */\r
    keyword->fixed_prio=0;              /* fixed data limit for setting lower HTB prio */\r
    keyword->reserve_min=8;            /* bonus for nominal HTB rate bandwidth (in kbps) */\r
    keyword->reserve_max=0;            /* malus for nominal HTB ceil (in kbps) */\r

-/* obsolete:\r
-   keyword->divide_max=0;             relative malus: new_ceil=rate+(old_ceil-rate)/divide_max\r
-   keyword->htb_ceil_bonus_divide=0;   relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */\r

    keyword->default_prio=highest_priority+1;\r
    keyword->html_color="000000";\r
    keyword->ip_count=0;\r
    keyword->default_prio=highest_priority+1;\r
    keyword->html_color="000000";\r
    keyword->ip_count=0;\r


@@ -347,7 +354,6 @@ void get_config(char *config_filename)
     {\r
      int l=strlen(keyword->key);\r
 \r
     {\r
      int l=strlen(keyword->key);\r
 \r

-\r

      if(!strncmp(keyword->key,_,l) && strlen(_)>l+2)\r
      {\r
       char *tmptr=_; /*  <---- l+1 ----> */\r
      if(!strncmp(keyword->key,_,l) && strlen(_)>l+2)\r
      {\r
       char *tmptr=_; /*  <---- l+1 ----> */\r


@@ -361,17 +367,15 @@ void get_config(char *config_filename)
       ioption("htb-default-prio",keyword->default_prio);\r
       ioption("htb-rate-bonus",keyword->reserve_min);\r
       ioption("htb-ceil-malus",keyword->reserve_max);\r
       ioption("htb-default-prio",keyword->default_prio);\r
       ioption("htb-rate-bonus",keyword->reserve_min);\r
       ioption("htb-ceil-malus",keyword->reserve_max);\r

-  /* obsolete:\r
-      ioption("htb-ceil-divide",keyword->divide_max);\r
-      ioption("htb-ceil-bonus-divide",keyword->htb_ceil_bonus_divide);\r
-  */\r

       option("leaf-discipline",keyword->leaf_discipline);\r
       option("html-color",keyword->html_color);\r
       _=tmptr;\r
       \r
       if(keyword->data_limit || keyword->fixed_limit || \r
          keyword->data_prio || keyword->fixed_prio)\r
       option("leaf-discipline",keyword->leaf_discipline);\r
       option("html-color",keyword->html_color);\r
       _=tmptr;\r
       \r
       if(keyword->data_limit || keyword->fixed_limit || \r
          keyword->data_prio || keyword->fixed_prio)\r

-          use_credit=1;        \r
+      {\r
+       use_credit=1;        \r
+      }\r

      }\r
     }\r
   }\r
      }\r
     }\r
   }\r


@@ -437,14 +441,17 @@ void get_config(char *config_filename)
     }\r
  }\r
 \r
     }\r
  }\r
 \r

- if (strcmpi(cnf, "mark")){\r
-    filter_type = 2;\r
-    mark = "CLASSIFY";\r
-    mark_iptables = "CLASSIFY --set-class 1:";\r
- }else{\r
-    filter_type = 1;\r
-    mark = "MARK";\r
-    mark_iptables = "MARK --set-mark ";\r
+ if (strcmpi(cnf, "mark"))\r
+ {\r
+  filter_type = 2;\r
+  mark = "CLASSIFY";\r
+  mark_iptables = "CLASSIFY --set-class 1:";\r
+ }\r
+ else\r
+ {\r
+  filter_type = 1;\r
+  mark = "MARK";\r
+  mark_iptables = "MARK --set-mark ";\r

  }\r
 \r
  /* are supplied values meaningful ?*/\r
  }\r
 \r
  /* are supplied values meaningful ?*/\r


@@ -555,10 +562,16 @@ void get_traffic_statistics(void)
       ip->upload=traffic;\r
       ip->pktsup=pkts;\r
       if(include_upload)\r
       ip->upload=traffic;\r
       ip->pktsup=pkts;\r
       if(include_upload)\r

+      {\r

        ip->traffic+=traffic;\r
        ip->traffic+=traffic;\r

+      }\r

       else \r
       else \r

+      {\r

        if(traffic>ip->traffic)\r
        if(traffic>ip->traffic)\r

+       {\r

         ip->traffic=traffic;     \r
         ip->traffic=traffic;     \r

+       }\r
+      }\r

      }\r
     }  \r
   }\r
      }\r
     }  \r
   }\r


@@ -973,7 +986,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     substring+=strlen(keyword->key)+1;\r
     ptr=substring;\r
     while(*ptr && *ptr!='-')\r
     substring+=strlen(keyword->key)+1;\r
     ptr=substring;\r
     while(*ptr && *ptr!='-')\r

+    {\r

      ptr++;\r
      ptr++;\r

+    }\r

     if(*ptr=='-')\r
     {\r
      *ptr=0;\r
     if(*ptr=='-')\r
     {\r
      *ptr=0;\r


@@ -993,15 +1008,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     else \r
     {\r
      ip->max-=ip->keyword->reserve_max;\r
     else \r
     {\r
      ip->max-=ip->keyword->reserve_max;\r

-\r
-/*\r
-     if(ip->keyword->divide_max>1)\r
-      ip->max=ip->min+(ip->max-ip->min)/ip->keyword->divide_max;\r
-     if(ip->keyword->htb_ceil_bonus_divide>0)\r
-      ip->max+=ip->max/ip->keyword->htb_ceil_bonus_divide;\r
-*/\r

      if(ip->max<ip->min)\r
      if(ip->max<ip->min)\r

+     {\r

       ip->max=ip->min;\r
       ip->max=ip->min;\r

+     }\r

     }\r
     ip->mark=FIRSTIPCLASS+1+class_count++;\r
 \r
     }\r
     ip->mark=FIRSTIPCLASS+1+class_count++;\r
 \r


@@ -1055,7 +1065,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    break;\r
   }\r
   if(!sharedip)\r
    break;\r
   }\r
   if(!sharedip)\r

+  {\r

    printf("Unresolved shared connection: %s %s sharing-%s\n",ip->addr,ip->name,ip->sharing);\r
    printf("Unresolved shared connection: %s %s sharing-%s\n",ip->addr,ip->name,ip->sharing);\r

+  }\r

  }\r
 \r
  if(enable_credit && just_flush<9)\r
  }\r
 \r
  if(enable_credit && just_flush<9)\r


@@ -1084,13 +1096,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   /*-----------------------------------------------------------------*/\r
   \r
   iptables_file=fopen(iptablesfile,"w");\r
   /*-----------------------------------------------------------------*/\r
   \r
   iptables_file=fopen(iptablesfile,"w");\r

-  if (iptables_file == NULL) {\r
+  if (iptables_file == NULL)\r
+  {\r

     puts("Cannot open iptablesfile!");\r
     exit(-1);\r
   }\r
   \r
   log_file=fopen(cmdlog,"w");\r
     puts("Cannot open iptablesfile!");\r
     exit(-1);\r
   }\r
   \r
   log_file=fopen(cmdlog,"w");\r

-  if (log_file == NULL) {\r
+  if (log_file == NULL) \r
+  {\r

     puts("Cannot open logfile!");\r
     exit(-1);\r
   }\r
     puts("Cannot open logfile!");\r
     exit(-1);\r
   }\r


@@ -1127,7 +1141,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     chain="post_noproxy";    \r
    }\r
    else\r
     chain="post_noproxy";    \r
    }\r
    else\r

+   {\r

     chain="POSTROUTING";\r
     chain="POSTROUTING";\r

+   }\r

     \r
    sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);\r
    save_line(str);\r
     \r
    sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);\r
    save_line(str);\r


@@ -1197,7 +1213,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    sort(idx,idxs,order_by,bitmask);\r
 \r
    i=0;\r
    sort(idx,idxs,order_by,bitmask);\r
 \r
    i=0;\r

-\r

    for_each(idx,idxs)\r
    {\r
     subnet=subnet_id(idx->addr,idx->bitmask);\r
    for_each(idx,idxs)\r
    {\r
     subnet=subnet_id(idx->addr,idx->bitmask);\r


@@ -1215,7 +1230,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      sprintf(buf,"post_%s",idx->parent->id);\r
     }\r
     else\r
      sprintf(buf,"post_%s",idx->parent->id);\r
     }\r
     else\r

+    {\r

      buf="POSTROUTING";\r
      buf="POSTROUTING";\r

+    }\r

 \r
     sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id);\r
     save_line(str);\r
 \r
     sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id);\r
     save_line(str);\r


@@ -1229,7 +1246,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      sprintf(buf,"forw_%s",idx->parent->id);\r
     }\r
     else\r
      sprintf(buf,"forw_%s",idx->parent->id);\r
     }\r
     else\r

+    {\r

      buf="FORWARD";\r
      buf="FORWARD";\r

+    }\r

 \r
     sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id);\r
     save_line(str);\r
 \r
     sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id);\r
     save_line(str);\r


@@ -1290,8 +1309,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/\r
  puts("Locating heavy downloaders and generating root classes ...");\r
  /*-----------------------------------------------------------------*/\r
  /*-----------------------------------------------------------------*/\r
  puts("Locating heavy downloaders and generating root classes ...");\r
  /*-----------------------------------------------------------------*/\r

- sort(ip,ips,desc_order_by,traffic);\r
- \r
+ sort(ip,ips,desc_order_by,traffic); \r

 \r
  /*-----------------------------------------------------------------*/\r
  /* sub-scope - local variables */  \r
 \r
  /*-----------------------------------------------------------------*/\r
  /* sub-scope - local variables */  \r


@@ -1318,7 +1336,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     safe_run(str);\r
    }\r
    \r
     safe_run(str);\r
    }\r
    \r

-   if(group_count++<max_nesting) parent=group->id;\r
+   if(group_count++<max_nesting)\r
+   {\r
+    parent=group->id;\r
+   }\r

    \r
    rate-=digital_divide*group->min;\r
    if(rate<group->min)rate=group->min;\r
    \r
    rate-=digital_divide*group->min;\r
    if(rate<group->min)rate=group->min;\r