xnu-1504.15.3.tar.gz

[apple/xnu.git] / bsd / net / if_ethersubr.c

diff --git a/bsd/net/if_ethersubr.c b/bsd/net/if_ethersubr.c
index 205ec439237447f38674d072aee8ad4c13031fb0..e407e009fa8fe6e3d498bc026affbd3cef26aa88 100644 (file)
--- a/bsd/net/if_ethersubr.c
+++ b/bsd/net/if_ethersubr.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2009 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1982, 1989, 1993
  */
 /*
  * Copyright (c) 1982, 1989, 1993


@@ -89,10 +95,6 @@
 extern struct ifqueue pkintrq;
 #endif
 
 extern struct ifqueue pkintrq;
 #endif
 

-#if BRIDGE
-#include <net/bridge.h>
-#endif
-

 /* #include "vlan.h" */
 #if NVLAN > 0
 #include <net/if_vlan_var.h>
 /* #include "vlan.h" */
 #if NVLAN > 0
 #include <net/if_vlan_var.h>


@@ -148,6 +150,8 @@ ether_resolvemulti(
                        return EADDRNOTAVAIL;
                MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
                       M_WAITOK);
                        return EADDRNOTAVAIL;
                MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
                       M_WAITOK);

+               if (sdl == NULL)
+                       return ENOBUFS;

                sdl->sdl_len = sizeof *sdl;
                sdl->sdl_family = AF_LINK;
                sdl->sdl_index = ifp->if_index;
                sdl->sdl_len = sizeof *sdl;
                sdl->sdl_family = AF_LINK;
                sdl->sdl_index = ifp->if_index;


@@ -175,6 +179,8 @@ ether_resolvemulti(
                 }
                 MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
                        M_WAITOK);
                 }
                 MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
                        M_WAITOK);

+               if (sdl == NULL)
+                       return ENOBUFS;

                 sdl->sdl_len = sizeof *sdl;
                 sdl->sdl_family = AF_LINK;
                 sdl->sdl_index = ifp->if_index;
                 sdl->sdl_len = sizeof *sdl;
                 sdl->sdl_family = AF_LINK;
                 sdl->sdl_index = ifp->if_index;


@@ -184,8 +190,10 @@ ether_resolvemulti(
                 sdl->sdl_slen = 0;
                 e_addr = LLADDR(sdl);
                 ETHER_MAP_IPV6_MULTICAST(&sin6->sin6_addr, e_addr);
                 sdl->sdl_slen = 0;
                 e_addr = LLADDR(sdl);
                 ETHER_MAP_IPV6_MULTICAST(&sin6->sin6_addr, e_addr);

-                kprintf("ether_resolvemulti Adding %x:%x:%x:%x:%x:%x\n",
+#if 0
+                printf("ether_resolvemulti Adding %x:%x:%x:%x:%x:%x\n",

                                 e_addr[0], e_addr[1], e_addr[2], e_addr[3], e_addr[4], e_addr[5]);
                                 e_addr[0], e_addr[1], e_addr[2], e_addr[3], e_addr[4], e_addr[5]);

+#endif

                 *llsa = (struct sockaddr *)sdl;
                 return 0;
 #endif
                 *llsa = (struct sockaddr *)sdl;
                 return 0;
 #endif