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

Timestamp:

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

Author:

bird

Message:

#434: Initial tcpip header merges.

File:

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

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

@@ -1 +1 @@
 /* Modified for emx by hv 1994,1996
+
  *
  * Copyright (c) 1982, 1986 Regents of the University of California.
@@ -39 +40 @@
 #define _NETINET_IF_ETHER_H_
 
-/*
- * Ethernet address - 6 octets
- * this is only used by the ethers(3) functions.
- */
-struct ether_addr {
-        u_char ether_addr_octet[6];
-};
+#ifdef TCPV40HDRS
 
 /*
@@ -57 +52 @@
 
 #define ETHERTYPE_PUP           0x0200  /* PUP protocol */
-/* the IBM header corrects the following to 0x608 for OS/2 but I believe
- * this is just a dirty hack 
- */
+#define ETHERTYPE_IP            0x0800  /* IP protocol */
+#ifdef OS2 /* hv thinks this is just a dirty hack, but we must include it. */
+#define ETHERTYPE_ARP           0x0608  /* address resolution protocol */
+#else
 #define ETHERTYPE_ARP           0x0806  /* address resolution protocol */
-#define ETHERTYPE_IP            0x0800  /* IP protocol */
-#define ETHERTYPE_REVARP        0x8035  /* reverse addr resolution protocol */
+#endif
 
 /*
@@ -79 +74 @@
  *
  * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to 
+ * to resolving internet addresses.  Field names used correspond to
  * RFC 826.
  */
@@ -113 +108 @@
  * Internet to ethernet address resolution table.
  */
-#ifdef TCPIPV4
 #pragma pack(1)
-#else
-#pragma pack(4)
-#endif
 struct  arptab {
         struct  in_addr at_iaddr;       /* internet address */
@@ -127 +118 @@
         u_short at_rcf;                 /* token ring routing control field */
         u_short at_rseg[8];             /* token ring routing segments */
+
         u_long at_millisec;             /* TOD millsecons of last update */
-#ifdef TCPIPV4
         short at_interface;             /* interface index */
-#else
-        int at_interface;               /* interface index */
 #endif
 };
 #pragma pack()
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif /* !_NETINET_IF_ETHER_H_ */