revert to 267 + zachovana oprava #include <stdio.h> v utils.h

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

diff --git a/help.c b/help.c
index 89f9550b95ef3893c60cbe85fcd5a72eb54bc50e..868f0e69342ee4eb1236e3daca74d9b17a9d198a 100644 (file)
--- a/help.c
+++ b/help.c
@@ -12,7 +12,6 @@ void help(void)
 -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\
--x   miX new address added to configuration after startup (after -r)\n\
 -q   Quit shaping FUP limits (keeps data transfer stat like -p) (after -r)\n\
 -2   Reduce HTB ceil (min+(max-min)/2 + keep stats like -p) (after -r)\n\
 -4   Reduce HTB ceil (min+(max-min)/4 + keep stats like -p) (after -r)\n\

diff --git a/ipstruct.h b/ipstruct.h
index f8d09e5501fabc6521e20510e698ab9e96fcdee7..80810fcaffcc0ec999070298780b66858286c32e 100644 (file)
--- a/ipstruct.h
+++ b/ipstruct.h
@@ -79,13 +79,6 @@ struct QosFreeInterface
  list(QosFreeInterface);\r
 };\r
 \r
-struct Textfile\r
-{\r
- char *str;\r
- int _eoln;\r
- list(Textfile);\r
-};\r
-\r
 struct Index\r
 {\r
  char *addr;\r

diff --git a/optional-tools/make-iptables-restore b/optional-tools/make-iptables-restore
index c4c0ce481ddfd84c77b0c42515c55121a11d6ff6..950a2dd8db3c8c9308fbf8288c1a920106c5c581 100755 (executable)
--- a/optional-tools/make-iptables-restore
+++ b/optional-tools/make-iptables-restore
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id$
+# $Id: make-iptables-restore 172 2012-05-13 16:10:52Z aquarius $
 iptables="/sbin/iptables"
 iptablesrestore="/sbin/iptables-restore"
 ifconfig="/sbin/ifconfig"

diff --git a/optional-tools/make-pimp b/optional-tools/make-pimp
index 8bc77a0bc7832a5232c6c3db1efa367218886735..0d53c9505bfe93f03e328b33b06e32bc0d8c4e39 100755 (executable)
--- a/optional-tools/make-pimp
+++ b/optional-tools/make-pimp
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id$
+# $Id: make-pimp 166 2012-05-12 18:15:42Z aquarius $
 pimp_2way_nat="/dev/shm/pimp-2way-nat.tmp"
 pimp_snat="/dev/shm/pimp-snat.tmp"
 etchosts="/mnt/mtdblock0/hosts"

diff --git a/parsehosts.c b/parsehosts.c
index 8c9eca159c6d1b3304f8e45342c1c04d2eeaced9..47b06bd5c28925d6495e7ddf20ca6065311a98e4 100644 (file)
--- a/parsehosts.c
+++ b/parsehosts.c
@@ -11,9 +11,7 @@ extern struct IP *ips, *ip, *sharedip, *networks;
 extern struct Group *groups, *group;\r
 extern struct Keyword *keyword, *defaultkeyword, *keywords;\r
 extern struct Macro *macro, *macros;\r
-extern struct Textfile *previous_classmap, *textline;\r
 extern int class_count;\r
-extern int mix_new_hosts;\r
 extern int ip_count;\r
 extern int found_lmsid;\r
 extern int free_min;\r
@@ -344,23 +342,7 @@ void parse_hosts(char *hosts)
       }\r
      }\r
 \r
-     if(mix_new_hosts)\r
-      for_each(textline, previous_classmap)\r
-      {\r
-       ptr = strchr(textline->str, ' ');\r
-       if(ptr)\r
-       {\r
-        if(!strncmp(ip->addr, textline->str, ptr-textline->str))\r
-        {\r
-         ip->mark = atoi(ptr+1);\r
-         printf("Match class: %s %d\n", ip->addr, ip->mark);\r
-        }\r
-       }      \r
-      }\r
-     \r
-     if(!mix_new_hosts || !ip->mark)\r
-      ip->mark = FIRSTIPCLASS+1+class_count++;\r
-          \r
+     ip->mark = FIRSTIPCLASS+1+class_count++;     \r
      update_network(ip->addr, ip);\r
 \r
      if_exists(group,groups,(group->min == ip->min)) \r

diff --git a/prometheus.c b/prometheus.c
index 5a9492e3e7592cc4cf8fac51f5a98e674039016e..7adff3cc6b493b5b9481a6284af7b6265e799b7d 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -2,12 +2,12 @@
 /* Prometheus QoS - you can "steal fire" from your ISP         */\r
 /* "fair-per-IP" quality of service (QoS) utility              */\r
 /* requires Linux 2.4.x or 2.6.x with HTB support              */\r
-/* Copyright(C) 2005-2019 Michael Polak, Arachne Aerospace     */\r
+/* Copyright(C) 2005-2017 Michael Polak, Arachne Aerospace     */\r
 /* iptables-restore support Copyright(C) 2007-2008 ludva       */\r
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
-/* Modified by: xChaos, 20190212\r
+/* Modified by: xChaos, 20171106\r
                  ludva, 20080415\r
  \r
    Prometheus QoS is free software; you can redistribute it and/or\r
@@ -29,7 +29,7 @@
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
 \r
-const char *version = "0.9.1";\r
+const char *version = "0.9.0-b";\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 /* Versions: 0.9.0 is development release, 1.0 will be "stable"    */\r
@@ -40,7 +40,7 @@ const char *version = "0.9.1";
 /* Warning: unofficial Github mirror is not supported by author!  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
-const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2019 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2017 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r
 \r
 #define STRLEN 512\r
 #undef DEBUG\r
@@ -87,8 +87,6 @@ char      *final_chain = "DROP"; /* REJECT would be better, but it is impossible
 char             *mark = "MARK";\r
 char    *mark_iptables = "MARK --set-mark ";\r
 int            dry_run = FALSE; /* preview - use puts() instead of system() */\r
-int      mix_new_hosts = FALSE; /* execute only commands not already in log of iptables */\r
-char    *log_file_mode = "w";   /* overwrite command and iptables log files, except append in -x mode */\r
 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]";\r
 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";\r
 FILE    *iptables_file = NULL;\r
@@ -128,12 +126,12 @@ int           ip_count = 0;
 FILE         *log_file = NULL;\r
 char              *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */\r
 \r
-const int highest_priority   = 0;  /* highest HTB priority (HTB built-in value is 0) */\r
-const int lowest_priority    = 7;  /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */\r
-const int idxtable_treshold1 = 24; /* this is no longer configurable */\r
-const int idxtable_treshold2 = 12; /* this is no longer configurable */\r
-const int idxtable_bitmask1  = 3;  /* this is no longer configurable */\r
-const int idxtable_bitmask2  = 3;  /* this is no longer configurable */\r
+const int highest_priority   = 0; /* highest HTB priority (HTB built-in value is 0) */\r
+const int lowest_priority    = 7; /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */\r
+const int idxtable_treshold1 = 24;      /* this is no longer configurable */\r
+const int idxtable_treshold2 = 12;      /* this is no longer configurable */\r
+const int idxtable_bitmask1  = 3;        /* this is no longer configurable */\r
+const int idxtable_bitmask2  = 3;        /* this is no longer configurable */\r
 \r
 struct IP *ips = NULL, *networks = NULL, *ip, *sharedip;\r
 struct Group *groups = NULL, *group;\r
@@ -142,7 +140,6 @@ struct Macro *macro, *macros = NULL;
 struct Index *idxs = NULL, *idx, *metaindex;\r
 struct Interface *interfaces = NULL, *interface;\r
 struct QosFreeInterface *qosfreeinterfaces = NULL, *qosfreeinterface;\r
-struct Textfile *previous_commands = NULL, *previous_iptables = NULL, *previous_ip6tables = NULL, *previous_classmap = NULL, *textline;\r
 \r
 #define FREE_CLASS      3\r
 #define OVERLIMIT_CLASS 4\r
@@ -187,6 +184,7 @@ const char *tr_odd_even(void)
  }\r
 }\r
 \r
+\r
 /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */\r
 \r
 char *index_id(char *ip, int bitmask);\r
@@ -380,31 +378,9 @@ void safe_run(char *cmd)
  }\r
  else\r
  {\r
-  int skip_cmd = FALSE;\r
-  if(mix_new_hosts)\r
-  {\r
-   skip_cmd = FALSE;\r
-   for_each(textline, previous_commands)\r
-   {\r
-    if(eq(textline->str, cmd))\r
-    {\r
-     skip_cmd = TRUE;\r
-     break;\r
-    }\r
-   }\r
-  }\r
- \r
-  if(!skip_cmd)\r
-  {\r
-   if(mix_new_hosts)\r
-   {\r
-    printf("Executing command: %s\n", cmd);\r
-   }\r
-   else\r
-    system(cmd);\r
-  }\r
+  system(cmd);\r
  }\r
- if(log_file && !mix_new_hosts)//!!debug\r
+ if(log_file)\r
  {\r
   fprintf(log_file,"%s\n",cmd);\r
  }\r
@@ -412,41 +388,14 @@ void safe_run(char *cmd)
 \r
 void iptables_save_line(char *line, int ipv6)\r
 {\r
- const char *cmd = NULL;\r
-    \r
  if(ipv6)\r
  {\r
-  if(mix_new_hosts)\r
-   for_each(textline, previous_ip6tables)\r
-    if(eq(textline->str, line))\r
-    {\r
-     printf("Match: %s\n",line);\r
-     return;\r
-    }\r
-\r
-  if(!mix_new_hosts) //!!debug\r
-   fprintf(ip6tables_file,"%s\n",line);\r
-  cmd = ip6tables;\r
+  fprintf(ip6tables_file,"%s\n",line);\r
  }\r
  else\r
  {\r
-  if(mix_new_hosts)\r
-   for_each(textline, previous_iptables)\r
-    if(eq(textline->str, line))\r
-    {\r
-     printf("Match: %s\n",line);\r
-     return;\r
-    }     \r
-\r
-  if(!mix_new_hosts) //!!debug\r
-   fprintf(iptables_file,"%s\n",line);\r
-  cmd = iptables;\r
+  fprintf(iptables_file,"%s\n",line);\r
  }\r
- if(mix_new_hosts)\r
- {\r
- \r
-  printf("Executing command: %s %s\n",cmd, line);\r
- } \r
 }\r
 \r
 #define IPv4 FALSE\r
@@ -520,7 +469,7 @@ program
  int just_preview  = FALSE;       /* preview - generate just stats */\r
  int start_shaping = FALSE;       /* apply FUP - requires classmap file */\r
  int stop_shaping  = FALSE;       /* lift FUP - requires classmap file */\r
- int reduce_ceil   = 0;           /* allow only rate+(ceil-rate)/2, /4, etc. */\r
+ int reduce_ceil     = 0;           /* allow only rate+(ceil-rate)/2, /4, etc. */\r
  int just_logs     = FALSE;       /* just parse logs */\r
  int run           = FALSE;\r
  int total         = 0;\r
@@ -529,7 +478,7 @@ program
   \r
  printf("\n\\r
 Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\\r
-Version %s - Copyright (C)2005-2019 Michael Polak, Arachne Labs\n\\r
+Version %s - Copyright (C)2005-2017 Michael Polak, Arachne Labs\n\\r
 iptables-restore & burst tunning & classify modification by Ludva\n\\r
 Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);\r
 \r
@@ -538,21 +487,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  {\r
   argument("-c") { nextargument(config); }\r
   argument("-h") { nextargument(althosts);}\r
-  argument("-d") { run = TRUE; dry_run = TRUE; }\r
-  argument("-f") { run = TRUE; just_flush = TRUE; }\r
-  argument("-9") { run = TRUE; just_flush = 9; }\r
-  argument("-p") { run = TRUE; just_preview = TRUE; }\r
-  argument("-q") { run = TRUE; just_preview = TRUE; stop_shaping = TRUE; }\r
-  argument("-2") { run = TRUE; just_preview = TRUE; reduce_ceil = 2; }\r
-  argument("-4") { run = TRUE; just_preview = TRUE; reduce_ceil = 4; }\r
-  argument("-s") { run = TRUE; just_preview = TRUE; start_shaping = TRUE; }\r
-  argument("-x") { run = TRUE; mix_new_hosts = TRUE; log_file_mode = "a"; }\r
-  argument("-r") { run = TRUE; }\r
-  argument("-n") { run = TRUE; nodelay = TRUE; }\r
-  argument("-a") { run = TRUE; just_networks = TRUE; }\r
-  argument("-l") { just_logs = TRUE; }\r
-  argument("-m") { just_logs = TRUE; }\r
-  argument("-y") { just_logs = TRUE; }\r
+  argument("-d") { run=TRUE; dry_run=TRUE; }\r
+  argument("-f") { run=TRUE; just_flush=TRUE; }\r
+  argument("-9") { run=TRUE; just_flush=9; }\r
+  argument("-p") { run=TRUE; just_preview=TRUE; }\r
+  argument("-q") { run=TRUE; just_preview=TRUE; stop_shaping=TRUE; }\r
+  argument("-2") { run=TRUE; just_preview=TRUE; reduce_ceil=2; }\r
+  argument("-4") { run=TRUE; just_preview=TRUE; reduce_ceil=4; }\r
+  argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; }\r
+  argument("-r") { run=TRUE; }\r
+  argument("-n") { run=TRUE; nodelay=TRUE; }\r
+  argument("-a") { run=TRUE; just_networks=TRUE; }\r
+  argument("-l") { just_logs=TRUE; }\r
+  argument("-m") { just_logs=TRUE; }\r
+  argument("-y") { just_logs=TRUE; }\r
   argument("-?") { help(); exit(0); }\r
   argument("--help") { help(); exit(0); }\r
   argument("-v") { exit(0); } \r
@@ -638,7 +586,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   hosts = althosts;\r
  }\r
 \r
- if(!mix_new_hosts && just_flush<9)\r
+ if(just_flush<9)\r
  {\r
   /*-----------------------------------------------------------------*/\r
   puts("Parsing iptables verbose output ...");\r
@@ -682,6 +630,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  }\r
  done; /* ugly macro end */\r
 \r
+\r
+\r
  /*-----------------------------------------------------------------*/\r
  printf("Parsing class defintion file %s ...\n", hosts);\r
  /*-----------------------------------------------------------------*/\r
@@ -695,27 +645,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  }\r
 */\r
 \r
- if(mix_new_hosts)\r
- {\r
-  char *eoln;\r
-  /*-----------------------------------------------------------------*/\r
-  printf("Loading log of previously executed commands %s ...\n", cmdlog);\r
-  /*-----------------------------------------------------------------*/\r
-  load(textline, previous_commands, cmdlog, Textfile, str);\r
-  /*-----------------------------------------------------------------*/\r
-  printf("Loading log of iptables-restore commands %s ...\n", iptablesfile);\r
-  /*-----------------------------------------------------------------*/\r
-  load(textline, previous_iptables, iptablesfile, Textfile, str);\r
-  /*-----------------------------------------------------------------*/\r
-  printf("Loading log of ip6tables-restore commands %s ...\n", ip6tablesfile);\r
-  /*-----------------------------------------------------------------*/\r
-  load(textline, previous_ip6tables, ip6tablesfile, Textfile, str);\r
- /*-----------------------------------------------------------------*/\r
-  printf("Loading map of IP addresses to tc classes  %s ...\n", classmap);\r
-  /*-----------------------------------------------------------------*/\r
-  load(textline, previous_classmap, classmap, Textfile, str);\r
- }\r
-\r
  /*-----------------------------------------------------------------*/\r
  puts("Resolving shared connections ...");\r
  /*-----------------------------------------------------------------*/\r
@@ -756,7 +685,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   }\r
  }\r
 \r
- if(!mix_new_hosts && enable_credit && just_flush<9)\r
+ if(enable_credit && just_flush<9)\r
  {\r
   /*-----------------------------------------------------------------*/\r
   printf("Parsing credit file %s ...\n", credit);\r
@@ -778,36 +707,33 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
  if(!just_preview)\r
  {\r
-  if(!mix_new_hosts)\r
-  {\r
-   /*-----------------------------------------------------------------*/\r
-   puts("Initializing iptables and tc classes ...");\r
-   /*-----------------------------------------------------------------*/\r
+  /*-----------------------------------------------------------------*/\r
+  puts("Initializing iptables and tc classes ...");\r
+  /*-----------------------------------------------------------------*/\r
   \r
-   iptables_file = fopen(iptablesfile, "w");\r
-   if(iptables_file == NULL)\r
-   {\r
+  iptables_file = fopen(iptablesfile, "w");\r
+  if(iptables_file == NULL)\r
+  {\r
     perror(iptablesfile);\r
     exit(-1);\r
-   }\r
-   iptables_save_line(iptablespreamble, IPv4);\r
+  }\r
+  iptables_save_line(iptablespreamble, IPv4);\r
 \r
-   if(ip6prefix)\r
+  if(ip6prefix)\r
+  {\r
+   ip6tables_file = fopen(ip6tablesfile, "w");\r
+   if(ip6tables_file == NULL)\r
    {\r
-    ip6tables_file = fopen(ip6tablesfile, "w");\r
-    if(ip6tables_file == NULL)\r
-    {\r
-      perror(ip6tablesfile);\r
-      exit(-1);\r
-     }\r
-    iptables_save_line(iptablespreamble, IPv6);\r
-    iptables_save_line(ip6preamble, IPv6);\r
+     perror(ip6tablesfile);\r
+     exit(-1);\r
    }\r
-\r
-   run_iptables_restore();\r
+   iptables_save_line(iptablespreamble, IPv6);\r
+   iptables_save_line(ip6preamble, IPv6);\r
   }\r
+\r
+  run_iptables_restore();\r
   \r
-  log_file = fopen(cmdlog, log_file_mode); /* overwrite command and iptables log files, except append in -x mode */\r
+  log_file = fopen(cmdlog, "w");\r
   if(log_file == NULL) \r
   {\r
     perror(cmdlog);\r
@@ -819,17 +745,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    sprintf(str,"%s qdisc del dev %s root 2>/dev/null", tc, interface->name);\r
    safe_run(str);\r
   }\r
-\r
-  if(!mix_new_hosts)\r
-  {  \r
-   iptables_file = fopen(iptablesfile, log_file_mode); /* overwrite command and iptables log files, except append in -x mode */\r
-   iptables_save_line(iptablespreamble, IPv4);\r
-   if(ip6prefix)\r
-   {\r
-    ip6tables_file = fopen(ip6tablesfile, log_file_mode); /* overwrite command and iptables log files, except append in -x mode */\r
-    iptables_save_line(iptablespreamble, IPv6);\r
-    iptables_save_line(ip6preamble, IPv6);\r
-   }\r
+  \r
+  iptables_file=fopen(iptablesfile,"w");\r
+  iptables_save_line(iptablespreamble, IPv4);\r
+  if(ip6prefix)\r
+  {\r
+   ip6tables_file=fopen(ip6tablesfile,"w");\r
+   iptables_save_line(iptablespreamble, IPv6);\r
+   iptables_save_line(ip6preamble, IPv6);\r
   }\r
 \r
   if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */\r
@@ -1002,7 +925,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   exit(0);\r
  }\r
 \r
- if(!mix_new_hosts && !just_preview)\r
+ if(!just_preview)\r
  {\r
   if(!dry_run && !nodelay && qos_free_delay)\r
   {\r
@@ -1026,13 +949,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   }\r
  }\r
 \r
- if(mix_new_hosts)\r
- {\r
-  /*-----------------------------------------------------------------*/\r
-  puts("Locating heavy downloaders and generating root classes ...");\r
-  /*-----------------------------------------------------------------*/\r
-  sort(ip,ips,desc_order_by,traffic);\r
- }\r
+ /*-----------------------------------------------------------------*/\r
+ puts("Locating heavy downloaders and generating root classes ...");\r
+ /*-----------------------------------------------------------------*/\r
+ sort(ip,ips,desc_order_by,traffic); \r
 \r
  /*-----------------------------------------------------------------*/\r
  for_each(interface, interfaces)\r
@@ -1267,7 +1187,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   json_traffic=json_preview;\r
  }\r
 \r
- if(!mix_new_hosts && !dry_run && !just_flush)\r
+ if(!dry_run && !just_flush)\r
  {\r
   /*-----------------------------------------------------------------*/\r
   printf("Writing json traffic overview  %s ... ", json_traffic);\r
@@ -1298,8 +1218,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
   printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);\r
   exit(0);\r
- }\r
- \r
+ }  \r
+\r
  i=0;\r
 #ifdef DEBUG\r
  printf("%-22s %-15s mark\n","name","ip");\r
@@ -1420,7 +1340,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    }\r
    i++;\r
   }\r
-  /* classmap */\r
   if(ip->min && f > 0)\r
   {\r
    fprintf(f, "%s %d\n", ip->addr, ip->mark);\r
@@ -1488,10 +1407,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   safe_run(str);\r
  } \r
  printf("Total IP count: %d\n", i);\r
- if(!mix_new_hosts)\r
- {\r
-  run_iptables_restore();\r
- }\r
+ run_iptables_restore();\r
  if(log_file)\r
  {\r
   fclose(log_file);\r