diff options
| -rw-r--r-- | etc/inc/filter.inc | 5 | ||||
| -rw-r--r-- | usr/local/www/diag_packet_capture.php | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 390c8d6..123bd4e 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -338,10 +338,14 @@ function filter_generate_aliases() { $lan_carp_ints = link_ip_to_carp_interface($lanip); $wan_carp_ints = link_ip_to_carp_interface($wanip); + /* start creating alias info */ $aliases .= "# System Aliases \n"; $aliases .= "loopback = \"{ lo0 }\"\n"; + + /* lan */ $aliases .= "lan = \"{ {$config['interfaces']['lan']['if']}{$lan_aliases} {$lan_carp_ints} }\"\n"; + /* wan */ if($config['interfaces']['wan']['ipaddr'] == "pppoe" or $config['interfaces']['wan']['ipaddr'] == "pptp") { $aliases .= "ng0 = \"{ " . $config['interfaces']['wan']['if'] . " " . get_real_wan_interface() . " }\" \n"; $aliases .= "wan = \"{ " . $config['interfaces']['wan']['if'] . " ng0 {$wan_carp_ints} }\"\n"; @@ -349,6 +353,7 @@ function filter_generate_aliases() { $aliases .= "wan = \"{ " . get_real_wan_interface() . " {$wanaliases} {$wan_carp_ints} }\"\n"; } + /* IPSec */ $aliases .= "enc0 = \"{ enc0 }\"\n"; /* used to count netgraph interfaces */ diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index e27029e..69fd677 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -27,7 +27,7 @@ $pgtitle = "Diagnostics: Packet Capture"; require_once("guiconfig.inc"); require_once("pfsense-utils.inc"); -$fp = "/tmp/"; +$fp = "/root/"; $fn = "packetcapture.cap"; $snaplen = 1500;//default packet length $count = 100;//default number of packets to capture @@ -56,6 +56,8 @@ if ($_POST) { $port = $_POST['port']; $detail = $_POST['detail']; + conf_mount_rw(); + if ($_POST['dnsquery'])//if dns lookup is checked { $disabledns = ""; @@ -248,9 +250,7 @@ include("head.inc"); ?> $searchcount = ""; } - $selectedif = convert_friendly_interface_to_real_interface_name($selectedif); - - + $selectedif = convert_friendly_interface_to_real_interface_name($selectedif); if ($action == "Start") { @@ -275,4 +275,10 @@ include("head.inc"); ?> </table> </form> </td></tr></table> -<?php include("fend.inc"); ?> +<?php + +conf_mount_ro(); + +include("fend.inc"); + +?> |
