diff options
| -rw-r--r-- | sys/netinet/in.h | 15 | ||||
| -rw-r--r-- | sys/netinet6/in6.h | 21 |
2 files changed, 10 insertions, 26 deletions
diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 24b3bb70f65..2855c5246d1 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in.h,v 1.16 1999/01/07 06:13:34 deraadt Exp $ */ +/* $OpenBSD: in.h,v 1.17 1999/01/10 02:37:33 deraadt Exp $ */ /* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */ /* @@ -48,26 +48,31 @@ * Protocols */ #define IPPROTO_IP 0 /* dummy for IP */ +#define IPPROTO_HOPOPTS IPPROTO_IP /* Hop-by-hop option header. */ #define IPPROTO_ICMP 1 /* control message protocol */ #define IPPROTO_IGMP 2 /* group mgmt protocol */ #define IPPROTO_GGP 3 /* gateway^2 (deprecated) */ #define IPPROTO_IPIP 4 /* IP inside IP */ -#define IPPROTO_IPV4 4 /* IP inside IP */ +#define IPPROTO_IPV4 IPPROTO_IPIP /* IP inside IP */ #define IPPROTO_TCP 6 /* tcp */ #define IPPROTO_EGP 8 /* exterior gateway protocol */ #define IPPROTO_PUP 12 /* pup */ #define IPPROTO_UDP 17 /* user datagram protocol */ #define IPPROTO_IDP 22 /* xns idp */ #define IPPROTO_TP 29 /* tp-4 w/ class negotiation */ -#define IPPROTO_IPV6 51 /* IPv6-in-IPv4 tunnelling */ +#define IPPROTO_IPV6 41 /* IPv6 in IPv6 */ +#define IPPROTO_ROUTING 43 /* Routing header. */ +#define IPPROTO_FRAGMENT 44 /* Fragmentation/reassembly header. */ #define IPPROTO_ESP 50 /* Encap. Security Payload */ #define IPPROTO_AH 51 /* Authentication header */ +#define IPPROTO_ICMPV6 58 /* ICMP for IPv6 */ +#define IPPROTO_NONE 59 /* No next header */ +#define IPPROTO_DSTOPTS 60 /* Destination options header. */ #define IPPROTO_EON 80 /* ISO cnlp */ #define IPPROTO_ENCAP 98 /* encapsulation header */ - #define IPPROTO_RAW 255 /* raw IP packet */ -#define IPPROTO_MAX 256 +#define IPPROTO_MAX 256 /* * From FreeBSD: diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 59bada0f90a..c4149883ce3 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -20,27 +20,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. #include <sys/param.h> #endif /* __bsdi__ && !defined(_BSDI_VERSION) */ -/* - * Next header types (called Protocols in netinet/in.h). - */ - -#define IPPROTO_HOPOPTS 0 /* Hop-by-hop option header. */ -#define IPPROTO_IPV4 4 /* IPv4 in IPv6 (?!?) */ -/* BAD PLACE #define IPPROTO_IPV6 41 IPv6 in IPv6 */ -#define IPPROTO_ROUTING 43 /* Routing header. */ -#define IPPROTO_FRAGMENT 44 /* Fragmentation/reassembly header. */ -#define IPPROTO_ESP 50 /* Encapsulating security payload. */ -#define IPPROTO_AH 51 /* Authentication header. */ -#define IPPROTO_ICMPV6 58 /* ICMP for IPv6 */ -#define IPPROTO_NONE 59 /* No next header */ -#define IPPROTO_DSTOPTS 60 /* Destination options header. */ - -/* - * Following are TBD, and subject to change rapidly - */ -#define IPPROTO_RAW 255 /* Payload of unknown type? */ -#define IPPROTO_MAX 256 /* Upper bound for next header type. */ - /* IPPROTO type macros. */ #define IS_PREFRAG(x) ( (x)==IPPROTO_HOPOPTS || (x)==IPPROTO_ROUTING || \ |