xnu-1504.15.3.tar.gz

[apple/xnu.git] / osfmk / kdp / kdp_udp.h

diff --git a/osfmk/kdp/kdp_udp.h b/osfmk/kdp/kdp_udp.h
index 7b8c42916b56714fb995e309caabf93bdef632bb..c057dc4b14f19faa18ff02832e63582f84580b68 100644 (file)
--- a/osfmk/kdp/kdp_udp.h
+++ b/osfmk/kdp/kdp_udp.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -20,7 +23,7 @@
  * 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, 1986, 1993
@@ -29,6 +32,7 @@
 
 #include <libsa/types.h>
 #include <libkern/OSByteOrder.h>   /* OSSwap functions */
+#include <stdint.h>
 
 #define     ETHERMTU        1500
 #define     ETHERHDRSIZE    14
@@ -36,7 +40,7 @@
 #define     KDP_MAXPACKET   (ETHERHDRSIZE + ETHERMTU + ETHERCRC)
 
 struct in_addr {
-        u_long s_addr;
+        uint32_t s_addr;
 };
 
 struct ether_addr {
@@ -49,7 +53,7 @@ extern struct ether_addr kdp_get_mac_addr(void);
 unsigned int  kdp_get_ip_address(void);
 
 struct ipovly {
-        caddr_t ih_next, ih_prev;       /* for protocol sequence q's */
+        uint32_t ih_next, ih_prev;       /* for protocol sequence q's */
         u_char  ih_x1;                  /* (unused) */
         u_char  ih_pr;                  /* protocol */
         short   ih_len;                 /* protocol length */
@@ -82,7 +86,7 @@ struct  udpiphdr {
 
 struct ip { 
        union {
-               u_long ip_w;
+               uint32_t ip_w;
                struct {
                        unsigned int
 #ifdef __LITTLE_ENDIAN__