xnu-517.7.7.tar.gz

[apple/xnu.git] / bsd / netinet / igmp.c

diff --git a/bsd/netinet/igmp.c b/bsd/netinet/igmp.c
index 0a1d51ef1fd2a81077d18306242300801408b1c9..1430acc475b06322e8e8d85e60e939b83911f2d9 100644 (file)
--- a/bsd/netinet/igmp.c
+++ b/bsd/netinet/igmp.c
@@ -89,7 +89,9 @@
 #include <netinet/igmp.h>
 #include <netinet/igmp_var.h>
 
 #include <netinet/igmp.h>
 #include <netinet/igmp_var.h>
 

+#ifndef __APPLE__

 static MALLOC_DEFINE(M_IGMP, "igmp", "igmp state");
 static MALLOC_DEFINE(M_IGMP, "igmp", "igmp state");

+#endif

 
 static struct router_info *
                find_rti __P((struct ifnet *ifp));
 
 static struct router_info *
                find_rti __P((struct ifnet *ifp));


@@ -139,35 +141,35 @@ static struct router_info *
 find_rti(ifp)
        struct ifnet *ifp;
 {
 find_rti(ifp)
        struct ifnet *ifp;
 {

-        register struct router_info *rti = Head;
-
+       register struct router_info *rti = Head;
+       
+       

 #if IGMP_DEBUG
        printf("[igmp.c, _find_rti] --> entering \n");
 #endif
 #if IGMP_DEBUG
        printf("[igmp.c, _find_rti] --> entering \n");
 #endif

-        while (rti) {
-                if (rti->rti_ifp == ifp) {
+       while (rti) {
+               if (rti->rti_ifp == ifp) {

 #if IGMP_DEBUG
                        printf("[igmp.c, _find_rti] --> found old entry \n");
 #endif
 #if IGMP_DEBUG
                        printf("[igmp.c, _find_rti] --> found old entry \n");
 #endif

-                        return rti;
-                }
-                rti = rti->rti_next;
-        }
-
-#if ISFB31
+                       return rti;
+               }
+               rti = rti->rti_next;
+       }
+       

        MALLOC(rti, struct router_info *, sizeof *rti, M_IGMP, M_NOWAIT);
        MALLOC(rti, struct router_info *, sizeof *rti, M_IGMP, M_NOWAIT);

-#else
-       MALLOC(rti, struct router_info *, sizeof *rti, M_TEMP, M_NOWAIT);
-#endif
-        rti->rti_ifp = ifp;
-        rti->rti_type = IGMP_V2_ROUTER;
-        rti->rti_time = 0;
-        rti->rti_next = Head;
-        Head = rti;
+       if (rti != NULL)
+       {
+               rti->rti_ifp = ifp;
+               rti->rti_type = IGMP_V2_ROUTER;
+               rti->rti_time = 0;
+               rti->rti_next = Head;
+               Head = rti;
+       }

 #if IGMP_DEBUG
 #if IGMP_DEBUG

-       printf("[igmp.c, _find_rti] --> created an entry \n");
+       if (rti) printf("[igmp.c, _find_rti] --> created an entry \n");

 #endif
 #endif

-        return rti;
+       return rti;

 }
 
 void
 }
 
 void


@@ -226,6 +228,10 @@ igmp_input(m, iphlen)
        if (timer == 0)
                timer = 1;
        rti = find_rti(ifp);
        if (timer == 0)
                timer = 1;
        rti = find_rti(ifp);

+       if (rti == NULL) {
+               m_freem(m);
+               return;
+       }

 
        /*
         * In the IGMPv2 specification, there are 3 states and a flag.
 
        /*
         * In the IGMPv2 specification, there are 3 states and a flag.


@@ -363,7 +369,7 @@ igmp_input(m, iphlen)
        rip_input(m, iphlen);
 }
 
        rip_input(m, iphlen);
 }
 

-void
+int

 igmp_joingroup(inm)
        struct in_multi *inm;
 {
 igmp_joingroup(inm)
        struct in_multi *inm;
 {


@@ -375,12 +381,14 @@ igmp_joingroup(inm)
                inm->inm_state = IGMP_OTHERMEMBER;
        } else {
                inm->inm_rti = find_rti(inm->inm_ifp);
                inm->inm_state = IGMP_OTHERMEMBER;
        } else {
                inm->inm_rti = find_rti(inm->inm_ifp);

+               if (inm->inm_rti == NULL) return ENOMEM;

                igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
                inm->inm_timer = IGMP_RANDOM_DELAY(
                                        IGMP_MAX_HOST_REPORT_DELAY*PR_FASTHZ);
                inm->inm_state = IGMP_IREPORTEDLAST;
                igmp_timers_are_running = 1;
        }
                igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
                inm->inm_timer = IGMP_RANDOM_DELAY(
                                        IGMP_MAX_HOST_REPORT_DELAY*PR_FASTHZ);
                inm->inm_state = IGMP_IREPORTEDLAST;
                igmp_timers_are_running = 1;
        }

+       return 0;

        splx(s);
 }
 
        splx(s);
 }
 


@@ -473,6 +481,8 @@ igmp_sendpkt(inm, type, addr)
        MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip));
        m->m_data += sizeof(struct ip);
         m->m_len = IGMP_MINLEN;
        MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip));
        m->m_data += sizeof(struct ip);
         m->m_len = IGMP_MINLEN;

+       m->m_pkthdr.csum_flags = 0;
+       m->m_pkthdr.csum_data = 0;

         igmp = mtod(m, struct igmp *);
         igmp->igmp_type   = type;
         igmp->igmp_code   = 0;
         igmp = mtod(m, struct igmp *);
         igmp->igmp_type   = type;
         igmp->igmp_code   = 0;


@@ -503,9 +513,6 @@ igmp_sendpkt(inm, type, addr)
         * XXX
         * Do we have to worry about reentrancy here?  Don't think so.
         */
         * XXX
         * Do we have to worry about reentrancy here?  Don't think so.
         */

-#if IPSEC
-       m->m_pkthdr.rcvif = NULL;
-#endif /*IPSEC*/

         ip_output(m, router_alert, &igmprt, 0, &imo);
 
         ++igmpstat.igps_snd_reports;
         ip_output(m, router_alert, &igmprt, 0, &imo);
 
         ++igmpstat.igps_snd_reports;