misc-progs: getipstat: Refactor + extend

[ipfire-2.x.git] / src / misc-progs / getipstat.c

diff --git a/src/misc-progs/getipstat.c b/src/misc-progs/getipstat.c
index c806d54a9b0145aa2f0a11c848bc158f6e70a481..99d053bbf8d1c9dfe17514ef6a010be8af508107 100644 (file)
--- a/src/misc-progs/getipstat.c
+++ b/src/misc-progs/getipstat.c
@@ -2,6 +2,15 @@
  *
  * Get the list from IPTABLES -L
  * 
+ * Optional commandline parameters:
+ *  -x 
+ *   instruct iptables to expand numbers
+ *  -f 
+ *   display filter table 
+ *  -n
+ *   display nat table
+ *  -m
+ *   display mangle table
  */
 
 #include <stdio.h>
@@ -9,20 +18,60 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include "setuid.h"
 
-
-int main(void)
+int main(int argc, char** argv)
 {
+       // Set defaults
+       // first argument has to be "iptables" since execve executes the program pointed to by filename
+       // but /sbin/iptables is actually a symlink to /sbin/xtables-legacy-multi hence that program is executed
+       // however without the notion that it was called as "iptables". So we have to pass "iptables" as first
+       // argument.
+       char *args[10] = {"iptables", "--list", "--verbose", "--numeric", "--wait", "5", NULL, NULL, NULL, NULL};
+       char *usage = "getipstat [-x][-f|-n|-m]";
+       unsigned int pcount = 6;
+       unsigned int table_set = 0;
+
+       int opt;
+       
        if (!(initsetuid()))
                exit(1);
 
-       safe_system("/sbin/iptables -L -v -n > /var/tmp/iptables.txt");
-       safe_system("/sbin/iptables -L -v -n -t nat > /var/tmp/iptablesnat.txt");
-       safe_system("/sbin/iptables -t mangle -L -v -n > /var/tmp/iptablesmangle.txt");
-       safe_system("chown nobody.nobody /var/tmp/iptables.txt /var/tmp/iptablesnat.txt /var/tmp/iptablesmangle.txt");
-       
-       return 0;
+       // Parse command line arguments
+       if (argc > 1) {
+               while ((opt = getopt(argc, argv, "xfnm")) != -1) {
+                       switch(opt) {
+                               case 'x':
+                                       args[pcount++] = "--exact";
+                                       break;
+                               case 'f':
+                                       table_set++;
+                                       break;
+                               case 'n':
+                                       if (table_set == 0) {
+                                               args[pcount++] = "--table";
+                                               args[pcount++] = "nat";
+                                       }
+                                       table_set++;
+                                       break;
+                               case 'm':
+                                       if (table_set == 0) {
+                                               args[pcount++] = "--table";
+                                               args[pcount++] = "mangle";
+                                       }
+                                       table_set++;
+                                       break;
+                               default:
+                                       fprintf(stderr, "\nBad argument given.\n\n%s\n", usage);
+                                       exit(1);
+                       }
+               }
+               if (table_set > 1) {
+                       fprintf(stderr, "\nArguments -f/-n/-m are mutualy exclusive.\n\n%s\n", usage);
+                       exit(1);
+               }
+       }
+
+       return run("/sbin/iptables", args);
 }