Changeset 1550

Timestamp:

Oct 9, 2004, 10:39:47 AM (21 years ago)

Author:

bird

Message:

Updated to FreeBSD 5.2 level.

File:

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

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

@@ -1 @@
-/* Modified for emx by hv 1994
- * Modified for gcc/os2 by bird 2003
- *
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.
+/** $Id$ */
+/** @file
+ * FreeBSD 5.2
+ * @changed bird (2003): modified for gcc/os2
+ * @changed bird (2004): updated to FreeBSD 5.2 and __USE_LIBC_TCPIP
+ */
+
+/*
+ * Copyright (c) 1982, 1986, 1993
+ *      The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13 +18 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
@@ -33 +34 @@
  * SUCH DAMAGE.
  *
- *      from: @(#)ip_icmp.h     7.5 (Berkeley) 6/28/90
- *      $Id$
+ *      
+ *$
  */
 
@@ -44 +45 @@
  * Per RFC 792, September 1981.
  */
+
+
+
+
+
+
+
+
+
+
 
 /*
@@ -61 +72 @@
                 } ih_idseq;
                 int ih_void;
-#ifndef TCPV40HDRS
-
+
+#if !defined(TCPV40HDRS) || defined(__USE_LIBC_TCPIP)
                 /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
                 struct ih_pmtu {
@@ -68 +79 @@
                         n_short ipm_nextmtu;
                 } ih_pmtu;
+
+
+
+
+
+
+
+
 #endif
         } icmp_hun;
@@ -75 +94 @@
 #define icmp_seq        icmp_hun.ih_idseq.icd_seq
 #define icmp_void       icmp_hun.ih_void
-#ifndef TCPV40HDRS
+#if
 #define icmp_pmvoid     icmp_hun.ih_pmtu.ipm_void
 #define icmp_nextmtu    icmp_hun.ih_pmtu.ipm_nextmtu
+
+
+
+
+
 #endif
         union {
-                struct id_ts {
-                        n_time its_otime;
-                        n_time its_rtime;
-                        n_time its_ttime;
+                struct id_ts {
+                        n_time its_otime;
+                        n_time its_rtime;
+                        n_time its_ttime;
                 } id_ts;
                 struct id_ip  {
@@ -89 +113 @@
                         /* options and then 64 bits of data */
                 } id_ip;
+
+
+
+
                 u_long  id_mask;
+
                 char    id_data[1];
         } icmp_dun;
@@ -96 +125 @@
 #define icmp_ttime      icmp_dun.id_ts.its_ttime
 #define icmp_ip         icmp_dun.id_ip.idi_ip
+
+
+
 #define icmp_mask       icmp_dun.id_mask
 #define icmp_data       icmp_dun.id_data
@@ -104 +136 @@
  * Lower bounds on packet lengths for various types.
  * For the error advice packets must first insure that the
- * packet is large enought to contain the returned ip header.
+ * packet is large enough to contain the returned ip header.
  * Only then can we do the check to see if 64 bits of packet
  * data have been returned, since we need to check the returned
@@ -127 +159 @@
 #define         ICMP_UNREACH_NEEDFRAG   4               /* IP_DF caused drop */
 #define         ICMP_UNREACH_SRCFAIL    5               /* src route failed */
-#ifndef TCPV40HDRS
+#if
 #define         ICMP_UNREACH_NET_UNKNOWN 6              /* unknown net */
 #define         ICMP_UNREACH_HOST_UNKNOWN 7             /* unknown host */
@@ -135 +167 @@
 #define         ICMP_UNREACH_TOSNET     11              /* bad tos for net */
 #define         ICMP_UNREACH_TOSHOST    12              /* bad tos for host */
+
+
+
+
+
 #endif
 #define ICMP_SOURCEQUENCH       4               /* packet lost, slow down */
@@ -142 +179 @@
 #define         ICMP_REDIRECT_TOSNET    2               /* for tos and net */
 #define         ICMP_REDIRECT_TOSHOST   3               /* for tos and host */
+
+
+
 #define ICMP_ECHO               8               /* echo service */
-#ifndef TCPV40HDRS
+#if
 #define ICMP_ROUTERADVERT       9               /* router advertisement */
+
+
+
+
 #define ICMP_ROUTERSOLICIT      10              /* router solicitation */
 #endif
@@ -151 +195 @@
 #define         ICMP_TIMXCEED_REASS     1               /* ttl==0 in reass */
 #define ICMP_PARAMPROB          12              /* ip header bad */
-#ifndef TCPV40HDRS
+#if !defined(TCPV40HDRS) || defined(__USE_LIBC_TCPIP)
+#ifdef __USE_LIBC_TCPIP
+#define         ICMP_PARAMPROB_ERRATPTR 0               /* error at param ptr */
+#endif
 #define         ICMP_PARAMPROB_OPTABSENT 1              /* req. opt. absent */
+
+
+
 #endif
 #define ICMP_TSTAMP             13              /* timestamp request */
@@ -160 +210 @@
 #define ICMP_MASKREQ            17              /* address mask request */
 #define ICMP_MASKREPLY          18              /* address mask reply */
-
+#ifdef __USE_LIBC_TCPIP
+#define ICMP_TRACEROUTE         30              /* traceroute */
+#define ICMP_DATACONVERR        31              /* data conversion error */
+#define ICMP_MOBILE_REDIRECT    32              /* mobile host redirect */
+#define ICMP_IPV6_WHEREAREYOU   33              /* IPv6 where-are-you */
+#define ICMP_IPV6_IAMHERE       34              /* IPv6 i-am-here */
+#define ICMP_MOBILE_REGREQUEST  35              /* mobile registration req */
+#define ICMP_MOBILE_REGREPLY    36              /* mobile registration reply */
+#define ICMP_SKIP               39              /* SKIP */
+#define ICMP_PHOTURIS           40              /* Photuris */
+#define         ICMP_PHOTURIS_UNKNOWN_INDEX     1       /* unknown sec index */
+#define         ICMP_PHOTURIS_AUTH_FAILED       2       /* auth failed */
+#define         ICMP_PHOTURIS_DECRYPT_FAILED    3       /* decrypt failed */
+#endif
+
+#ifdef __USE_LIBC_TCPIP
+#define ICMP_MAXTYPE            40
+#else
 #define ICMP_MAXTYPE            18
-
-#ifdef TCPV40HDRS
-#define ICMP_INFOTYPE(type) \
-        ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-        (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-        (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-        (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
-#else
+#endif
+
+#ifndef TCPV40HDRS
 #define ICMP_INFOTYPE(type) \
         ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
@@ -176 +238 @@
         (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
         (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
+
+
+
+
+
+
+
+
+
+
+
 #endif