From 7f2c8034fb5d31503ffb5921427a9be8f1eea0e3 Mon Sep 17 00:00:00 2001 From: Ermal Date: Mon, 28 Mar 2011 10:37:11 +0000 Subject: Test the existence of route_vpn_gateway variable and if set use it as a gateway. Recommended-by: http://forum.pfsense.org/index.php/topic,24436.msg158589.html#msg158589 --- usr/local/sbin/ovpn-linkup | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/sbin/ovpn-linkup b/usr/local/sbin/ovpn-linkup index 60489c2..613822c 100755 --- a/usr/local/sbin/ovpn-linkup +++ b/usr/local/sbin/ovpn-linkup @@ -2,7 +2,11 @@ # let the configuration system know that the ip has changed. #/usr/local/sbin/pfSctl -c "interface newip $interface" -/bin/echo $4 > /tmp/$1_router +if [ -n $route_vpn_gateway ]; then + /bin/echo $route_vpn_gateway > /tmp/$1_router +else + /bin/echo $4 > /tmp/$1_router +fi /usr/bin/touch /tmp/$1up # reload filter /usr/local/sbin/pfSctl -c "interface newip $1" -- cgit v1.1 From c6dfd2892306623d5b988a0955abb6eb343f9766 Mon Sep 17 00:00:00 2001 From: jim-p Date: Mon, 28 Mar 2011 12:16:08 -0400 Subject: In IPsec, s/mobileclients/client/, this was changed long ago in the config but not everywhere followed. --- usr/local/www/firewall_nat_1to1_edit.php | 2 +- usr/local/www/firewall_nat_edit.php | 2 +- usr/local/www/firewall_nat_out_edit.php | 2 +- usr/local/www/firewall_rules.php | 2 +- usr/local/www/firewall_rules_edit.php | 2 +- usr/local/www/status_graph.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php index 135dd99..e9f4577 100755 --- a/usr/local/www/firewall_nat_1to1_edit.php +++ b/usr/local/www/firewall_nat_1to1_edit.php @@ -288,7 +288,7 @@ function typesel_change() { $interfaces['pppoe'] = "PPPoE VPN"; /* add ipsec interfaces */ - if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) + if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) if(have_ruleint_access("enc0")) $interfaces["enc0"] = "IPsec"; diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index 361d324..3dc1d83 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -482,7 +482,7 @@ include("fbegin.inc"); ?> $interfaces['pppoe'] = "PPPoE VPN"; /* add ipsec interfaces */ - if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) + if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) if(have_ruleint_access("enc0")) $interfaces["enc0"] = "IPsec"; diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index db6d03d..4d960f2 100755 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -416,7 +416,7 @@ function poolopts_change() { $interfaces['pppoe'] = "PPPoE VPN"; /* add ipsec interfaces */ - if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) + if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) if(have_ruleint_access("enc0")) $interfaces["enc0"] = "IPsec"; diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index 8fa4670..daf577a 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -169,7 +169,7 @@ if (is_array($config['pppoes']['pppoe'])) { } /* add ipsec interfaces */ -if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) +if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) if(have_ruleint_access("enc0")) $iflist["enc0"] = "IPsec"; diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 29b0336..c051518 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -692,7 +692,7 @@ include("head.inc"); if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) $interfaces['pppoe'] = "PPPoE VPN"; /* add ipsec interfaces */ - if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) + if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) if(have_ruleint_access("enc0")) $interfaces["enc0"] = "IPsec"; /* add openvpn/tun interfaces */ diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php index 4527a71..6c00da4 100755 --- a/usr/local/www/status_graph.php +++ b/usr/local/www/status_graph.php @@ -163,7 +163,7 @@ function updateBandwidthHosts(data){ -- cgit v1.1 From 92273f2459a8883114eb44e4fae595ed95f18199 Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 29 Mar 2011 11:06:33 -0400 Subject: Fix spamd rrd graph command. --- usr/local/www/status_rrd_graph_img.php | 72 +++++++++++++++++----------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 2094a87..22802bc 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -860,42 +860,42 @@ elseif((strstr($curdatabase, "-quality.rrd")) && (file_exists("$rrddbpath$curdat } elseif((strstr($curdatabase, "spamd.rrd")) && (file_exists("$rrddbpath$curdatabase"))) { /* graph a spamd statistics graph */ - $graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$curgraph.png "; - $graphcmd .= "--start $start --end $end "; - $graphcmd .= "--title \"`hostname` - {$prettydb} - {$hperiod} - {$havg} average\" "; - $graphcmd .= "--color SHADEA#eeeeee --color SHADEB#eeeeee "; - $graphcmd .= "--vertical-label=\"Conn / Time, sec.\" "; - $graphcmd .= "--height 200 --width 620 --no-gridfit "; - $graphcmd .= "--lower-limit 0 "; - $graphcmd .= "DEF:\"consmin=$rrddbpath$curdatabase:conn:MIN\" "; - $graphcmd .= "DEF:\"consavg=$rrddbpath$curdatabase:conn:AVERAGE\" "; - $graphcmd .= "DEF:\"consmax=$rrddbpath$curdatabase:conn:MAX\" "; - $graphcmd .= "DEF:\"timemin=$rrddbpath$curdatabase:time:MIN\" "; - $graphcmd .= "DEF:\"timeavg=$rrddbpath$curdatabase:time:AVERAGE\" "; - $graphcmd .= "DEF:\"timemax=$rrddbpath$curdatabase:time:MAX\" "; - $graphcmd .= "CDEF:\"timeminadj=timemin,0,86400,LIMIT,UN,0,timemin,IF\" "; - $graphcmd .= "CDEF:\"timeavgadj=timeavg,0,86400,LIMIT,UN,0,timeavg,IF\" "; - $graphcmd .= "CDEF:\"timemaxadj=timemax,0,86400,LIMIT,UN,0,timemax,IF\" "; - $graphcmd .= "CDEF:\"t1=timeminadj,timeavgadj,+,2,/,timeminadj,-\" "; - $graphcmd .= "CDEF:\"t2=timeavgadj,timemaxadj,+,2,/,timeminadj,-,t1,-\" "; - $graphcmd .= "CDEF:\"t3=timemaxadj,timeminadj,-,t1,-,t2,-\" "; - $graphcmd .= "AREA:\"timeminadj\" "; - $graphcmd .= "AREA:\"t1#$colorspamdtime[0]::STACK\" "; - $graphcmd .= "AREA:\"t2#$colorspamdtime[1]::STACK\" "; - $graphcmd .= "AREA:\"t3#$colorspamdtime[2]::STACK\" "; - $graphcmd .= "LINE2:\"timeavgadj#$colorspamdtime[3]:\"Time \" "; - $graphcmd .= "GPRINT:\"timeminadj:MIN:\"Min\\:%6.2lf\\t\" "; - $graphcmd .= "GPRINT:\"timeavgadj:AVERAGE:\"Avg\\:%6.2lf\\t\" "; - $graphcmd .= "GPRINT:\"timemaxadj:MAX:\"Max\\:%6.2lf\\n\" "; - $graphcmd .= "AREA:\"consmax#$colorspamdconn[0]\" "; - $graphcmd .= "AREA:\"consmin#$colorspamdconn[1]\" "; - $graphcmd .= "LINE1:\"consmin#$colorspamdconn[2]\" "; - $graphcmd .= "LINE1:\"consmax#$colorspamdconn[3]\" "; - $graphcmd .= "LINE1:\"consavg#$colorspamdconn[4]:\"Cons \" "; - $graphcmd .= "GPRINT:\"consmin:MIN:\"Min\\:%6.2lf\\t\" "; - $graphcmd .= "GPRINT:\"consavg:AVERAGE:\"Avg\\:%6.2lf\\t\" "; - $graphcmd .= "GPRINT:\"consmax:MAX:\"Max\\:%6.2lf\\n\" "; - $graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\" "; + $graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$curgraph.png \\ + --start $start --end $end \\ + --title \"`hostname` - {$prettydb} - {$hperiod} - {$havg} average\" \\ + --color SHADEA#eeeeee --color SHADEB#eeeeee \\ + --vertical-label=\"Conn / Time, sec.\" \\ + --height 200 --width 620 --no-gridfit \\ + --lower-limit 0 \\ + DEF:consmin=$rrddbpath$curdatabase:conn:MIN \\ + DEF:consavg=$rrddbpath$curdatabase:conn:AVERAGE \\ + DEF:consmax=$rrddbpath$curdatabase:conn:MAX \\ + DEF:timemin=$rrddbpath$curdatabase:time:MIN \\ + DEF:timeavg=$rrddbpath$curdatabase:time:AVERAGE \\ + DEF:timemax=$rrddbpath$curdatabase:time:MAX \\ + \"CDEF:timeminadj=timemin,0,86400,LIMIT,UN,0,timemin,IF\" \\ + \"CDEF:timeavgadj=timeavg,0,86400,LIMIT,UN,0,timeavg,IF\" \\ + \"CDEF:timemaxadj=timemax,0,86400,LIMIT,UN,0,timemax,IF\" \\ + \"CDEF:t1=timeminadj,timeavgadj,+,2,/,timeminadj,-\" \\ + \"CDEF:t2=timeavgadj,timemaxadj,+,2,/,timeminadj,-,t1,-\" \\ + \"CDEF:t3=timemaxadj,timeminadj,-,t1,-,t2,-\" \\ + AREA:timeminadj \\ + AREA:t1#$colorspamdtime[0]::STACK \\ + AREA:t2#$colorspamdtime[1]::STACK \\ + AREA:t3#$colorspamdtime[2]::STACK \\ + LINE2:timeavgadj#$colorspamdtime[3]:\"Time \" \\ + GPRINT:timeminadj:MIN:\"Min\\:%6.2lf\\t\" \\ + GPRINT:timeavgadj:AVERAGE:\"Avg\\:%6.2lf\\t\" \\ + GPRINT:timemaxadj:MAX:\"Max\\:%6.2lf\\n\" \\ + AREA:consmax#$colorspamdconn[0] \\ + AREA:consmin#$colorspamdconn[1] \\ + LINE1:consmin#$colorspamdconn[2] \\ + LINE1:consmax#$colorspamdconn[3] \\ + LINE1:consavg#$colorspamdconn[4]:\"Cons \" \\ + GPRINT:consmin:MIN:\"Min\\:%6.2lf\\t\" \\ + GPRINT:consavg:AVERAGE:\"Avg\\:%6.2lf\\t\" \\ + GPRINT:consmax:MAX:\"Max\\:%6.2lf\\n\" \\ + COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\" "; } elseif((strstr($curdatabase, "-cellular.rrd")) && (file_exists("$rrddbpath$curdatabase"))) { $graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$curgraph.png "; -- cgit v1.1 From cd2f60c968ae0c7f3bec66c98019d69e68e11a46 Mon Sep 17 00:00:00 2001 From: smos Date: Wed, 30 Mar 2011 18:22:15 +0200 Subject: Add missing color, add multiplier to calculus for inverting line --- usr/local/www/status_rrd_graph_img.php | 2 +- usr/local/www/themes/the_wall/rrdcolors.inc.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 22802bc..795980f 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -315,7 +315,7 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas $graphcmd .= "CDEF:\"$curif-bytes_t=$curif-bytes_in_t_pass,$curif-bytes_out_t_block,+\" "; $graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" "; - $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT\" "; + $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT,$multiplier,*\" "; $graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" "; $graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" "; diff --git a/usr/local/www/themes/the_wall/rrdcolors.inc.php b/usr/local/www/themes/the_wall/rrdcolors.inc.php index c2bc613..09956cc 100644 --- a/usr/local/www/themes/the_wall/rrdcolors.inc.php +++ b/usr/local/www/themes/the_wall/rrdcolors.inc.php @@ -32,6 +32,7 @@ $colortrafficup = array("666666", "CCCCCC"); $colortrafficdown = array("990000", "CC0000"); +$colortraffic95 = array("660000", "FF0000"); $colorpacketsup = array("666666", "CCCCCC"); $colorpacketsdown = array("990000", "CC0000"); $colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); -- cgit v1.1 From 44bcc1bedceb947c58623b85dcc83b2bc578f79d Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 30 Mar 2011 15:21:00 -0400 Subject: Allow importing a CRL for an external CA. --- usr/local/www/system_crlmanager.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php index 90b61d6..67e4b2f 100644 --- a/usr/local/www/system_crlmanager.php +++ b/usr/local/www/system_crlmanager.php @@ -253,14 +253,14 @@ include("head.inc"); function method_change() { - method = document.iform.method.selectedIndex; + method = document.iform.method.value; switch (method) { - case 0: + case "internal": document.getElementById("existing").style.display="none"; document.getElementById("internal").style.display=""; break; - case 1: + case "existing": document.getElementById("existing").style.display=""; document.getElementById("internal").style.display="none"; break; @@ -302,6 +302,8 @@ function method_change() { + + + @@ -260,7 +289,7 @@ function method_change() { - + + + + + + + +
@@ -303,6 +332,15 @@ function method_change() {
+ +
@@ -482,6 +520,9 @@ function method_change() {
    + + " alt="" width="17" height="17" border="0" /> + " alt="" width="17" height="17" border="0" /> -- cgit v1.1 From 84575284b533458fe914ee0bd0640056890dec1a Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 30 Mar 2011 20:48:24 -0400 Subject: Apparently rrdtool VDEF functions can't take a multiplier, only CDEF. Fixes traffic graphs. --- usr/local/www/status_rrd_graph_img.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 795980f..22802bc 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -315,7 +315,7 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas $graphcmd .= "CDEF:\"$curif-bytes_t=$curif-bytes_in_t_pass,$curif-bytes_out_t_block,+\" "; $graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" "; - $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT,$multiplier,*\" "; + $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT\" "; $graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" "; $graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" "; -- cgit v1.1 From 78544d4a99c90f3c19b3cd53c2f1873b625c21bf Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Thu, 31 Mar 2011 06:05:39 -0400 Subject: clarify text --- usr/local/www/system_advanced_admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index e23ceb0..9f8b2d7 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -331,7 +331,7 @@ function prot_change() { /> - +
Date: Thu, 31 Mar 2011 13:08:06 -0400 Subject: Try again to fix the calculation for out bits 95th percentile. (Works for me) --- usr/local/www/status_rrd_graph_img.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 22802bc..b2d9cbb 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -315,7 +315,8 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas $graphcmd .= "CDEF:\"$curif-bytes_t=$curif-bytes_in_t_pass,$curif-bytes_out_t_block,+\" "; $graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" "; - $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT\" "; + $graphcmd .= "CDEF:\"$curif-out_bits_mul=$curif-out_bits,$multiplier,*\" "; + $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits_mul,95,PERCENT\" "; $graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" "; $graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" "; -- cgit v1.1 From 681b43b0790694b737dc91573a233a8aa468b681 Mon Sep 17 00:00:00 2001 From: lgcosta Date: Fri, 1 Apr 2011 12:06:55 -0300 Subject: standardize the device_mode variable --- usr/local/www/vpn_openvpn_client.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php index d28315d..c355577 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -113,7 +113,7 @@ if($_GET['act']=="edit"){ $pconfig['description'] = $a_client[$id]['description']; $pconfig['custom_options'] = $a_client[$id]['custom_options']; $pconfig['ns_cert_type'] = $a_client[$id]['ns_cert_type']; - $pconfig['dev_mode'] = $a_client[$id]['dev_mode']; + $pconfig['device_mode'] = $a_client[$id]['device_mode']; if ($pconfig['mode'] != "p2p_shared_key") { $pconfig['caref'] = $a_client[$id]['caref']; @@ -228,7 +228,7 @@ if ($_POST) { if ($_POST['disable'] == "yes") $client['disable'] = true; $client['protocol'] = $pconfig['protocol']; - $client['dev_mode'] = $pconfig['dev_mode']; + $client['device_mode'] = $pconfig['device_mode']; list($client['interface'], $client['ipaddr']) = explode ("|",$pconfig['interface']); $client['local_port'] = $pconfig['local_port']; $client['server_addr'] = $pconfig['server_addr']; @@ -439,11 +439,11 @@ if ($savemsg)
- -- cgit v1.1 From 4936ff53df99f9c3f7de42980b581d21c1838404 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 1 Apr 2011 14:11:33 -0400 Subject: Switch back to dev_mode so existing configs aren't broken by the other changes. --- usr/local/www/vpn_openvpn_client.php | 8 ++++---- usr/local/www/vpn_openvpn_server.php | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php index c355577..d28315d 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -113,7 +113,7 @@ if($_GET['act']=="edit"){ $pconfig['description'] = $a_client[$id]['description']; $pconfig['custom_options'] = $a_client[$id]['custom_options']; $pconfig['ns_cert_type'] = $a_client[$id]['ns_cert_type']; - $pconfig['device_mode'] = $a_client[$id]['device_mode']; + $pconfig['dev_mode'] = $a_client[$id]['dev_mode']; if ($pconfig['mode'] != "p2p_shared_key") { $pconfig['caref'] = $a_client[$id]['caref']; @@ -228,7 +228,7 @@ if ($_POST) { if ($_POST['disable'] == "yes") $client['disable'] = true; $client['protocol'] = $pconfig['protocol']; - $client['device_mode'] = $pconfig['device_mode']; + $client['dev_mode'] = $pconfig['dev_mode']; list($client['interface'], $client['ipaddr']) = explode ("|",$pconfig['interface']); $client['local_port'] = $pconfig['local_port']; $client['server_addr'] = $pconfig['server_addr']; @@ -439,11 +439,11 @@ if ($savemsg)
- diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index ef82716..cc38e65 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -91,7 +91,7 @@ if($_GET['act']=="new"){ $pconfig['tlsauth_enable'] = "yes"; $pconfig['autotls_enable'] = "yes"; $pconfig['dh_length'] = 1024; - $pconfig['device_mode'] = "tun"; + $pconfig['dev_mode'] = "tun"; $pconfig['interface'] = "wan"; $pconfig['local_port'] = openvpn_port_next('UDP'); $pconfig['pool_enable'] = "yes"; @@ -105,7 +105,7 @@ if($_GET['act']=="edit"){ $pconfig['mode'] = $a_server[$id]['mode']; $pconfig['protocol'] = $a_server[$id]['protocol']; $pconfig['authmode'] = $a_server[$id]['authmode']; - $pconfig['device_mode'] = $a_server[$id]['device_mode']; + $pconfig['dev_mode'] = $a_server[$id]['dev_mode']; $pconfig['interface'] = $a_server[$id]['interface']; if (!empty($a_server[$id]['ipaddr'])) { $pconfig['interface'] = $pconfig['interface'] . '|' . $a_server[$id]['ipaddr']; @@ -306,7 +306,7 @@ if ($_POST) { if (!empty($pconfig['authmode'])) $server['authmode'] = implode(",", $pconfig['authmode']); $server['protocol'] = $pconfig['protocol']; - $server['device_mode'] = $pconfig['device_mode']; + $server['dev_mode'] = $pconfig['dev_mode']; list($server['interface'], $server['ipaddr']) = explode ("|",$pconfig['interface']); $server['local_port'] = $pconfig['local_port']; $server['description'] = $pconfig['description']; @@ -668,12 +668,12 @@ if ($savemsg)
-