BSD 4_3_Tahoe release

[unix-history] / usr / src / sys / netinet / in.h

diff --git a/usr/src/sys/netinet/in.h b/usr/src/sys/netinet/in.h
index 4abef17..2523ddd 100644 (file)
--- a/usr/src/sys/netinet/in.h
+++ b/usr/src/sys/netinet/in.h
@@ -1,9 +1,20 @@
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)in.h        7.1 (Berkeley) 6/5/86
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)in.h        7.6 (Berkeley) 6/29/88

  */
 
 /*
  */
 
 /*


@@ -16,7 +27,7 @@
  */
 #define        IPPROTO_IP              0               /* dummy for IP */
 #define        IPPROTO_ICMP            1               /* control message protocol */
  */
 #define        IPPROTO_IP              0               /* dummy for IP */
 #define        IPPROTO_ICMP            1               /* control message protocol */

-#define        IPPROTO_GGP             2               /* gateway^2 (deprecated) */
+#define        IPPROTO_GGP             3               /* gateway^2 (deprecated) */

 #define        IPPROTO_TCP             6               /* tcp */
 #define        IPPROTO_EGP             8               /* exterior gateway protocol */
 #define        IPPROTO_PUP             12              /* pup */
 #define        IPPROTO_TCP             6               /* tcp */
 #define        IPPROTO_EGP             8               /* exterior gateway protocol */
 #define        IPPROTO_PUP             12              /* pup */


@@ -67,13 +78,24 @@ struct in_addr {
 #define        IN_CLASSB_HOST          0x0000ffff
 #define        IN_CLASSB_MAX           65536
 
 #define        IN_CLASSB_HOST          0x0000ffff
 #define        IN_CLASSB_MAX           65536
 

-#define        IN_CLASSC(i)            (((long)(i) & 0xc0000000) == 0xc0000000)
+#define        IN_CLASSC(i)            (((long)(i) & 0xe0000000) == 0xc0000000)

 #define        IN_CLASSC_NET           0xffffff00
 #define        IN_CLASSC_NSHIFT        8
 #define        IN_CLASSC_HOST          0x000000ff
 
 #define        IN_CLASSC_NET           0xffffff00
 #define        IN_CLASSC_NSHIFT        8
 #define        IN_CLASSC_HOST          0x000000ff
 

+#define        IN_CLASSD(i)            (((long)(i) & 0xf0000000) == 0xe0000000)
+#define        IN_MULTICAST(i)         IN_CLASSD(i)
+
+#define        IN_EXPERIMENTAL(i)      (((long)(i) & 0xe0000000) == 0xe0000000)
+#define        IN_BADCLASS(i)          (((long)(i) & 0xf0000000) == 0xf0000000)
+

 #define        INADDR_ANY              (u_long)0x00000000
 #define        INADDR_BROADCAST        (u_long)0xffffffff      /* must be masked */
 #define        INADDR_ANY              (u_long)0x00000000
 #define        INADDR_BROADCAST        (u_long)0xffffffff      /* must be masked */

+#ifndef KERNEL
+#define        INADDR_NONE             0xffffffff              /* -1 return */
+#endif
+
+#define        IN_LOOPBACKNET          127                     /* official! */

 
 /*
  * Socket address, internet style.
 
 /*
  * Socket address, internet style.


@@ -90,21 +112,6 @@ struct sockaddr_in {
  */
 #define        IP_OPTIONS      1               /* set/get IP per-packet options */
 
  */
 #define        IP_OPTIONS      1               /* set/get IP per-packet options */
 

-#if !defined(vax) && !defined(ntohl) && !defined(lint)
-/*
- * Macros for number representation conversion.
- */
-#define        ntohl(x)        (x)
-#define        ntohs(x)        (x)
-#define        htonl(x)        (x)
-#define        htons(x)        (x)
-#endif
-
-#if !defined(ntohl) && (defined(vax) || defined(lint))
-u_short        ntohs(), htons();
-u_long ntohl(), htonl();
-#endif
-

 #ifdef KERNEL
 extern struct domain inetdomain;
 extern struct protosw inetsw[];
 #ifdef KERNEL
 extern struct domain inetdomain;
 extern struct protosw inetsw[];