From: xchaos <xchaos@251d49ef-1d17-4917-a970-b30cf55b089b>
Date: Sat, 28 Oct 2023 12:58:51 +0000 (+0000)
Subject: -b Boot mode
X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=5aca3d039171ff9609353f2cfffa0020b76ce542;p=svn%2FPrometheus-QoS%2F.git

-b Boot mode



git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@281 251d49ef-1d17-4917-a970-b30cf55b089b
---

diff --git a/help.c b/help.c
index 868f0e6..049b156 100644
--- a/help.c
+++ b/help.c
@@ -1,4 +1,4 @@
-/* Modified by: xChaos, 20131029 */
+/* Modified by: xChaos, 20231028 */
 
 #include "cll1-0.6.2.h"
 
@@ -9,6 +9,7 @@ void help(void)
  puts("Command line switches:\n\
 \n\
 -d   Dry run (preview tc and iptables commands on stdout)\n\
+-b   Boot run (no to gather and write data transfer statistics)\n\
 -r   Run (reset all statistics and start shaping - daily usage)\n\
 -p   just generate Preview of data transfer statistics and exit (after -r)\n\
 -s   Start shaping FUP limits (keeps data transfer stat like -p) (after -r)\n\
diff --git a/prometheus.c b/prometheus.c
index d8069b8..8aacb50 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-/* Modified by: xChaos, 20220607
+/* Modified by: xChaos, 20231028
                  ludva, 20080415
  
    Prometheus QoS is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 #include "cll1-0.6.2.h"
 #include "ipstruct.h"
 
-const char *version = "1.0.0-d";
+const char *version = "1.0.1";
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 /* Versions: 0.9.0 is development release, 1.0 will be "stable"    */
@@ -87,7 +87,8 @@ int        filter_type = 1; /*1 mark, 2 classify*/
 char      *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */
 char             *mark = "MARK";
 char    *mark_iptables = "MARK --set-mark ";
-int            dry_run = FALSE; /* preview - use puts() instead of system() */
+int            dry_run = FALSE; /* preview commands - use puts() instead of system() */
+int         skip_stats = FALSE; /* skip generating statistics */
 char *iptablespreamble = "*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]";
 char      *ip6preamble = "-A FORWARD -p ipv6-icmp -j ACCEPT\n-A POSTROUTING -p ipv6-icmp -j ACCEPT\n-A FORWARD -s fe80::/10 -j ACCEPT\n-A FORWARD -d ff00::/8 -j ACCEPT\n-A POSTROUTING -s fe80::/10 -j ACCEPT\n-A POSTROUTING -d ff00::/8 -j ACCEPT";
 FILE    *iptables_file = NULL;
@@ -188,7 +189,6 @@ const char *tr_odd_even(void)
  }
 }
 
-
 /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */
 
 char *index_id(char *ip, int bitmask);
@@ -504,6 +504,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; }
   argument("-r") { run=TRUE; }
   argument("-n") { run=TRUE; nodelay=TRUE; }
+  argument("-b") { run=TRUE; nodelay=TRUE; skip_stats=TRUE; }
   argument("-a") { run=TRUE; just_networks=TRUE; }
   argument("-l") { just_logs=TRUE; }
   argument("-m") { just_logs=TRUE; }
@@ -546,7 +547,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    interface->chain = "FORWARD";
    interface->idxprefix = "forw";
    push(interface, interfaces);
-   printf("Upstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);
+   printf("Upstream interface %s: medium %s capacity %Ld kbps\n", interface->name, medium, interface->speed);
   }
  }
  done; /* ugly macro end */
@@ -572,7 +573,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    interface->chain = "POSTROUTING";
    interface->idxprefix = "post";
    push(interface, interfaces);
-   printf("Downstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);
+   printf("Downstream interface %s: medium %s capacity %Ld kbps\n", interface->name, medium, interface->speed);
   }
  }
  done; /* ugly macro end */
@@ -593,7 +594,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   hosts = althosts;
  }
 
- if(just_flush<9)
+ if(just_flush<9 && !skip_stats)
  {
   /*-----------------------------------------------------------------*/
   puts("Parsing iptables verbose output ...");
@@ -1134,7 +1135,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
         agreg = (int)((float)(avg_mbps_down+1)/min_mbps+.5);
         ip->max /= agreg;
         ip->pps_limit /= agreg;
-        printf("Download aggregation 1:%d for %s (min: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_down);
+        printf("Download aggregation 1:%d for %s (min: %d Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_down);
        }
        else
        {
@@ -1154,7 +1155,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
         unshape_this_ip = 0;
         agreg = (int)((float)(avg_mbps_up+1)/min_mbps+.5);
         ip->max /= agreg;
-        printf("Upload aggregation 1:%d for %s: (min: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_up);
+        printf("Upload aggregation 1:%d for %s: (min: %d Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_up);
        }
        else
        {
@@ -1241,7 +1242,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   json_traffic=json_preview;
  }
 
- if(!dry_run && !just_flush)
+ if(!dry_run && !just_flush && !skip_stats)
  {
   /*-----------------------------------------------------------------*/
   printf("Writing json traffic overview  %s ... ", json_traffic);