xnu-1456.1.26.tar.gz

[apple/xnu.git] / bsd / netinet6 / mld6.c

diff --git a/bsd/netinet6/mld6.c b/bsd/netinet6/mld6.c
index afc28c6fd7605afc83609e8c8dada165cc38a53c..36e09c8b8264e3b7e6d5e2bbebd9a22e1dc4e0f8 100644 (file)
--- a/bsd/netinet6/mld6.c
+++ b/bsd/netinet6/mld6.c
@@ -1,3 +1,31 @@
+/*
+ * Copyright (c) 2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
 /*     $FreeBSD: src/sys/netinet6/mld6.c,v 1.4.2.2 2001/07/03 11:01:54 ume Exp $       */
 /*     $KAME: mld6.c,v 1.27 2001/04/04 05:17:30 itojun Exp $   */
 
@@ -142,7 +170,7 @@ mld6_init()
        hbh_buf[5] = IP6OPT_RTALERT_LEN - 2;
        bcopy((caddr_t)&rtalert_code, &hbh_buf[6], sizeof(u_int16_t));
 
-       init_ip6pktopts(&ip6_opts);
+       ip6_initpktopts(&ip6_opts);
        ip6_opts.ip6po_hbh = hbh;
 }
 
@@ -414,11 +442,14 @@ mld6_sendpkt(
         * it is more convenient when inserting the hop-by-hop option later.
         */
        MGETHDR(mh, M_DONTWAIT, MT_HEADER);
-       if (mh == NULL)
+       if (mh == NULL) {
+               ifafree(&ia->ia_ifa);
                return;
+       }
        MGET(md, M_DONTWAIT, MT_DATA);
        if (md == NULL) {
                m_free(mh);
+               ifafree(&ia->ia_ifa);
                return;
        }
        mh->m_next = md;
@@ -488,5 +519,6 @@ mld6_sendpkt(
                        break;
                }
        }
+       ifafree(&ia->ia_ifa);
 }