From 13f0762d9c2f23e19eec13dc1041506c40051be8 Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Thu, 26 May 2011 22:28:19 -0500
Subject: Fix #1277 Wasn't able to remove the multicast RIPv2 discovery at
 startup, but all ripv1 response's are gone now.

---
 usr/local/pkg/routed.inc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'usr/local/pkg')

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:
-- 
cgit v1.1