Changeset 183 for trunk/src/emx/include/netinet/in.h

Timestamp:

May 19, 2003, 4:41:00 AM (22 years ago)

Author:

bird

Message:

#434: Initial tcpip header merges.

File:

• trunk/src/emx/include/netinet/in.h (modified) (9 diffs, 1 prop)

trunk/src/emx/include/netinet/in.h

@@ -1 +1 @@
 /* Modified for emx by hv and em 1994,1996
+ * Modified for gcc/os2 by bird 2003
  *
  * Copyright (c) 1982, 1986, 1990 Regents of the University of California.
@@ -66 +67 @@
 #define IPPROTO_UDP             17              /* user datagram protocol */
 #define IPPROTO_IDP             22              /* xns idp */
+#ifndef TCPV40HDRS
 #define IPPROTO_TP              29              /* tp-4 w/ class negotiation */
 #define IPPROTO_EON             80              /* ISO cnlp */
+#define IPPROTO_ENCAP           98              /* encapsulation header */
+#endif
 
 #define IPPROTO_RAW             255             /* raw IP packet */
@@ -80 +84 @@
  * for servers, not necessarily privileged.
  */
+#ifdef TCPV40HDRS
 #define IPPORT_RESERVED         1024
 #define IPPORT_USERRESERVED     5000
+#else
+ /* Changing the ephemeral port #s as per Internet Assigned Numbers Authority's
+  * update as found in JUL '97. [Ref: http://www.isi.edu/div7/iana/descript/html] */
+#define IPPORT_RESERVED        49152  /* Old 1024. Changed as per IANA draft */
+#define IPPORT_USERRESERVED    65535  /* Old 5000. Changed as per IANA draft */
+#endif
+
+#ifdef TCPV40HDRS
+/*
+ * Link numbers
+ */
+#define IMPLINK_IP              155
+#define IMPLINK_LOWEXPER        156
+#define IMPLINK_HIGHEXPER       158
+#endif
 
 /*
@@ -113 +133 @@
 
 #define IN_CLASSD(i)            (((long)(i) & 0xf0000000) == 0xe0000000)
+#ifdef TCPV40HDRS
+#define IN_CLASSD_NET           0xffffffff
+#define IN_CLASSD_HOST          0
+#else
 #define IN_CLASSD_NET           0xf0000000      /* These ones aren't really */
+#define IN_CLASSD_HOST          0x0fffffff      /* routing needn't know. */
+#endif
 #define IN_CLASSD_NSHIFT        28              /* net and host fields, but */
-#define IN_CLASSD_HOST          0x0fffffff      /* routing needn't know. */
 #define IN_MULTICAST(i)         IN_CLASSD(i)
 
+#ifdef TCPV40HDRS
 #define IN_EXPERIMENTAL(i)      (((long)(i) & 0xe0000000) == 0xe0000000)
+#else
+#define IN_EXPERIMENTAL(i)      (((long)(i) & 0xf0000000) == 0xe0000000)
+#endif
 #define IN_BADCLASS(i)          (((long)(i) & 0xf0000000) == 0xf0000000)
 
 #define INADDR_ANY              (u_long)0x00000000
+#ifndef TCPV40HDRS
 #define INADDR_LOOPBACK         (u_long)0x7f000001
+#endif
 #define INADDR_BROADCAST        (u_long)0xffffffff      /* must be masked */
-#ifndef KERNEL
-#define INADDR_NONE             0xffffffff              /* -1 return */
-#endif
 
 #define INADDR_UNSPEC_GROUP     (u_long)0xe0000000      /* 224.0.0.0 */
@@ -132 +160 @@
 #define INADDR_MAX_LOCAL_GROUP  (u_long)0xe00000ff      /* 224.0.0.255 */
 
+#ifndef KERNEL
+#define INADDR_NONE             0xffffffff              /* -1 return */
+#endif
+
 #define IN_LOOPBACKNET          127                     /* official! */
 
-/*
- * Define a macro to stuff the loopback address into an Internet address
- */
-#define IN_SET_LOOPBACK_ADDR(a) { \
-        (a)->sin_addr.s_addr = htonl(INADDR_LOOPBACK); \
-        (a)->sin_family = AF_INET; }
+
 /*
  * Socket address, internet style. 4.3BSD
  */
+#ifdef TCPV40HDRS
 struct sockaddr_in {
         short   sin_family;
@@ -149 +177 @@
         char    sin_zero[8];
 };
+#else
+#pragma pack(1)
+struct sockaddr_in {
+        u_char  sin_len;
+        u_char  sin_family;
+        u_short sin_port;
+        struct  in_addr sin_addr;
+        char    sin_zero[8];
+};
+#pragma pack()
+#endif
 
 /*
@@ -157 +196 @@
  * (this gets put into the header proper).
  */
+#ifndef TCPV40HDRS
+#pragma pack(1)
+#endif
 struct ip_opts {
         struct  in_addr ip_dst;         /* first hop, 0 w/o src rt */
         char    ip_opts[40];            /* actually variable in size */
 };
+#ifndef TCPV40HDRS
+#pragma pack()
+#endif
 
 /*
@@ -167 +212 @@
  */
 #define IP_OPTIONS              1       /* buf/ip_opts; set/get IP options */
-
 #define IP_MULTICAST_IF         2       /* u_char; set/get IP mcast i/f */
 #define IP_MULTICAST_TTL        3       /* u_char; set/get IP mcast ttl */
@@ -173 +217 @@
 #define IP_ADD_MEMBERSHIP       5       /* ip_mreq; add IP group membership */
 #define IP_DROP_MEMBERSHIP      6       /* ip_mreq; drop IP group membership */
-
-#ifndef __EMX__ /* not supported so far */
-#define IP_HDRINCL              2       /* int; header is included with data */
-#define IP_TOS                  3       /* int; IP type of service and preced */
-#define IP_TTL                  4       /* int; IP time to live */
-#define IP_RECVOPTS             5       /* bool; receive all IP opts w/dgram */
-#define IP_RECVRETOPTS          6       /* bool; receive IP opts for response */
-#define IP_RECVDSTADDR          7       /* bool; receive IP dst addr w/dgram */
-#define IP_RETOPTS              8       /* ip_opts; set/get IP options */
-#endif
-
+#ifndef TCPV40HDRS
+#define IP_HDRINCL              7    /* int; header is included with data */
+#define IP_TOS                  8    /* int; IP type of service and preced. */
+#define IP_TTL                  9    /* int; IP time to live */
+#define IP_RECVOPTS             10   /* bool; receive all IP opts w/dgram */
+#define IP_RECVRETOPTS          11   /* bool; receive IP opts for response */
+#define IP_RECVDSTADDR          12   /* bool; receive IP dst addr w/dgram */
+#define IP_RETOPTS              13   /* ip_opts; set/get IP options */
+#define IP_RECVTRRI             14   /* bool; receive token ring routing inf */
+#endif
+
+/*
+ * Defaults and limits for options
+ */
 #define IP_DEFAULT_MULTICAST_TTL   1    /* normally limit m'casts to 1 hop  */
 #define IP_DEFAULT_MULTICAST_LOOP  1    /* normally hear sends if a member  */
 #define IP_MAX_MEMBERSHIPS         20   /* per socket; must fit in one mbuf */
+#ifndef TCPV40HDRS
+#define MAX_IN_MULTI      16*IP_MAX_MEMBERSHIPS      /* 320 max per os2 */
+extern u_short CntInMulti;
+#endif
 
 /*
  * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
  */
+#ifndef TCPV40HDRS
+#pragma pack(1)
+#endif
 struct ip_mreq {
         struct  in_addr imr_multiaddr;  /* IP multicast address of group */
         struct  in_addr imr_interface;  /* local IP address of interface */
 };
-
-/* prototypes for functions in inet(3) */
-extern  u_long          inet_addr(__const__ char*);
-extern  struct in_addr  inet_makeaddr(u_long, u_long);
-extern  u_long          inet_network(__const__ char*);
-extern  char            *inet_ntoa(struct in_addr);
-extern  u_long          inet_netof(struct in_addr);
-extern  u_long          inet_lnaof(struct in_addr);
+#ifndef TCPV40HDRS
+#pragma pack()
+#endif
+
+#ifdef TCPV40HDRS
+/* for functions */
+#include <arpa/inet.h>
+
+#else
+
+/*
+ * Definitions for inet sysctl operations.
+ *
+ * Third level is protocol number.
+ * Fourth level is desired variable within that protocol.
+ */
+#define IPPROTO_MAXID   (IPPROTO_IDP + 1)       /* don't list to IPPROTO_MAX */
+
+#define CTL_IPPROTO_NAMES { \
+        { "ip", CTLTYPE_NODE }, \
+        { "icmp", CTLTYPE_NODE }, \
+        { "igmp", CTLTYPE_NODE }, \
+        { "ggp", CTLTYPE_NODE }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { "tcp", CTLTYPE_NODE }, \
+        { 0, 0 }, \
+        { "egp", CTLTYPE_NODE }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { "pup", CTLTYPE_NODE }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { "udp", CTLTYPE_NODE }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { 0, 0 }, \
+        { "idp", CTLTYPE_NODE }, \
+}
+#endif /*TCPV40HDRS (else) */
 
 #if defined (__cplusplus)