sun merge

[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 87ea700..10a7d77 100644 (file)
--- a/usr/src/sys/netinet/in.h
+++ b/usr/src/sys/netinet/in.h
@@ -1,4 +1,4 @@
-/* in.h 4.4 81/11/18 */
+/*     in.h    4.19    82/12/17        */

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


@@ -8,13 +8,13 @@
 /*
  * Protocols
  */
 /*
  * Protocols
  */

-#define        IPPROTO_RAW             -1

 #define        IPPROTO_ICMP            1               /* control message protocol */
 #define        IPPROTO_ICMP            1               /* control message protocol */

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

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

+#define        IPPROTO_RAW             255             /* raw IP packet */

 #define        IPPROTO_MAX             256
 
 /*
 #define        IPPROTO_MAX             256
 
 /*


@@ -42,6 +42,27 @@
 #define        IPPORT_TTYLINK          87
 #define        IPPORT_SUPDUP           95
 
 #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).
+ */
+#define        IPPORT_RESERVED         1024
+

 /*
  * Link numbers
  */
 /*
  * Link numbers
  */


@@ -56,16 +77,36 @@ 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;
        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_l;
+               u_long S_addr;

        } S_un;
        } S_un;

-#define        s_addr  S_un.s_l        /* can be used for most tcp & ip code */
+#define        s_addr  S_un.S_addr     /* can be used for most tcp & ip code */

 #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_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_lhost S_un.S_un_b.s_b1        /* net library format host on imp */
-#define        s_lnet  S_un.S_un_b.s_b2        /* net library format network */
+#define        s_impno S_un.S_un_b.s_b4        /* imp # */
+#define        s_lh    S_un.S_un_b.s_b3        /* logical host */

 };
 
 };
 

+/*
+ * Definitions of bits in internet address integers.
+ */
+#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_CLASSB(i)            ((((long)(i))&0xc0000000)==0x80000000)
+#define        IN_CLASSB_NET           0xffff0000
+#define        IN_CLASSB_NSHIFT        16
+#define        IN_CLASSB_HOST          0x0000ffff
+
+#define        IN_CLASSC(i)            ((((long)(i))&0xc0000000)==0xc0000000)
+#define        IN_CLASSC_NET           0xffffff00
+#define        IN_CLASSC_NSHIFT        8
+#define        IN_CLASSC_HOST          0x000000ff
+
+#define        INADDR_ANY      0x00000000
+

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


@@ -75,3 +116,18 @@ struct sockaddr_in {
        struct  in_addr sin_addr;
        char    sin_zero[8];
 };
        struct  in_addr sin_addr;
        char    sin_zero[8];
 };

+
+#if !defined(vax)
+/*
+ * Macros for number representation conversion.
+ */
+#define        ntohl(x)        (x)
+#define        ntohs(x)        (x)
+#define        htonl(x)        (x)
+#define        htons(x)        (x)
+#endif
+
+#ifdef KERNEL
+extern struct domain inetdomain;
+extern struct protosw inetsw[];
+#endif