synch with van, simplify negative-length (shrinking window) code

[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 6b342bb..bd273b8 100644 (file)
--- a/usr/src/sys/netinet/in.h
+++ b/usr/src/sys/netinet/in.h
@@ -1,4 +1,10 @@
-/*     in.h    4.14    82/06/30        */
+/*
+ * 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.
+ *
+ *     @(#)in.h        7.3 (Berkeley) %G%
+ */

 
 /*
  * Constants and structures defined by the internet system,
 
 /*
  * Constants and structures defined by the internet system,


@@ -8,60 +14,27 @@
 /*
  * Protocols
  */
 /*
  * Protocols
  */

+#define        IPPROTO_IP              0               /* dummy for IP */

 #define        IPPROTO_ICMP            1               /* control message protocol */
 #define        IPPROTO_GGP             2               /* gateway^2 (deprecated) */
 #define        IPPROTO_TCP             6               /* tcp */
 #define        IPPROTO_ICMP            1               /* control message protocol */
 #define        IPPROTO_GGP             2               /* gateway^2 (deprecated) */
 #define        IPPROTO_TCP             6               /* tcp */

+#define        IPPROTO_EGP             8               /* exterior gateway protocol */

 #define        IPPROTO_PUP             12              /* pup */
 #define        IPPROTO_UDP             17              /* user datagram protocol */
 #define        IPPROTO_PUP             12              /* pup */
 #define        IPPROTO_UDP             17              /* user datagram protocol */

+#define        IPPROTO_IDP             22              /* xns idp */

 
 #define        IPPROTO_RAW             255             /* raw IP packet */
 #define        IPPROTO_MAX             256
 
 
 #define        IPPROTO_RAW             255             /* raw IP packet */
 #define        IPPROTO_MAX             256
 

-/*
- * Port/socket numbers: network standard functions
- */
-#define        IPPORT_ECHO             7
-#define        IPPORT_DISCARD          9
-#define        IPPORT_SYSTAT           11
-#define        IPPORT_DAYTIME          13
-#define        IPPORT_NETSTAT          15
-#define        IPPORT_FTP              21
-#define        IPPORT_TELNET           23
-#define        IPPORT_SMTP             25
-#define        IPPORT_TIMESERVER       37
-#define        IPPORT_NAMESERVER       42
-#define        IPPORT_WHOIS            43
-#define        IPPORT_MTP              57
-
-/*
- * Port/socket numbers: host specific functions
- */
-#define        IPPORT_TFTP             69
-#define        IPPORT_RJE              77
-#define        IPPORT_FINGER           79
-#define        IPPORT_TTYLINK          87
-#define        IPPORT_SUPDUP           95
-
-/*
- * UNIX TCP sockets
- */
-#define        IPPORT_EXECSERVER       512
-#define        IPPORT_LOGINSERVER      513
-#define        IPPORT_CMDSERVER        514
-#define        IPPORT_EFSSERVER        520
-
-/*
- * UNIX UDP sockets
- */
-#define        IPPORT_BIFFUDP          512
-#define        IPPORT_WHOSERVER        513
-#define        IPPORT_ROUTESERVER      520     /* 520+1 also used */

 
 /*
  * Ports < IPPORT_RESERVED are reserved for
  * privileged processes (e.g. root).
 
 /*
  * Ports < IPPORT_RESERVED are reserved for
  * privileged processes (e.g. root).

+ * Ports > IPPORT_USERRESERVED are reserved
+ * for servers, not necessarily privileged.

  */
 #define        IPPORT_RESERVED         1024
  */
 #define        IPPORT_RESERVED         1024

+#define        IPPORT_USERRESERVED     5000

 
 /*
  * Link numbers
 
 /*
  * Link numbers


@@ -71,53 +44,47 @@
 #define        IMPLINK_HIGHEXPER       158
 
 /*
 #define        IMPLINK_HIGHEXPER       158
 
 /*

- * Internet address (old style... should be updated)
+ * Internet address (a structure for historical reasons)

  */
 struct in_addr {
  */
 struct in_addr {

-       union {
-               struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b;
-               struct { u_short s_w1,s_w2; } S_un_w;
-               u_long S_addr;
-       } S_un;
-#define        s_addr  S_un.S_addr     /* can be used for most tcp & ip code */
-#ifdef vax
-#define        s_host  S_un.S_un_b.s_b2        /* host on imp */
-#define        s_net   S_un.S_un_b.s_b1        /* network */
-#define        s_imp   S_un.S_un_w.s_w2        /* imp */
-#define        s_impno S_un.S_un_b.s_b4        /* imp # */
-#define        s_lh    S_un.S_un_b.s_b3        /* logical host */
-#endif
+       u_long s_addr;

 };
 
 /*
 };
 
 /*

- * Macros for dealing with Class A/B/C network
- * numbers.  High 3 bits of uppermost byte indicates
- * how to interpret the remainder of the 32-bit
- * Internet address.  The macros may be used in time
- * time critical sections of code, while subroutine
- * versions also exist use in other places.
+ * Definitions of bits in internet address integers.
+ * On subnets, the decomposition of addresses to host and net parts
+ * is done according to subnet mask, not the masks here.

  */
  */

-#if vax || pdp11
-#define        IN_CLASSA       0x00000080
-#define        IN_CLASSA_NET   0x000000ff      /* 8 bits of net # */
-#define        IN_CLASSA_LNA   0xffffff00
-#define        IN_CLASSB       0x00000040
-#define        IN_CLASSB_NET   0x0000ffff      /* 16 bits of net # */
-#define        IN_CLASSB_LNA   0xffff0000
-#define        IN_CLASSC_NET   0x00ffffff      /* 24 bits of net # */
-#define        IN_CLASSC_LNA   0xff000000
-#endif
+#define        IN_CLASSA(i)            (((long)(i) & 0x80000000) == 0)
+#define        IN_CLASSA_NET           0xff000000
+#define        IN_CLASSA_NSHIFT        24
+#define        IN_CLASSA_HOST          0x00ffffff
+#define        IN_CLASSA_MAX           128
+
+#define        IN_CLASSB(i)            (((long)(i) & 0xc0000000) == 0x80000000)
+#define        IN_CLASSB_NET           0xffff0000
+#define        IN_CLASSB_NSHIFT        16
+#define        IN_CLASSB_HOST          0x0000ffff
+#define        IN_CLASSB_MAX           65536
+
+#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_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        IN_NETOF(in) \
-       (((in).s_addr&IN_CLASSA) == 0 ? (in).s_addr&IN_CLASSA_NET : \
-               ((in).s_addr&IN_CLASSB) == 0 ? (in).s_addr&IN_CLASSB_NET : \
-                       (in).s_addr&IN_CLASSC_NET)
-#define        IN_LNAOF(in) \
-       (((in).s_addr&IN_CLASSA) == 0 ? (in).s_addr&IN_CLASSA_LNA : \
-               ((in).s_addr&IN_CLASSB) == 0 ? (in).s_addr&IN_CLASSB_LNA : \
-                       (in).s_addr&IN_CLASSC_LNA)
+#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        INADDR_ANY      0x00000000
+#define        IN_LOOPBACKNET          127                     /* official! */

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


@@ -128,3 +95,15 @@ struct sockaddr_in {
        struct  in_addr sin_addr;
        char    sin_zero[8];
 };
        struct  in_addr sin_addr;
        char    sin_zero[8];
 };

+
+/*
+ * Options for use with [gs]etsockopt at the IP level.
+ */
+#define        IP_OPTIONS      1               /* set/get IP per-packet options */
+
+#ifdef KERNEL
+extern struct domain inetdomain;
+extern struct protosw inetsw[];
+struct in_addr in_makeaddr();
+u_long in_netof(), in_lnaof();
+#endif