diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-04-30 08:08:38 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-04-30 08:08:38 -0300 |
| commit | 4e480d211adc9061fc2f964c760e6806d2db27eb (patch) | |
| tree | d3c3ecd3711aa8d99cb824634f55df9310760758 /usr | |
| parent | c8aa6bdd949b2b7174693390d2ddfcead01e7f9b (diff) | |
| parent | 05f3ffa431cf622828d311dd9b9b8ea49f9d1006 (diff) | |
| download | pfsense-4e480d211adc9061fc2f964c760e6806d2db27eb.zip pfsense-4e480d211adc9061fc2f964c760e6806d2db27eb.tar.gz | |
Merge remote branch 'mainline/master'
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/sbin/ppp-linkdown | 1 | ||||
| -rwxr-xr-x | usr/local/www/diag_ping.php | 1 | ||||
| -rwxr-xr-x | usr/local/www/interfaces.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/system_gateway_groups.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/system_routes.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/system_routes_edit.php | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/usr/local/sbin/ppp-linkdown b/usr/local/sbin/ppp-linkdown index 3eeae34..3734b0b 100755 --- a/usr/local/sbin/ppp-linkdown +++ b/usr/local/sbin/ppp-linkdown @@ -3,6 +3,7 @@ if [ -f /tmp/$1up ] && [ -f /conf/$1.log ]; then seconds=$((`date -j +%s` - `/usr/bin/stat -f %m /tmp/$1up`)) /usr/local/sbin/ppp-log-uptime.sh $seconds $1 & fi +/sbin/pfctl -b $3 # delete the node just in case mpd cannot do that /usr/sbin/ngctl shutdown $1: /bin/rm -f /var/etc/nameserver_$1 diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index 4d82e06..b5658f5 100755 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -136,7 +136,6 @@ include("head.inc"); ?> <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <span class="vexpl"><strong>Note: </strong></span> Multi-wan is not supported from this utility currently. </td> </tr> </table> diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index cb6466f..8b93c1e 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -1011,7 +1011,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" if($gateway['interface'] == $if) { ?> <option value="<?=$gateway['name'];?>" <?php if ($gateway['name'] == $pconfig['gateway']) echo "selected"; ?>> - <?=htmlspecialchars($gateway['name']);?> + <?=htmlspecialchars($gateway['name']) . " - " . htmlspecialchars($gateway['gateway']);?> </option> <?php } diff --git a/usr/local/www/system_gateway_groups.php b/usr/local/www/system_gateway_groups.php index 3cd39c8..e580a8b 100755 --- a/usr/local/www/system_gateway_groups.php +++ b/usr/local/www/system_gateway_groups.php @@ -61,6 +61,8 @@ if ($_POST) { $retval = system_routing_configure(); $retval |= filter_configure(); + /* reconfigure our gateway monitor */ + setup_gateways_monitor(); $savemsg = get_std_save_message($retval); if ($retval == 0) diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index 9057afc..f6c55e6 100755 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -158,7 +158,7 @@ include("head.inc"); </td> <td class="listr" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';"> <?php - echo $a_gateways[$route['gateway']]['name'] . " "; + echo htmlentities($a_gateways[$route['gateway']]['name']) . " - " . htmlentities($a_gateways[$route['gateway']]['gateway']); ?> </td> <td class="listr" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';"> diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php index c4d027e..bc05b11 100755 --- a/usr/local/www/system_routes_edit.php +++ b/usr/local/www/system_routes_edit.php @@ -179,7 +179,7 @@ include("head.inc"); if ($gateway['name'] == $pconfig['gateway']) echo "selected"; } - echo ">" . htmlspecialchars($gateway['name']) . "</option>\n"; + echo ">" . htmlspecialchars($gateway['name']) . " - " . htmlspecialchars($gateway['gateway']) . "</option>\n"; } ?> </select> <br /> |
