diff options
| author | Bill Marquette <bill.marquette@gmail.com> | 2011-05-26 22:28:19 -0500 |
|---|---|---|
| committer | Bill Marquette <bill.marquette@gmail.com> | 2011-05-26 22:28:19 -0500 |
| commit | 13f0762d9c2f23e19eec13dc1041506c40051be8 (patch) | |
| tree | 65ec8b400da03958a443c0f926f551a3a2d39ef6 /usr/local/pkg | |
| parent | b75d32e558bcf374ac807021545263b22470d529 (diff) | |
| download | pfsense-13f0762d9c2f23e19eec13dc1041506c40051be8.zip pfsense-13f0762d9c2f23e19eec13dc1041506c40051be8.tar.gz | |
Fix #1277
Wasn't able to remove the multicast RIPv2 discovery at startup, but
all ripv1 response's are gone now.
Diffstat (limited to 'usr/local/pkg')
| -rw-r--r-- | usr/local/pkg/routed.inc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr/local/pkg/routed.inc b/usr/local/pkg/routed.inc index 4d1b1d8..ec730d5 100644 --- a/usr/local/pkg/routed.inc +++ b/usr/local/pkg/routed.inc @@ -39,10 +39,15 @@ function setup_routed() { if (isset($config['installedpackages']['routed']['config'][0]['enable']) && $config['installedpackages']['routed']['config'][0]['enable'] == "on") { /* if user selected individual interfaces */ - $ifarr = explode(",", $config['installedpackages']['routed']['config'][0]['iface_array']); + $ifarr = array_flip(explode(",", $config['installedpackages']['routed']['config'][0]['iface_array'])); + $allifs = get_interface_arr(); if (!empty($ifarr)) { - foreach($ifarr as $ifname) { - $gw .= setup_etc_gateways($ifname, 'enable'); + foreach($allifs as $ifname) { + $friendly_ifname = convert_real_interface_to_friendly_interface_name($ifname); + if (array_key_exists($friendly_ifname, $ifarr)) + $gw .= setup_etc_gateways($ifname, 'enable'); + else + $gw .= setup_etc_gateways($ifname, 'disable'); } } else /* setup for all interfaces */ @@ -76,7 +81,7 @@ function setup_etc_gateways($iface="", $mode="") { } break; case "disable": - $ret .= "no_rip "; + $ret .= "no_rip_out no_solicit no_rdisc no_rdisc_adv"; break; default: |
