diff options
| author | Ermal Luçi <eri@pfsense.org> | 2010-02-25 12:58:11 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2010-02-25 12:58:11 +0000 |
| commit | 575a279a6af4f43b3fb1a4c9a294614ba3b04e2e (patch) | |
| tree | 5103383e74e219e5535a2ccc36809b18f4c88e05 /etc | |
| parent | bc32eabfc10bc4130e6eaf66c69d9ca4b5bd54d7 (diff) | |
| download | pfsense-575a279a6af4f43b3fb1a4c9a294614ba3b04e2e.zip pfsense-575a279a6af4f43b3fb1a4c9a294614ba3b04e2e.tar.gz | |
Speed up and correct the finding of interfaces that support vlanmtu using the pfSense module.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/globals.inc | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 127ba4c..b8b30a1 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -46,8 +46,8 @@ function get_nics_with_capabilities($CAPABILITIES) { $vlan_native_supp = array(); foreach($if_list as $if => $iface) { $iface = trim($iface); - $capable = `ifconfig -m $iface | grep "capabilities=.*{$CAPABILITIES}"`; - if($capable) { + $capable = pfSense_get_interface_addresses($iface); + if(isset($capable['caps'][$CAPABILITIES])) { $interfacenonum = remove_numbers($iface); if(!in_array($interfacenonum, $vlan_native_supp)) $vlan_native_supp[] = $interfacenonum; @@ -114,7 +114,7 @@ else $g['vlan_native_supp'] = array("bce", "bge", "bfe", "cxgb", "dc", "em", "fxp", "gem", "hme", "ixgb", "msk", "nge", "re", "rl", "sis", "ste", "stge", "ti", "tl", "tx", "txp", "vge", "vr", "xl", "lagg"); // Loop through and set vlan_long_frame VLAN_MTU -$vlan_native_supp = get_nics_with_capabilities("VLAN_MTU"); +$vlan_native_supp = get_nics_with_capabilities("vlanmtu"); if(count($vlan_native_supp) > 0) $g['vlan_long_frame'] = $vlan_native_supp; else @@ -143,31 +143,31 @@ if(file_exists("/etc/platform")) { /* Default sysctls */ $sysctls = array("net.inet.ip.portrange.first" => "1024", - "net.inet.tcp.blackhole" => "2", - "net.inet.udp.blackhole" => "1", - "net.inet.ip.random_id" => "1", - "net.inet.tcp.drop_synfin" => "1", - "net.inet.ip.redirect" => "1", - "net.inet6.ip6.redirect" => "1", - "net.inet.tcp.syncookies" => "1", - "net.inet.tcp.recvspace" => "65228", - "net.inet.tcp.sendspace" => "65228", - "net.inet.ip.fastforwarding" => "1", - "net.inet.tcp.delayed_ack" => "0", - "net.inet.udp.maxdgram" => "57344", - "net.link.bridge.pfil_onlyip" => "0", - "net.link.bridge.pfil_member" => "1", - "net.link.bridge.pfil_bridge" => "0", - "net.link.tap.user_open" => "1", - "kern.rndtest.verbose" => "0", - "kern.randompid" => "347", - "net.inet.ip.intr_queue_maxlen" => "1000", - "hw.syscons.kbd_reboot" => "0", - "net.inet.tcp.inflight.enable" => "1", - "net.inet.tcp.log_debug" => "0", - "net.inet.icmp.icmplim" => "750", - "net.inet.tcp.tso" => "0", - "hw.bce.tso_enable" => "0" - ); + "net.inet.tcp.blackhole" => "2", + "net.inet.udp.blackhole" => "1", + "net.inet.ip.random_id" => "1", + "net.inet.tcp.drop_synfin" => "1", + "net.inet.ip.redirect" => "1", + "net.inet6.ip6.redirect" => "1", + "net.inet.tcp.syncookies" => "1", + "net.inet.tcp.recvspace" => "65228", + "net.inet.tcp.sendspace" => "65228", + "net.inet.ip.fastforwarding" => "1", + "net.inet.tcp.delayed_ack" => "0", + "net.inet.udp.maxdgram" => "57344", + "net.link.bridge.pfil_onlyip" => "0", + "net.link.bridge.pfil_member" => "1", + "net.link.bridge.pfil_bridge" => "0", + "net.link.tap.user_open" => "1", + "kern.rndtest.verbose" => "0", + "kern.randompid" => "347", + "net.inet.ip.intr_queue_maxlen" => "1000", + "hw.syscons.kbd_reboot" => "0", + "net.inet.tcp.inflight.enable" => "1", + "net.inet.tcp.log_debug" => "0", + "net.inet.icmp.icmplim" => "750", + "net.inet.tcp.tso" => "0", + "hw.bce.tso_enable" => "0" + ); ?> |
