xnu-517.3.15.tar.gz

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

diff --git a/bsd/net/net_osdep.c b/bsd/net/net_osdep.c
index 6807504eaa863f653c2384d6c4a8b4d1c29a4ab7..11835f8c414fba3a3aeed132bc43f9c41dcc731f 100644 (file)
--- a/bsd/net/net_osdep.c
+++ b/bsd/net/net_osdep.c
@@ -3,26 +3,29 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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 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@
  */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,7 +37,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -55,9 +58,6 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
-#if !defined(__FreeBSD__) || __FreeBSD__ < 3
-#include <sys/ioctl.h>
-#endif
 #include <sys/time.h>
 #include <sys/syslog.h>
 #include <kern/cpu_number.h>
@@ -68,39 +68,21 @@
 #include <net/route.h>
 #include <net/bpf.h>
 
-#if 0
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/in_gif.h>
-#endif /* INET */
-
-#if INET6
-#ifndef INET
-#include <netinet/in.h>
-#endif
-#include <netinet6/in6_var.h>
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#include <netinet6/in6_gif.h>
-#include <netinet6/in6_ifattach.h>
-#endif /* INET6 */
-#endif
+#include <net/net_osdep.h>
 
-#if !(defined(__NetBSD__) || defined(__OpenBSD__)) || defined(__APPLE__)
 const char *
 if_name(ifp)
        struct ifnet *ifp;
 {
-       static char nam[IFNAMSIZ + 10]; /*enough?*/
+#define MAXNUMBUF      8
+       static char nam[MAXNUMBUF][IFNAMSIZ + 10];      /*enough?*/
+       static int ifbufround = 0;
+       char *cp;
+
+       ifbufround = (ifbufround + 1) % MAXNUMBUF;
+       cp = nam[ifbufround];
 
-#ifdef __bsdi__
-       sprintf(nam, "%s%d", ifp->if_name, ifp->if_unit);
-#else
-       snprintf(nam, sizeof(nam), "%s%d", ifp->if_name, ifp->if_unit);
-#endif 
-       return nam;
+       snprintf(cp, IFNAMSIZ + 10, "%s%d", ifp->if_name, ifp->if_unit);
+       return((const char *)cp);
+#undef MAXNUMBUF
 }
-#endif