From: shemminger <shemminger>
Date: Fri, 7 Oct 2005 16:41:34 +0000 (+0000)
Subject: Reenable 'ip mroute'
X-Git-Tag: ss-051007~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84616f8317554be7542b2e89b69f4129995cb03b;p=thirdparty%2Fiproute2.git

Reenable 'ip mroute'
---

diff --git a/ip/ip.c b/ip/ip.c
index f57651e77..e6cf09b03 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -71,6 +71,7 @@ static const struct cmd {
 	{ "tunnel",	do_iptunnel },
 	{ "monitor",	do_ipmonitor },
 	{ "xfrm",	do_xfrm },
+	{ "mroute",	do_multiroute },
 	{ "help",	do_help },
 	{ 0 }
 };
diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index b24caeecc..951a54f2f 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -42,7 +42,7 @@ static void usage(void)
 	exit(-1);
 }
 
-char *viftable[32];
+static char *viftable[32];
 
 struct rtfilter
 {
@@ -50,7 +50,7 @@ struct rtfilter
 	inet_prefix msrc;
 } filter;
 
-void read_viftable(void)
+static void read_viftable(void)
 {
 	char buf[256];
 	FILE *fp = fopen("/proc/net/ip_mr_vif", "r");
@@ -75,7 +75,7 @@ void read_viftable(void)
 	fclose(fp);
 }
 
-void read_mroute_list(FILE *ofp)
+static void read_mroute_list(FILE *ofp)
 {
 	char buf[256];
 	FILE *fp = fopen("/proc/net/ip_mr_cache", "r");