Changeset 183 for trunk/src/emx/include/net

Timestamp:

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

Author:

bird

Message:

#434: Initial tcpip header merges.

Location:

trunk/src/emx/include/net

Files:

• if.h (modified) (19 diffs, 1 prop)
• if_arp.h (modified) (6 diffs, 1 prop)
• route.h (modified) (8 diffs, 1 prop)

trunk/src/emx/include/net/if.h

@@ -1 +1 @@
 /* Modifed for emx by hv 1994,1996
+
  *
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -43 +44 @@
 #endif
 
+
+
+
+
+
 /*
  * Structures defining a network interface, providing a packet
@@ -67 +73 @@
  * interfaces.  These routines live in the files if.c and route.c
  */
-/*  XXX fast fix for SNMP, going away soon */
-#include <sys/time.h>
-
-#ifdef TCPIPV4
-#pragma pack(1)
-#else
-#pragma pack(4)
-#endif
-
 
 /*
@@ -82 +79 @@
  * (Would like to call this struct ``if'', but C isn't PL/1.)
  */
-/*forward*/ struct mbuf;
-/*forward*/ struct ifaddr;
+#pragma pack(1)
+struct mbuf;
+struct ifaddr;
 struct ifnet {
         char    *if_name;               /* name, e.g. ``en'' or ``lo'' */
@@ -95 +93 @@
                 struct  mbuf *ifq_head;
                 struct  mbuf *ifq_tail;
-#ifndef TCPIPV4
-                int     ifq_len;
-                int     ifq_maxlen;
-                int     ifq_drops;
-#else
                 short   ifq_len;
                 short   ifq_maxlen;
                 u_short ifq_drops;
-#endif
         } if_snd;                       /* output queue */
 /* procedure handles */
@@ -112 +104 @@
         int     (*if_watchdog)(void);   /* timer routine */
 /* generic interface statistics */
-#ifndef TCPIPV4
-        int     if_ipackets;            /* packets received on interface */
-        int     if_ierrors;             /* input errors on interface */
-        int     if_opackets;            /* packets sent on interface */
-        int     if_oerrors;             /* output errors on interface */
-        int     if_collisions;          /* collisions on csma interfaces */
-#else
         u_short if_ipackets;            /* packets received on interface */
         u_short if_ierrors;             /* input errors on interface */
@@ -124 +109 @@
         u_short if_oerrors;             /* output errors on interface */
         u_short if_collisions;          /* collisions on csma interfaces */
-#endif
 /* end statistics */
         struct  ifnet *if_next;
 
+
 /* the following structures are special for OS/2 TCP/IP only */
         u_char  if_adapternum;          /* adapter number */
@@ -134 +119 @@
         u_long  if_speed;
 
-#define IF_RTTSCALE     1000
-        u_short if_rtt;                 /* Est interface rtt in ms */
-        u_short if_rttvar;              /* Est interface rttvar in ms */
-        u_short if_rttmin;              /* Fixed interface rttmin in ms */
-        u_short if_sendpipe;            /* Send socket buffer/window size */
-        u_short if_recvpipe;            /* Recv socket buffer/window size */
-        u_short if_ssthresh;            /* Gateway buffer limit (slow strt) */
-#ifdef TCPIPV4
-        u_long  if_eflags;              /* Extended flags */
-        struct ifqueue if_traceq;       /* packet trace queue */
-        u_short if_segsize;             /* segment size for interface */
-        u_short if_use576;              /* use 576 or 1460 as def. mss if */
-                                        /* going through a router */
-        u_short if_rfc1469;             /* using broadcast or functional */
-                                        /* addr for IP Multicast */
-#define IFF_RFC1469_BC  1               /* use broadcast */
-#define IFF_RFC1469_FA  2               /* use functional address */
-#define IFF_RFC1469_MA  3               /* use multicast address */
-#endif
-};
-
-#ifndef TCPIPV4
-struct ifmib {
-        int     ifNumber;               /* number of network interfaces */
-        struct iftable {
-                int     ifIndex;        /* index of this interface */
-                char    ifDescr[45];    /* description */
-                int     ifType;         /* type of the interface */
-                int     ifMtu;          /* MTU of the interface */
-                char    ifPhysAddr[6];  /* MTU of the interface */
-                int     ifOperStatus;
-                u_long  ifSpeed;
-                u_long  ifLastChange;
-                u_long  ifInOctets;
-                u_long  ifOutOctets;
-                u_long  ifOutDiscards;
-                u_long  ifInDiscards;
-                u_long  ifInErrors;
-                u_long  ifOutErrors;
-                u_long  ifInUnknownProtos;
-                u_long  ifInUcastPkts;
-                u_long  ifOutUcastPkts;
-                u_long  ifInNUcastPkts;
-                u_long  ifOutNUcastPkts;
-        } iftable[20];
-};
-#else /* TCP/IP V4 */
+        /* Interface TCP estimates/controls.  Serves the same */
+        /* purpose as the per-route values in BSD-Reno, but I didn't */
+        /* have to touch any of the route manipulation code.         */
+        u_short if_rtt;                 /* Est interface rtt in ms */
+        u_short if_rttvar;              /* Est interface rttvar in ms */
+        u_short if_rttmin;              /* Fixed interface rttmin in ms */
+        u_short if_sendpipe;            /* Send socket buffer/window size */
+        u_short if_recvpipe;            /* Recv socket buffer/window size */
+        u_short if_ssthresh;            /* Gateway buffer limit (slow strt) */
+        u_long  if_eflags;              /* Extended Flags */
+        struct ifqueue if_traceq;       /* packet trace queue */
+        u_short if_segsize;             /* segment size for interface*/
+        u_short if_use576;              /* use 576 or 1460 as def. mss if going thru a router */
+        /* Token Ring IP multicast flag */
+        u_short if_rfc1469;             /* using broadcast or functional address */
+                                        /* for IP Mulitcast */
+#define IF_RTTSCALE 1000
+#endif /* __OS2__ */
+};
+#pragma pack()
+#endif /*TCPV40HDRS*/
 
 #ifndef IFMIB_ENTRIES
@@ -186 +145 @@
 #endif
 
+
+
 struct ifmib {
         short   ifNumber;               /* number of network interfaces */
@@ -210 +171 @@
         } iftable[IFMIB_ENTRIES];
 };
-#endif /* TCP/IP V4 */
-#pragma pack()
+#pragma pack()
+
+#else /*TCPV40HDRS*/
+
+#pragma pack(1) /* force on doubleword boundary */
+struct iftable {
+    short  iftIndex;        /* index of this interface */
+    char   iftDescr[45];    /* description             */
+    short  iftType;         /* type of the interface   */
+    short  iftMtu;          /* MTU of the interface   */
+    char   iftPhysAddr[6];  /* MTU of the interface   */
+    short  iftOperStatus;
+    u_long iftSpeed;
+    u_long iftLastChange;
+    u_long iftInOctets;
+    u_long iftOutOctets;
+    u_long iftOutDiscards;
+    u_long iftInDiscards;
+    u_long iftInErrors;
+    u_long iftOutErrors;
+    u_long iftInUnknownProtos;
+    u_long iftInUcastPkts;
+    u_long iftOutUcastPkts;
+    u_long iftInNUcastPkts;
+    u_long iftOutNUcastPkts;
+};
+struct ifmib {
+    short ifNumber;
+    struct iftable iftable[IFMIB_ENTRIES];
+};
+#pragma pack()   /* reset to default packing */
+
+#define IFC_ALLRTSBCAST    0x0001
+#define IFC_802_3          0x0002
+#define IFC_FDDI           0x0004
+#define IFC_NOREDIR        0x0010
+
+#define OPERSTATUS_UP      0x1
+#define OPERSTATUS_DOWN    0x2
+#define OPERSTATUS_TESTING 0x3
+#endif /*TCPV40HDRS*/
 
 #define IFF_UP          0x1             /* interface is up */
@@ -219 +219 @@
 #define IFF_POINTOPOINT 0x10            /* interface is point-to-point link */
 #define IFF_NOTRAILERS  0x20            /* avoid use of trailers */
+
+
+
 #define IFF_RUNNING     0x40            /* resources allocated */
 #define IFF_NOARP       0x80            /* no address resolution protocol */
-/* next two not supported now, but reserved: */
 #define IFF_PROMISC     0x100           /* receive all packets */
 #define IFF_ALLMULTI    0x200           /* receive all multicast packets */
-#define IFF_OACTIVE     0x400           /* transmission in progress */
-#define IFF_SIMPLEX     0x800           /* can't hear own transmissions */
+#define IFF_DEFMTU      0x400           /* default mtu of 1500 */
+#define IFF_MULTICAST   0x800           /* supports multicast */
+/*
+ * The IFF_MULTICAST flag indicates that the network can support the
+ * transmission and reception of higher-level (e.g., IP) multicast packets.
+ * It is independent of hardware support for multicasting; for example,
+ * point-to-point links or pure broadcast networks may well support
+ * higher-level multicasts.
+ */
 #define IFF_BRIDGE      0x1000          /* support token ring routine field */
-#define IFF_SNAP        0x2000          /* support extended SNAP header */
+#define IFF_SNAP        0x2000          /* support extended SAP header */
 #define IFF_ETHER       0x4000          /* ethernet interface */
 #define IFF_LOOPBRD     0x8000          /* ethernet interface */
+
+
+
+
+
+
+
+
+
+
+
 
 /*hv: flags set internally only */
-#ifdef BSD_TCPCOMPAT
+#ifdef TCPV40HDRS
+#define IFF_CANTCHANGE  (IFF_BROADCAST | IFF_POINTOPOINT | IFF_RUNNING)
+#else
 #define IFF_CANTCHANGE \
         (IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE| \
-        IFF_SIMPLEX|IFF_MULTICAST)
-#else
-#define IFF_CANTCHANGE  (IFF_BROADCAST | IFF_POINTOPOINT | IFF_RUNNING)
-#endif
-
-#ifdef TCPIPV4
+            IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI)
+#endif
+
 /* packet tracing extension */
 #define IFFE_PKTTRACE   0x00000001      /* trace datalink where possible */
 #define IFFE_IPTRACE    0x00000002      /* trace ONLY IP packets */
 
+
+
+
 struct pkt_trace_hdr {
         u_short         pt_htype;       /* header type */
-#define         HT_IP           0x01    /*      IP */
-#define         HT_ETHER        0x06    /*      Ethernet */
-#define         HT_ISO88023     0x07    /*      CSMA CD */
-#define         HT_ISO88025     0x09    /*      Token Ring */
-#define         HT_SLIP         0x1c    /*      Serial Line IP */
-#define         HT_PPP          0x18    /*      PPP IP */
         u_short         pt_len;         /* in: pt_buf len, out: packet len */
         caddr_t         pt_data;        /* packet ATTN: This is a _Seg16 addr! */
         u_long          pt_tstamp;      /* time stamp in milliseconds */
 };
-
-#endif /* TCP/IP V4 */
-
+#ifndef TCPV40HDRS
+#pragma pack()
+#endif
+#define HT_IP           0x01 /* IP */
+#define HT_ETHER        0x06 /* Ethernet */
+#define HT_ISO88023     0x07 /* CSMA CD */
+#define HT_ISO88025     0x09 /* Token Ring */
+#define HT_SLIP         0x1c /* Serial Line IP */
+#define HT_PPP          0x18 /* PPP IP */
+
+#ifndef TCPV40HDRS
+/* genric interface information */
+#pragma pack(1)
+struct  if_data {
+                u_char  ifi_type;       /* ethernet, tokenring, etc */
+                u_char  ifi_addrlen;    /* media address length */
+                u_char  ifi_hdrlen;     /* media header length */
+                u_long  ifi_mtu;        /* maximum transmission unit */
+                u_long  ifi_metric;     /* routing metric (external only) */
+                u_long  ifi_baudrate;   /* linespeed */
+                                        /* volatile statistics */
+                u_long  ifi_collisions; /* collisions on csma interfaces */
+                u_long  ifi_ibytes;     /* total number of octets received */
+                u_long  ifi_obytes;     /* total number of octets sent */
+                u_long  ifi_oqdrops;    /* dropped on output, this interface */
+                u_long  ifi_iqdrops;    /* dropped on input, this interface */
+                u_long  ifi_ierrors;    /* input errors on interface */
+                u_long  ifi_oerrors;    /* output errors on interface */
+                u_long  ifi_noproto;    /* destined for unsupported protocol */
+                u_long  ifi_ipackets;   /* packets received on interface */
+                u_long  ifi_opackets;   /* packets sent on interface */
+                u_long  ifi_imcasts;    /* packets received via multicast */
+                u_long  ifi_omcasts;    /* packets sent via multicast */
+                short   ifi_OperStatus; /* SNMP Oper Status */
+                struct  timeval ifi_lastchange;/* last updated */
+                u_char  ifi_descr[45];  /* description of the interface */
+};
+#pragma pack()
+
+/*
+ * Message format for use in obtaining information about interfaces
+ * from getkerninfo and the routing socket
+ */
+#pragma pack(1)
+struct if_msghdr {
+        u_short ifm_msglen;     /* to skip over non-understood messages */
+        u_char  ifm_version;    /* future binary compatability */
+        u_char  ifm_type;       /* message type */
+        int     ifm_addrs;      /* like rtm_addrs */
+        int     ifm_flags;      /* value of if_flags */
+        u_short ifm_index;      /* index for associated ifp */
+        struct  if_data ifm_data;/* statistics and other data about if */
+};
+#pragma pack()
+
+/*
+ * Message format for use in obtaining information about interface addresses
+ * from getkerninfo and the routing socket
+ */
+#pragma pack(1)
+struct ifa_msghdr {
+        u_short ifam_msglen;    /* to skip over non-understood messages */
+        u_char  ifam_version;   /* future binary compatability */
+        u_char  ifam_type;      /* message type */
+        int     ifam_addrs;     /* like rtm_addrs */
+        int     ifam_flags;     /* value of ifa_flags */
+        u_short ifam_index;     /* index for associated ifp */
+        int     ifam_metric;    /* value of ifa_metric */
+};
+#pragma pack()
+#endif /*!TCPV40HDRS*/
+
+#ifdef TCPV40HDRS
 /*
  * Output queues (ifp->if_snd) and internetwork datagram level (pup level 1)
@@ -284 +370 @@
         (ifq)->ifq_len++;\
 }
-#define IF_DEQUEUE(ifq, m) {\
-        (m)=(ifq)->ifq_head;\
-        if (m) {\
-                if (((ifq)->ifq_head=(m)->m_act)==0)\
-                        (ifq)->ifq_tail=0;\
-                (m)->m_act=0;\
-                (ifq)->ifq_len--;\
-        }\
-}
+/*
+ * Packets destined for level-1 protocol input routines
+ * have a pointer to the receiving interface prepended to the data.
+ * IF_DEQUEUEIF extracts and returns this pointer when dequeueing the packet.
+ * IF_ADJ should be used otherwise to adjust for its presence.
+ */
 #define IF_ADJ(m) {\
         (m)->m_off+=sizeof(struct ifnet*);\
@@ -313 +396 @@
         }\
 }
+
+
+
+
+
+
+
+
+
 
 #define IFQ_MAXLEN      50
@@ -334 +426 @@
         struct ifaddr   *ifa_next;              /* next address for interface */
 };
+
 
 /*
@@ -341 +434 @@
  * remainder may be interface specific.
  */
+
+
+
 struct  ifreq {
 #define IFNAMSIZ        16
@@ -358 +454 @@
 #define ifr_metric      ifr_ifru.ifru_metric    /* metric */
 #define ifr_data        ifr_ifru.ifru_data      /* for use by interface */
-};
+#ifndef TCPV40HDRS
+#define ifr_eflags      ifr_ifru.ifru_data      /* Extended flags */
+#endif
+};
+#ifndef TCPV40HDRS
+#pragma pack()
+#endif
+
+#ifndef TCPV40HDRS
+#pragma pack(1)
+struct ifaliasreq {
+  char    ifra_name[IFNAMSIZ];            /* if name, e.g. "en0" */
+  struct  sockaddr ifra_addr;
+  struct  sockaddr ifra_broadaddr;
+  struct  sockaddr ifra_mask;
+};
+#pragma pack()
+#endif
 
 /*
@@ -366 +479 @@
  * must know all networks accessible).
  */
+
+
+
 struct  ifconf {
         int     ifc_len;                /* size of associated buffer */
@@ -375 +491 @@
 #define ifc_req ifc_ifcu.ifcu_req       /* array of structures returned */
 };
+
+
+
 
 #include <net/if_arp.h>
@@ -382 +501 @@
 #endif
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif /* _NET_IF_H_ */

trunk/src/emx/include/net/if_arp.h

@@ -1 +1 @@
 /* Modified for emx by hv 1994,1996
+
  *
  * Copyright (c) 1986 Regents of the University of California.
@@ -49 +50 @@
  * specified.  Field names used correspond to RFC 826.
  */
+
+
+
 struct  arphdr {
         u_short ar_hrd;         /* format of hardware address */
 #define ARPHRD_ETHER    1       /* ethernet hardware address */
 #define ARPHRD_802      6       /* 802 net hardware address */
+
+
+
         u_short ar_pro;         /* format of protocol address */
         u_char  ar_hln;         /* length of hardware address */
@@ -59 +66 @@
 #define ARPOP_REQUEST   1       /* request to resolve address */
 #define ARPOP_REPLY     2       /* response to previous request */
+
+
+
+
+
+
+
 #define REVARP_REQUEST  3       /* reverse ARP request (not IBM) */
 #define REVARP_REPLY    4       /* reverse ARP reply (not IBM) */
+
 /*
  * The remaining fields are variable in size,
@@ -70 +85 @@
 /*      u_char  ar_tpa[];        * target protocol address */
 };
+
+
+
 
 /*
  * ARP ioctl request
  */
+
+
+
 struct arpreq {
         struct  sockaddr arp_pa;                /* protocol address */
@@ -79 +100 @@
         int     arp_flags;                      /* flags */
 };
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*  arp_flags and at_flags field values */
 #define ATF_INUSE       0x01    /* entry in use */
@@ -85 +125 @@
 #define ATF_PUBL        0x08    /* publish entry (respond for other host) */
 #define ATF_USETRAILERS 0x10    /* has requested trailers */
+
+
+
 
 #endif /* !_NET_IF_ARP_H_ */

trunk/src/emx/include/net/route.h

@@ -1 +1 @@
 /* Modified for emx by hv and em 1994,1996
- * 
+ * Modified for gcc/os2 by bird 2003
+ *
  * Copyright (c) 1980, 1986 Regents of the University of California.
  * All rights reserved.
@@ -47 +48 @@
 /*
  * Kernel resident routing tables.
- * 
+ *
  * The routing tables are initialized when interface addresses
  * are set by making entries for all directly connected interfaces.
@@ -62 +63 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*
  * rmx_rtt and rmx_rttvar are stored as microseconds;
@@ -69 +90 @@
 #define RTM_RTTUNIT     1000000 /* units for rtt, rttvar, as units per sec */
 #define RTTTOPRHZ(r)    ((r) / (RTM_RTTUNIT / PR_SLOWHZ))
+
+
 
 /*
@@ -80 +103 @@
  * Following structure necessary for 4.3 compatibility;
  */
-struct rtentry {
+#pragma pack(1)
+#ifdef TCPV40HDRS
+struct rtentry
+#else
+struct ortentry
+#endif
+{
         u_long  rt_hash;                /* to speed lookups */
         struct  sockaddr rt_dst;        /* key */
@@ -90 +119 @@
         long metric1,metric2,metric3,metric4; /*IBM special */
 };
-
-#define RTF_UP          0x1             /* route useable */
+#pragma pack()
+
+/* IBM: hv: I think this is the internal structure of the RT table of the
+ * router daemon. Don't think it belongs here, but the toolkit has it as well
+ */
+#define RTENTRY_COUNT   512
+#pragma pack(1)
+struct rtentries {
+        short   hostcount;
+        short   netcount;
+        #ifdef TCPV40HDRS
+        struct rtentry  rttable[RTENTRY_COUNT];
+        #else
+        struct ortentry rttable[RTENTRY_COUNT];
+        #endif
+};
+#pragma pack()
+
+
+#define RTF_UP          0x1             /* route usable */
 #define RTF_GATEWAY     0x2             /* destination is a gateway */
 #define RTF_HOST        0x4             /* host entry (net otherwise) */
@@ -104 +151 @@
 #define RTF_STATIC      0x800           /* route manually added */
 #define RTF_BLACKHOLE   0x1000          /* discard packets during updates */
+
+
+
 #define RTF_PROTO2      0x4000          /* protocol specific routing flag */
 #define RTF_PROTO1      0x8000          /* protocol specific routing flag */
+
+
+
+
+
+
+
+
+
+
 
 
@@ -118 +178 @@
         short   rts_wildcard;           /* lookups satisfied by a wildcard */
 };
+
 /*
  * Structures for routing messages.
  */
-#ifndef __EMX__
+#
 struct rt_msghdr {
-        u_short rtm_msglen;     /* to skip over non-understood messages */
-        u_char  rtm_version;    /* future binary compatability */
-        u_char  rtm_type;       /* message type */
-        u_short rtm_index;      /* index for associated ifp */
-        pid_t   rtm_pid;        /* identify sender */
-        int     rtm_addrs;      /* bitmask identifying sockaddrs in msg */
-        int     rtm_seq;        /* for sender to identify action */
-        int     rtm_errno;      /* why failed */
-        int     rtm_flags;      /* flags, incl. kern & message, e.g. DONE */
-        int     rtm_use;        /* from rtentry */
-        u_long  rtm_inits;      /* which metrics we are initializing */
-        struct  rt_metrics rtm_rmx; /* metrics themselves */
+#define IFNAMSIZ        16
+        u_short rtm_msglen;     /* to skip over non-understood messages */
+        u_char  rtm_version;    /* future binary compatibility */
+        u_char  rtm_type;       /* message type */
+        u_short rtm_index;      /* index for associated ifp */
+        short   rtm_unit;       /* new field for subnet routing */
+        int     rtm_flags;      /* flags, incl. kern & message, e.g. DONE */
+        int     rtm_addrs;      /* bitmask identifying sockaddrs in msg */
+        pid_t   rtm_pid;        /* identify sender */
+        int     rtm_seq;        /* for sender to identify action */
+        int     rtm_errno;      /* why failed */
+        int     rtm_use;        /* from rtentry */
+        u_long  rtm_inits;      /* which metrics we are initializing */
+        u_long  rtm_netmask;    /* new field for subnet routing */
+        char    rtm_name[IFNAMSIZ]; /* new field for subnet routing */
+        struct  rt_metrics rtm_rmx; /* metrics themselves */
+};
+#pragma pack()
+
+#define RTM_VERSION     4       /* Up the ante and ignore older versions */
+
+#define RTM_ADD         0x1     /* Add Route */
+#define RTM_DELETE      0x2     /* Delete Route */
+#define RTM_CHANGE      0x3     /* Change Metrics or flags */
+#define RTM_GET         0x4     /* Report Metrics */
+#define RTM_LOSING      0x5     /* Kernel Suspects Partitioning */
+#define RTM_REDIRECT    0x6     /* Told to use different route */
+#define RTM_MISS        0x7     /* Lookup failed on this address */
+#define RTM_LOCK        0x8     /* fix specified metrics */
+#define RTM_OLDADD      0x9     /* caused by SIOCADDRT */
+#define RTM_OLDDEL      0xa     /* caused by SIOCDELRT */
+#define RTM_RESOLVE     0xb     /* req to resolve dst to LL addr */
+#define RTM_NEWADDR     0xc     /* address being added to iface */
+#define RTM_DELADDR     0xd     /* address being removed from iface */
+#define RTM_IFINFO      0xe     /* iface going up/down etc. */
+
+#define RTV_MTU         0x1     /* init or lock _mtu */
+#define RTV_HOPCOUNT    0x2     /* init or lock _hopcount */
+#define RTV_EXPIRE      0x4     /* init or lock _hopcount */
+#define RTV_RPIPE       0x8     /* init or lock _recvpipe */
+#define RTV_SPIPE       0x10    /* init or lock _sendpipe */
+#define RTV_SSTHRESH    0x20    /* init or lock _ssthresh */
+#define RTV_RTT         0x40    /* init or lock _rtt */
+#define RTV_RTTVAR      0x80    /* init or lock _rttvar */
+
+/*
+ * Bitmask values for rtm_addr.
+ */
+#define RTA_DST         0x1     /* destination sockaddr present */
+#define RTA_GATEWAY     0x2     /* gateway sockaddr present */
+#define RTA_NETMASK     0x4     /* netmask sockaddr present */
+#define RTA_GENMASK     0x8     /* cloning mask sockaddr present */
+#define RTA_IFP         0x10    /* interface name sockaddr present */
+#define RTA_IFA         0x20    /* interface addr sockaddr present */
+#define RTA_AUTHOR      0x40    /* sockaddr for author of redirect */
+#define RTA_BRD         0x80    /* for NEWADDR, broadcast or p-p dest addr */
+
+/*
+ * Index offsets for sockaddr array for alternate internal encoding.
+ */
+#define RTAX_DST        0       /* destination sockaddr present */
+#define RTAX_GATEWAY    1       /* gateway sockaddr present */
+#define RTAX_NETMASK    2       /* netmask sockaddr present */
+#define RTAX_GENMASK    3       /* cloning mask sockaddr present */
+#define RTAX_IFP        4       /* interface name sockaddr present */
+#define RTAX_IFA        5       /* interface addr sockaddr present */
+#define RTAX_AUTHOR     6       /* sockaddr for author of redirect */
+#define RTAX_BRD        7       /* for NEWADDR, broadcast or p-p dest addr */
+#define RTAX_MAX        8       /* size of array to allocate */
+
+struct rt_addrinfo {
+        int     rti_addrs;
+        struct  sockaddr *rti_info[RTAX_MAX];
 };
 
 struct route_cb {
-        int     ip_count;
-        int     ns_count;
-        int     iso_count;
-        int     any_count;
-};
-#define RTM_VERSION     2       /* Up the ante and ignore older versions */
-
-#define RTM_ADD         0x1     /* Add Route */
-#define RTM_DELETE      0x2     /* Delete Route */
-#define RTM_CHANGE      0x3     /* Change Metrics or flags */
-#define RTM_GET         0x4     /* Report Metrics */
-#define RTM_LOSING      0x5     /* Kernel Suspects Partitioning */
-#define RTM_REDIRECT    0x6     /* Told to use different route */
-#define RTM_MISS        0x7     /* Lookup failed on this address */
-#define RTM_LOCK        0x8     /* fix specified metrics */
-#define RTM_OLDADD      0x9     /* caused by SIOCADDRT */
-#define RTM_OLDDEL      0xa     /* caused by SIOCDELRT */
-#define RTM_RESOLVE     0xb     /* req to resolve dst to LL addr */
-
-#define RTV_MTU         0x1     /* init or lock _mtu */
-#define RTV_HOPCOUNT    0x2     /* init or lock _hopcount */
-#define RTV_EXPIRE      0x4     /* init or lock _hopcount */
-#define RTV_RPIPE       0x8     /* init or lock _recvpipe */
-#define RTV_SPIPE       0x10    /* init or lock _sendpipe */
-#define RTV_SSTHRESH    0x20    /* init or lock _ssthresh */
-#define RTV_RTT         0x40    /* init or lock _rtt */
-#define RTV_RTTVAR      0x80    /* init or lock _rttvar */
-
-#define RTA_DST         0x1     /* destination sockaddr present */
-#define RTA_GATEWAY     0x2     /* gateway sockaddr present */
-#define RTA_NETMASK     0x4     /* netmask sockaddr present */
-#define RTA_GENMASK     0x8     /* cloning mask sockaddr present */
-#define RTA_IFP         0x10    /* interface name sockaddr present */
-#define RTA_IFA         0x20    /* interface addr sockaddr present */
-#define RTA_AUTHOR      0x40    /* sockaddr for author of redirect */
-#endif
-
-/* IBM: hv: I think this is the internal structure of the RT table of the
- * router daemon. Don't think it belongs here, but the toolkit has it as well
- */
-#define RTENTRY_COUNT   512
-struct rtentries {
-        short   hostcount;
-        short   netcount;
-        struct rtentry rttable[RTENTRY_COUNT];
-};
+        int     ip_count;
+        int     ns_count;
+        int     iso_count;
+        int     any_count;
+};
+#endif /* !TCPV40HDRS */
 
 #if defined (__cplusplus)