diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-01 08:30:16 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-01 08:30:16 -0300 |
| commit | 2ded2c1b3c569c327a94fab0e8f5e7484323bd26 (patch) | |
| tree | e345eccb20061cddceaf5edef1bdf7a6d31fea66 | |
| parent | 216c36cc48f41d7ac27978e646cf5820ac661e8e (diff) | |
| parent | 05816b87060b32d8bc3a5fd09803d5da97956706 (diff) | |
| download | pfsense-2ded2c1b3c569c327a94fab0e8f5e7484323bd26.zip pfsense-2ded2c1b3c569c327a94fab0e8f5e7484323bd26.tar.gz | |
Merge remote branch 'mainline/master'
| -rw-r--r-- | etc/inc/openvpn.inc | 7 | ||||
| -rw-r--r-- | root/.tcshrc | 6 | ||||
| -rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 6 | ||||
| -rw-r--r-- | usr/local/www/widgets/widgets/system_information.widget.php | 14 |
4 files changed, 25 insertions, 8 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 3fe4574..3a9701a 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -416,17 +416,16 @@ function openvpn_reconfigure($mode,& $settings) { $conf .= "push \"route $ip $mask\"\n"; } - // Configure client dhcp options switch($settings['mode']) { case 'server_tls': case 'server_user': case 'server_tls_user': + // Configure client dhcp options openvpn_add_dhcpopts($settings, $conf); + if ($settings['client2client']) + $conf .= "client-to-client\n"; break; } - - if ($settings['client2client']) - $conf .= "client-to-client\n"; } // client specific settings diff --git a/root/.tcshrc b/root/.tcshrc index e34fbe8..97ca003 100644 --- a/root/.tcshrc +++ b/root/.tcshrc @@ -1,3 +1,5 @@ -# Give us a more informative prompt. -set prompt="%m\:%~# " +set prompt="%{\033[0;1;33m%}[%{\033[0;1;37m%}`cat /etc/version`%{\033[0;1;33m%}]%{\033[0;1;33m%}%B[%{\033[0;1;37m%}%n%{\033[0;1;31m%}@%{\033[0;1;37m%}%M%{\033[0;1;33m%}]%{\033[0;1;32m%}%b%/%{\033[0;1;33m%}(%{\033[0;1;37m%}%h%{\033[0;1;33m%})%{\033[0;1;36m%}%{\033[0;1;31m%}:%{\033[0;40;37m%} " set autologout="0" +set autolist set color set colorcat +setenv CLICOLOR "true" +setenv LSCOLORS "exfxcxdxbxegedabagacad" diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index b213c6f..e39e93a 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -389,12 +389,14 @@ function mode_change() { document.getElementById("remote_opts").style.display=""; document.getElementById("local_opts").style.display="none"; document.getElementById("authmodetr").style.display="none"; + document.getElementById("inter_client_communication").style.display="none"; break; case "p2p_tls": document.getElementById("client_opts").style.display="none"; document.getElementById("remote_opts").style.display=""; document.getElementById("local_opts").style.display=""; document.getElementById("authmodetr").style.display="none"; + document.getElementById("inter_client_communication").style.display="none"; break; case "server_user": case "server_tls_user": @@ -402,6 +404,7 @@ function mode_change() { document.getElementById("client_opts").style.display=""; document.getElementById("remote_opts").style.display="none"; document.getElementById("local_opts").style.display=""; + document.getElementById("inter_client_communication").style.display=""; break; case "server_tls": document.getElementById("authmodetr").style.display="none"; @@ -409,6 +412,7 @@ function mode_change() { document.getElementById("client_opts").style.display=""; document.getElementById("remote_opts").style.display="none"; document.getElementById("local_opts").style.display=""; + document.getElementById("inter_client_communication").style.display=""; break; } } @@ -892,7 +896,7 @@ function netbios_change() { </table> </td> </tr> - <tr> + <tr id="inter_client_communication"> <td width="22%" valign="top" class="vncell">Inter-client communication</td> <td width="78%" class="vtable"> <table border="0" cellpadding="2" cellspacing="0"> diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php index 066133f..bbdd6b5 100644 --- a/usr/local/www/widgets/widgets/system_information.widget.php +++ b/usr/local/www/widgets/widgets/system_information.widget.php @@ -130,7 +130,19 @@ $curcfg = $config['system']['firmware']; $cpumodel = ""; exec("/sbin/sysctl -n hw.model", $cpumodel); $cpumodel = implode(" ", $cpumodel); - echo (htmlspecialchars($cpumodel)); ?> + echo (htmlspecialchars($cpumodel)); + + $cpufreqs = ""; + exec("/sbin/sysctl -n dev.cpu.0.freq_levels", $cpufreqs); + $cpufreqs = explode(" ", trim($cpufreqs[0])); + $maxfreq = explode("/", $cpufreqs[0]); + $maxfreq = $maxfreq[0]; + $curfreq = ""; + exec("/sbin/sysctl -n dev.cpu.0.freq", $curfreq); + $curfreq = trim($curfreq[0]); + if ($curfreq != $maxfreq) + echo "<br/>Current: {$curfreq} MHz, Max: {$maxfreq} MHz"; + ?> </td> </tr> <?php if ($hwcrypto): ?> |
