Changeset 183 for trunk/src/emx/include/netinet/ip.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/ip.h (modified) (12 diffs, 1 prop)

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

@@ -1 +1 @@
 /* Modified for emx by hv 1994,1996
+ * Modified for gcc/os2 by bird 2003
  *
  * Copyright (c) 1982, 1986 Regents of the University of California.
@@ -39 +40 @@
 #define _NETINET_IP_H_
 
-#ifdef __EMX__
 #include <machine/endian.h>
-#endif /* __EMX__ */
 
 /*
@@ -56 +55 @@
  * against negative integers quite easily, and fail in subtle ways.
  */
+#pragma pack(1)
 struct ip {
 #if BYTE_ORDER == LITTLE_ENDIAN
@@ -71 +71 @@
 #define IP_DF 0x4000                    /* dont fragment flag */
 #define IP_MF 0x2000                    /* more fragments flag */
+#ifndef TCPV40HDRS
+#define IP_OFFMASK 0x1fff               /* mask for fragmenting bits */
+#endif
         u_char  ip_ttl;                 /* time to live */
         u_char  ip_p;                   /* protocol */
@@ -76 +79 @@
         struct  in_addr ip_src,ip_dst;  /* source and dest address */
 };
-
+#pragma pack()
+
+#ifdef TCPV40HDRS
 #define IP_MAXPACKET    32767           /* OS2 maximum packet size */
+#else
+#define IP_MAXPACKET    65535           /* maximum packet size */
+#endif
 
 /*
@@ -96 +104 @@
 #define IPTOS_PREC_IMMEDIATE            0x40
 #define IPTOS_PREC_PRIORITY             0x20
+#ifdef TCPV40HDRS
 #define IPTOS_PREC_ROUTINE              0x10
+#else
+#define IPTOS_PREC_ROUTINE              0x00
+#endif
 
 /*
  * Definitions for options.
  */
+#ifndef TCPV40HDRS
+#define IPOPT_COPY              0x80
+#endif
 #define IPOPT_COPIED(o)         ((o)&0x80)
 #define IPOPT_CLASS(o)          ((o)&0x60)
@@ -119 +134 @@
 #define IPOPT_SATID             136             /* satnet id */
 #define IPOPT_SSRR              137             /* strict source route */
+#ifndef TCPV40HDRS
+#define IPOPT_RALERT            148             /* router alert */
+#endif
 
 /*
@@ -131 +149 @@
  * Time stamp option structure.
  */
+#pragma pack(1)
 struct  ip_timestamp {
         u_char  ipt_code;               /* IPOPT_TS */
@@ -151 +170 @@
         } ipt_timestamp;
 };
+#pragma pack()
 
 /* flag bits for ipt_flg */
 #define IPOPT_TS_TSONLY         0               /* timestamps only */
 #define IPOPT_TS_TSANDADDR      1               /* timestamps and addresses */
+#ifdef TCPV40HDRS
+#define IPOPT_TS_PRESPEC        2               /* specified modules only */
+#else
 #define IPOPT_TS_PRESPEC        3               /* specified modules only */
+#endif
+
 
 /* bits for security (not byte swapped) */
@@ -170 +195 @@
  */
 #define MAXTTL          255             /* maximum time to live (seconds) */
+/* This is being defined as TCP_TTL, UDP_TTL etc in tcp_time.h
+   #define IPDEFTTL        64
+*/
 #define IPFRAGTTL       60              /* time to live for frags, slowhz */
 #define IPTTLDEC        1               /* subtracted when forwarding */
@@ -175 +203 @@
 #define IP_MSS          576             /* default maximum segment size */
 
-/* hv: this is a new data structure in TCPIPV4; consult IBM's doc for
- * details (provided they tell anything about it at all)
- */
-#ifdef TCPIPV4
+#ifdef TCPV40HDRS
 struct  ipstat {
         long    ips_total;
@@ -204 +229 @@
         long    ips_ipInUnknownProtos;
 };
-#endif
+#endif /* TCPV40HDRS */
+
 
 #endif /* !_NETINET_IP_H_ */