code readability

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

diff --git a/prometheus.c b/prometheus.c
index a41ba723a92e71e37ba4a7cfbb1725036645737f..992e6bd6396fca31f3ac9de4e953cb5f6a07f111 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -395,6 +395,10 @@ void iptables_save_line(char *line, int ipv6)
  }\r
 }\r
 \r
+#define IPv4 FALSE\r
+#define IPv6 TRUE\r
+\r
+\r
 void run_iptables_restore(void)\r
 {\r
  char *restor;\r
@@ -404,7 +408,7 @@ void run_iptables_restore(void)
  printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);\r
  /*-----------------------------------------------------------------*/\r
 \r
- iptables_save_line("COMMIT", FALSE);\r
+ iptables_save_line("COMMIT", IPv4);\r
  fclose(iptables_file);\r
  if(dry_run) \r
  {\r
@@ -423,7 +427,7 @@ void run_iptables_restore(void)
   /*-----------------------------------------------------------------*/\r
   printf("Running %s <%s ...\n", ip6tablesrestore, ip6tablesfile);\r
   /*-----------------------------------------------------------------*/\r
-  iptables_save_line("COMMIT", TRUE);\r
+  iptables_save_line("COMMIT", IPv6);\r
   fclose(ip6tables_file);\r
   if(dry_run) \r
   {\r
@@ -705,7 +709,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     perror(iptablesfile);\r
     exit(-1);\r
   }\r
-  iptables_save_line(iptablespreamble, FALSE);\r
+  iptables_save_line(iptablespreamble, IPv4);\r
 \r
   if(ip6prefix)\r
   {\r
@@ -715,8 +719,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      perror(ip6tablesfile);\r
      exit(-1);\r
    }\r
-   iptables_save_line(iptablespreamble, TRUE);\r
-   iptables_save_line(ip6preamble, TRUE);\r
+   iptables_save_line(iptablespreamble, IPv6);\r
+   iptables_save_line(ip6preamble, IPv6);\r
   }\r
 \r
   run_iptables_restore();\r
@@ -735,12 +739,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   }\r
   \r
   iptables_file=fopen(iptablesfile,"w");\r
-  iptables_save_line(iptablespreamble, FALSE);\r
+  iptables_save_line(iptablespreamble, IPv4);\r
   if(ip6prefix)\r
   {\r
    ip6tables_file=fopen(ip6tablesfile,"w");\r
-   iptables_save_line(iptablespreamble, TRUE);\r
-   iptables_save_line(ip6preamble, TRUE);\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
@@ -748,7 +752,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    for_each(interface, interfaces)\r
    {\r
     sprintf(str,"-A %s -%c %s -o %s -j ACCEPT", interface->chain, (interface->is_upstream?'d':'s'), qos_free_zone, interface->name);\r
-    iptables_save_line(str, FALSE);\r
+    iptables_save_line(str, IPv4);\r
    }\r
   }\r
   \r
@@ -760,12 +764,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    printf("Detected %d addresses - indexing iptables rules to improve performance...\n",ip_count);\r
    /*-----------------------------------------------------------------*/\r
 \r
-   iptables_save_line(":post_common - [0:0]", FALSE);\r
-   iptables_save_line(":forw_common - [0:0]", FALSE);\r
+   iptables_save_line(":post_common - [0:0]", IPv4);\r
+   iptables_save_line(":forw_common - [0:0]", IPv4);\r
    if(ip6prefix)\r
    {\r
-    iptables_save_line(":post_common - [0:0]", TRUE);\r
-    iptables_save_line(":forw_common - [0:0]", TRUE);\r
+    iptables_save_line(":post_common - [0:0]", IPv6);\r
+    iptables_save_line(":forw_common - [0:0]", IPv6);\r
    }\r
 \r
    for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) \r
@@ -882,11 +886,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    for_each(interface, interfaces)\r
    {\r
     sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix);\r
-    iptables_save_line(str, FALSE);\r
+    iptables_save_line(str, IPv4);\r
     if(ip6prefix)\r
     {\r
      sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix);\r
-     iptables_save_line(str, TRUE);\r
+     iptables_save_line(str, IPv6);\r
     }\r
    }\r
   }\r
@@ -1348,15 +1352,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
    sprintf(str, "-A %s -o %s -j %s%d",\r
                 chain, interface->name, mark_iptables, FREE_CLASS);\r
-   iptables_save_line(str, FALSE); /* only for IPv4 */\r
+   iptables_save_line(str, IPv4); /* only for IPv4 */\r
   }\r
 \r
   sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain);\r
-  iptables_save_line(str, FALSE);\r
+  iptables_save_line(str, IPv4);\r
   if(ip6prefix)\r
   {\r
    sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain);\r
-   iptables_save_line(str, TRUE);\r
+   iptables_save_line(str, IPv6);\r
   }\r
 \r
   if(free_min) /* allocate free bandwith if it is not zero... */ \r