webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 10:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

misc-progs: getipstat: Refactor + extend

Browse Source 
* Return output of iptables directly instead of writing it to files.
 * Make iptables wait for 5s if xtables is locked by another iptables
 process. (--wait 5 argument)
 * Add optional parameter "-x" to have iptables report exact numbers.
 * Add optional parameter "-f" to display  the filter table  (default).
 * Add optional parameter "-n" to display the nat table.
 * Add optional parameter "-m" to display the mangle table.
  * Adapt iptables.cgi and guardian.cgi to catch getipstat output
  instead of reading temp-files.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Robin Roevens
2021-04-27 22:07:32 +02:00
committed by Michael Tremer
parent d8bf30563f
commit 8b68ed1226
3 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/misc-progs/getipstat.c
View File

@@ -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);
}