Changeset 8845

Timestamp:

01/23/08 22:12:53 (5 years ago)

Author:

BrainSlayer

Message:

new igmp proxy

Location:

src/router/services

Files:

• services/igmp.c (modified) (1 diff)
• sysinit/sysinit-x86.c (modified) (2 diffs)

src/router/services/services/igmp.c

@@ -32 +32 @@
   int ret = 0;
   pid_t pid;
+  char name[80], *next, *svbuf;
+  char *argv[] = { "igmprt", NULL};
 
 
-  char *igmp_proxy_argv[] = { "igmprt",
-    "-i",
-    get_wan_face (),
-    NULL
-  };
-
-  char *igmp_proxybr_argv[] = { "igmprt",
-    "-i",
-    nvram_safe_get ("lan_ifname"),
-    NULL
-  };
 
   stop_igmp_proxy ();
 
+
+
   if (nvram_match ("block_multicast", "0"))
     {
-      if (nvram_match ("wan_proto", "disabled"))
-        {
-          ret = _evalpid (igmp_proxybr_argv, NULL, 0, &pid);
-          return ret;
-        }
-      else
-        ret = _evalpid (igmp_proxy_argv, NULL, 0, &pid);
+      FILE *fp = fopen ("/tmp/igmpproxy.conf", "wb");
+      fprintf (fp, "quickleave\n");
+      fprintf (fp, "phyint %s upstream  ratelimit 0  threshold 1\n",
+               nvram_safe_get ("wan_iface"));
+      fprintf (fp, "phyint %s downstream  ratelimit 0  threshold 1\n",
+               nvram_safe_get ("lan_ifname"));
+      foreach (name, nvram_safe_get ("lan_ifnames"), next)
+      {
+        if (nvram_nmatch ("0", "%s_bridged", name)
+            && nvram_nmatch ("1", "%s_multicast", name))
+          fprintf (fp, "phyint %s downstream  ratelimit 0  threshold 1\n",
+                   name);
+        else
+          fprintf (fp, "phyint %s disabled\n", name);
+      }
+      fprintf (fp, "phyint lo disabled\n");
+      fclose (fp);
+//      if (nvram_match ("wan_proto", "disabled")) //todo: add upstream config
+//      {
+//        ret = _evalpid (igmp_proxybr_argv, NULL, 0, &pid);
+//        return ret;
+//      }
+//      else
+      ret = _evalpid(argv, NULL, 0, &pid);
       syslog (LOG_INFO, "igmprt : multicast daemon successfully started\n");
     }

src/router/services/sysinit/sysinit-x86.c

@@ -189 +189 @@
 
 //system("/etc/kendin");
+  if (detect ("Rhine-"))        // VIA Rhine-I, Rhine-II, Rhine-III
+    eval ("insmod", "via-rhine");
   if (detect ("DP8381"))
     eval ("insmod", "natsemi");
@@ -285 +287 @@
     }
 
-  if (detect ("Rhine-"))        // VIA Rhine-I, Rhine-II, Rhine-III
-    eval ("insmod", "via-rhine");
 
   if (detect ("3c905"))         // 3Com