openvpnctrl: Cleanup flushChain functions.

This commit is contained in:
Michael Tremer
2013-06-12 14:14:53 +02:00
parent 2181b55552
commit d2c4a3cab9

View File

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