Changeset 8951

Timestamp:

02/06/08 17:45:26 (5 years ago)

Author:

BrainSlayer

Message:

count igmp interfaces and decide if we need to start the daemon

File:

• src/router/services/services/igmp.c (modified) (1 diff)

src/router/services/services/igmp.c

@@ -33 +33 @@
   pid_t pid;
   char name[80], *next, *svbuf;
-  char *argv[] = { "igmprt", NULL};
+  char *argv[] = { "igmprt", NULL };
 
 
 
   stop_igmp_proxy ();
+  int ifcount = 0;
 
 
-
+  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"));
   if (nvram_match ("block_multicast", "0"))
     {
-      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)
+      ifcount++;
+    }
+  foreach (name, nvram_safe_get ("lan_ifnames"), next)
+  {
+    if (nvram_nmatch ("0", "%s_bridged", name)
+        && nvram_nmatch ("1", "%s_multicast", name))
       {
-        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 %s downstream  ratelimit 0  threshold 1\n",
+                 name);
+        ifcount++;
       }
-      fprintf (fp, "phyint lo disabled\n");
-      fclose (fp);
-      if (nvram_match ("wan_proto", "disabled")) //todo: add upstream config
-      {
+    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");
+      return ret;
+    }
+  else
+    {
+      if (ifcount)
+        {
+          ret = _evalpid (argv, NULL, 0, &pid);
+          syslog (LOG_INFO,
+                  "igmprt : multicast daemon successfully started\n");
+        }
     }