Project

General

Profile

« Previous | Next » 

Revision 13f0762d

Added by Bill Marquette about 14 years ago

Fix #1277
Wasn't able to remove the multicast RIPv2 discovery at startup, but
all ripv1 response's are gone now.

View differences:

usr/local/pkg/routed.inc
39 39
	if (isset($config['installedpackages']['routed']['config'][0]['enable']) &&
40 40
		$config['installedpackages']['routed']['config'][0]['enable'] == "on") {
41 41
		/* if user selected individual interfaces */
42
		$ifarr = explode(",", $config['installedpackages']['routed']['config'][0]['iface_array']);
42
		$ifarr = array_flip(explode(",", $config['installedpackages']['routed']['config'][0]['iface_array']));
43
                $allifs = get_interface_arr();
43 44
                if (!empty($ifarr)) {
44
			foreach($ifarr as $ifname) {
45
				$gw .= setup_etc_gateways($ifname, 'enable');
45
                        foreach($allifs as $ifname) {
46
				$friendly_ifname = convert_real_interface_to_friendly_interface_name($ifname);
47
				if (array_key_exists($friendly_ifname, $ifarr))
48
					$gw .= setup_etc_gateways($ifname, 'enable');
49
				else
50
					$gw .= setup_etc_gateways($ifname, 'disable');
46 51
			}
47 52
		} else
48 53
			/* setup for all interfaces */
......
76 81
		}
77 82
		break;
78 83
	case "disable":
79
		$ret .= "no_rip ";
84
		$ret .= "no_rip_out no_solicit no_rdisc no_rdisc_adv";
80 85
		break;
81 86

  
82 87
	default:

Also available in: Unified diff