xdp-geoip: safe call to xdpgeoip init script

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>

config/rootfiles/common/misc-progs

@@ -43,3 +43,4 @@ usr/local/bin/loxilbctrl
 usr/local/bin/keepalivedctrl
 usr/local/bin/xdpdnsctrl
 usr/local/bin/xdpsnictrl
+usr/local/bin/xdpgeoipctrl

html/cgi-bin/location-block.cgi

@@ -85,6 +85,13 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
 	}
 
 	&General::writehash("$settingsfile", \%settings);
+
+	# Check if we want to disable locationblock.
+	if ( $settings{'LOCATIONBLOCK_ENABLED'} eq "on" ) {
+                &General::system('/usr/local/bin/xdpgeoipctrl', 'start');
+	} else {
+                &General::system('/usr/local/bin/xdpgeoipctrl', 'stop');
+	}
 }
 
 &Header::openpage($Lang::tr{'locationblock configuration'}, 1, '');

src/misc-progs/Makefile

@@ -32,7 +32,7 @@ SUID_PROGS = squidctrl sshctrl ipfirereboot \
 	smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
 	setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \
 	getconntracktable wirelessclient torctrl ddnsctrl unboundctrl \
-	captivectrl ddosctrl loxilbctrl keepalivedctrl xdpdnsctrl xdpsnictrl
+	captivectrl ddosctrl loxilbctrl keepalivedctrl xdpdnsctrl xdpsnictrl xdpgeoipctrl
 
 OBJS = $(patsubst %,%.o,$(PROGS) $(SUID_PROGS))
 

src/misc-progs/xdpgeoipctrl.c

@@ -0,0 +1,40 @@
+/* This file is part of the BPFire Firewall.
+ *
+ * This program is distributed under the terms of the GNU General Public
+ * Licence.  See the file COPYING for details.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include "setuid.h"
+
+int main(int argc, char *argv[]) {
+
+	if (!(initsetuid()))
+		exit(1);
+
+	if (argc < 2) {
+		fprintf(stderr, "\nNo argument given.\n\nxdpgeoipctrl (start|stop|restart)\n\n");
+		exit(1);
+	}
+
+	if (strcmp(argv[1], "start") == 0) {
+		safe_system("/etc/rc.d/init.d/xdpgeoip start");
+	} else if (strcmp(argv[1], "stop") == 0) {
+		safe_system("/etc/rc.d/init.d/xdpgeoip stop");
+	} else if (strcmp(argv[1], "restart") == 0) {
+		safe_system("/etc/rc.d/init.d/xdpgeoip restart");
+	} else if (strcmp(argv[1], "status") == 0) {
+		safe_system("/etc/rc.d/init.d/xdpgeoip status");
+	} else {
+		fprintf(stderr, "\nBad argument given.\n\nxdpgeoipctrl (start|stop|restart|status)\n\n");
+		exit(1);
+	}
+
+	return 0;
+}