Reenable 'ip mroute'

diff --git a/ip/ip.c b/ip/ip.c
index f57651e773ed350f1361c36930db76ea8a114d6b..e6cf09b03b4bdc8851a4b17766ff10ef90e77c9e 100644 (file)
--- 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 b24caeeccb37da2be17f2d3ea2434cc8e70ee4d7..951a54f2f9dff2b96f1b87e7cb84d18c4b4924e4 100644 (file)
--- 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");