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

openvpnctrl: Suppress silly error messages and cleanup coding style.

Browse Source
This commit is contained in:
Michael Tremer
2013-09-02 21:05:47 +02:00
parent 15ffeb1bdd
commit 3ad23ee1d9
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/misc-progs/openvpnctrl.c
View File

@@ -175,7 +175,6 @@ int readPidFile(const char *pidfile) {
} }
void ovpnInit(void) { void ovpnInit(void) {
// Read OpenVPN configuration // Read OpenVPN configuration
kv = initkeyvalues(); kv = initkeyvalues();
if (!readkeyvalues(kv, CONFIG_ROOT "/ovpn/settings")) { if (!readkeyvalues(kv, CONFIG_ROOT "/ovpn/settings")) {
@@ -184,17 +183,14 @@ void ovpnInit(void) {
} }
if (!findkey(kv, "ENABLED", enablered)) { if (!findkey(kv, "ENABLED", enablered)) {
fprintf(stderr, "Cannot read ENABLED\n");
exit(1); exit(1);
} }
if (!findkey(kv, "ENABLED_BLUE", enableblue)){ if (!findkey(kv, "ENABLED_BLUE", enableblue)){
fprintf(stderr, "Cannot read ENABLED_BLUE\n");
exit(1); exit(1);
} }
if (!findkey(kv, "ENABLED_ORANGE", enableorange)){ if (!findkey(kv, "ENABLED_ORANGE", enableorange)){
fprintf(stderr, "Cannot read ENABLED_ORANGE\n");
exit(1); exit(1);
} }
freekeyvalues(kv); freekeyvalues(kv);
@@ -220,24 +216,22 @@ void ovpnInit(void) {
} }
kv=initkeyvalues(); kv=initkeyvalues();
if (!readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings")) if (!readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings")) {
{
fprintf(stderr, "Cannot read ethernet settings\n"); fprintf(stderr, "Cannot read ethernet settings\n");
exit(1); exit(1);
} }
if (strcmp(enableblue, "on")==0){ if (strcmp(enableblue, "on") == 0) {
if (!findkey(kv, "BLUE_DEV", blueif)){ if (!findkey(kv, "BLUE_DEV", blueif)) {
fprintf(stderr, "Cannot read BLUE_DEV\n");
exit(1); exit(1);
} }
} }
if (strcmp(enableorange, "on")==0){
if (!findkey(kv, "ORANGE_DEV", orangeif)){ if (strcmp(enableorange, "on") == 0) {
fprintf(stderr, "Cannot read ORNAGE_DEV\n"); if (!findkey(kv, "ORANGE_DEV", orangeif)) {
exit(1); exit(1);
} }
} }
freekeyvalues(kv); freekeyvalues(kv);
} }
@@ -323,7 +317,7 @@ void createChain(char *chain) {
void createAllChains(void) { void createAllChains(void) {
// create chain and chain references // create chain and chain references
if (!strcmp(enableorange, "on")) { if (!strcmp(enableorange, "on")) {
if (strlen(orangeif)) { if (strlen(orangeif) > 0) {
createChain(OVPNORANGE); createChain(OVPNORANGE);
createChainReference(OVPNORANGE); createChainReference(OVPNORANGE);
} else { } else {
@@ -333,7 +327,7 @@ void createAllChains(void) {
} }
if (!strcmp(enableblue, "on")) { if (!strcmp(enableblue, "on")) {
if (strlen(blueif)) { if (strlen(blueif) > 0) {
createChain(OVPNBLUE); createChain(OVPNBLUE);
createChainReference(OVPNBLUE); createChainReference(OVPNBLUE);
} else { } else {
@@ -343,7 +337,7 @@ void createAllChains(void) {
} }
if (!strcmp(enablered, "on")) { if (!strcmp(enablered, "on")) {
if (strlen(redif)) { if (strlen(redif) > 0) {
createChain(OVPNRED); createChain(OVPNRED);
createChainReference(OVPNRED); createChainReference(OVPNRED);
} else { } else {
@@ -461,7 +455,6 @@ void setFirewallRules(void) {
if (!findkey(kv, "VPN_IP", dovpnip)){ if (!findkey(kv, "VPN_IP", dovpnip)){
fprintf(stderr, "Cannot read VPN_IP\n"); fprintf(stderr, "Cannot read VPN_IP\n");
// exit(1); step further as we don't need an ip
} }
freekeyvalues(kv); freekeyvalues(kv);
@@ -530,7 +523,7 @@ void stopDaemon(void) {
void startDaemon(void) { void startDaemon(void) {
char command[STRING_SIZE]; char command[STRING_SIZE];
if (!((strcmp(enablered, "on")==0) || (strcmp(enableblue, "on")==0) || (strcmp(enableorange, "on")==0))){ if (!((strcmp(enablered, "on") == 0) || (strcmp(enableblue, "on") == 0) || (strcmp(enableorange, "on") == 0))) {
fprintf(stderr, "OpenVPN is not enabled on any interface\n"); fprintf(stderr, "OpenVPN is not enabled on any interface\n");
exit(1); exit(1);
} else { } else {