From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Jun 2013 12:14:53 +0000 (+0200)
Subject: openvpnctrl: Cleanup flushChain functions.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=d2c4a3cab92b07ebf0a01dc745d642429efd8159

openvpnctrl: Cleanup flushChain functions.
---

diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c
index 95027577e..97491e40c 100644
--- a/src/misc-progs/openvpnctrl.c
+++ b/src/misc-progs/openvpnctrl.c
@@ -259,7 +259,7 @@ void setChainRules(char *chain, char *interface, char *protocol, char *port)
 void flushChain(char *chain) {
 	char str[STRING_SIZE];
 
-	sprintf(str, "/sbin/iptables -F %sINPUT", chain);
+	sprintf(str, "/sbin/iptables -F %s", chain);
 	executeCommand(str);
 }
 
@@ -270,6 +270,13 @@ void flushChainNAT(char *chain) {
 	executeCommand(str);
 }
 
+void flushChainINPUT(char *chain) {
+	char str[STRING_SIZE];
+
+	snprintf(str, STRING_SIZE, "%sINPUT", chain);
+	flushChain(str);
+}
+
 void deleteChainReference(char *chain) {
 	char str[STRING_SIZE];
 
@@ -289,9 +296,9 @@ void deleteAllChains(void) {
 	deleteChainReference(OVPNRED);
 	deleteChainReference(OVPNBLUE);
 	deleteChainReference(OVPNORANGE);
-	flushChain(OVPNRED);
-	flushChain(OVPNBLUE);
-	flushChain(OVPNORANGE);
+	flushChainINPUT(OVPNRED);
+	flushChainINPUT(OVPNBLUE);
+	flushChainINPUT(OVPNORANGE);
 	deleteChain(OVPNRED);
 	deleteChain(OVPNBLUE);
 	deleteChain(OVPNORANGE);
@@ -459,9 +466,9 @@ void setFirewallRules(void) {
 	freekeyvalues(kv);
 
 	// Flush all chains.
-	flushChain(OVPNRED);
-	flushChain(OVPNBLUE);
-	flushChain(OVPNORANGE);
+	flushChainINPUT(OVPNRED);
+	flushChainINPUT(OVPNBLUE);
+	flushChainINPUT(OVPNORANGE);
 	flushChain(OVPNBLOCK);
 	flushChainNAT(OVPNNAT);