webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2014-01-12 19:05:54 +01:00
parent c05738b25e e11f536252
commit 07e9a1357d
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/cgi-bin/index.cgi
View File

@@ -404,7 +404,7 @@ END
my $display;
my $display_colour = $Header::colourred;
if ( $tustate[1] eq 'CONNECTED') {
if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) {
$display_colour = $Header::colourgreen;
$display = $Lang::tr{'capsopen'};
} else {

2
html/cgi-bin/ovpnmain.cgi
View File

@@ -4941,7 +4941,7 @@ END
#EXITING -- A graceful exit is in progress.
####
if ( $tustate[1] eq 'CONNECTED') {
if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) {
$col1="bgcolor='${Header::colourgreen}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
}else {

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

@@ -168,6 +168,29 @@ int readPidFile(const char *pidfile) {
return pid;
}
int readExternalAddress(char* address) {
FILE *fp = fopen("/var/ipfire/red/local-ipaddress", "r");
if (!fp)
goto ERROR;
int r = fscanf(fp, "%s", address);
fclose(fp);
if (r < 0)
goto ERROR;
/* In case the read IP address is not valid, we empty
* the content of address and return non-zero. */
if (!VALID_IP(address))
goto ERROR;
return 0;
ERROR:
address = NULL;
return 1;
}
void ovpnInit(void) {
// Read OpenVPN configuration
kv = initkeyvalues();
@@ -482,10 +505,18 @@ int startNet2Net(char *name) {
// Make sure all firewall rules are up to date.
setFirewallRules();
// Get the external IP address.
char address[STRING_SIZE] = "";
int r = readExternalAddress(address);
if (r) {
fprintf(stderr, "Could not read the external address\n");
exit(1);
}
char command[STRING_SIZE];
snprintf(command, STRING_SIZE-1, "/sbin/modprobe tun");
executeCommand(command);
snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config %s", configfile);
snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --local %s --config %s", address, configfile);
executeCommand(command);
return 0;