summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/netinet/icmp6.h26
-rw-r--r--sys/netinet/ip.h10
-rw-r--r--sys/netinet/ip6.h20
-rw-r--r--sys/netinet/ip_carp.h6
-rw-r--r--sys/netinet/ip_ipsp.h6
-rw-r--r--sys/netinet/pim.h14
-rw-r--r--sys/netinet/tcp.h6
7 files changed, 44 insertions, 44 deletions
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 7da34699708..999997c4cb2 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.h,v 1.30 2006/03/07 09:21:55 jmc Exp $ */
+/* $OpenBSD: icmp6.h,v 1.31 2006/04/27 02:19:32 tedu Exp $ */
/* $KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $ */
/*
@@ -246,12 +246,12 @@ struct nd_neighbor_advert { /* neighbor advertisement */
#define nd_na_code nd_na_hdr.icmp6_code
#define nd_na_cksum nd_na_hdr.icmp6_cksum
#define nd_na_flags_reserved nd_na_hdr.icmp6_data32[0]
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define ND_NA_FLAG_ROUTER 0x80000000
#define ND_NA_FLAG_SOLICITED 0x40000000
#define ND_NA_FLAG_OVERRIDE 0x20000000
#else
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
#define ND_NA_FLAG_ROUTER 0x80
#define ND_NA_FLAG_SOLICITED 0x40
#define ND_NA_FLAG_OVERRIDE 0x20
@@ -348,23 +348,23 @@ struct icmp6_nodeinfo {
#define NI_QTYPE_NODEADDR 3 /* Node Addresses */
#define NI_QTYPE_IPV4ADDR 4 /* IPv4 Addresses */
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define NI_SUPTYPE_FLAG_COMPRESS 0x1
#define NI_FQDN_FLAG_VALIDTTL 0x1
-#elif BYTE_ORDER == LITTLE_ENDIAN
+#elif _BYTE_ORDER == _LITTLE_ENDIAN
#define NI_SUPTYPE_FLAG_COMPRESS 0x0100
#define NI_FQDN_FLAG_VALIDTTL 0x0100
#endif
#ifdef NAME_LOOKUPS_04
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define NI_NODEADDR_FLAG_LINKLOCAL 0x1
#define NI_NODEADDR_FLAG_SITELOCAL 0x2
#define NI_NODEADDR_FLAG_GLOBAL 0x4
#define NI_NODEADDR_FLAG_ALL 0x8
#define NI_NODEADDR_FLAG_TRUNCATE 0x10
#define NI_NODEADDR_FLAG_ANYCAST 0x20 /* just experimental. not in spec */
-#elif BYTE_ORDER == LITTLE_ENDIAN
+#elif _BYTE_ORDER == _LITTLE_ENDIAN
#define NI_NODEADDR_FLAG_LINKLOCAL 0x0100
#define NI_NODEADDR_FLAG_SITELOCAL 0x0200
#define NI_NODEADDR_FLAG_GLOBAL 0x0400
@@ -373,7 +373,7 @@ struct icmp6_nodeinfo {
#define NI_NODEADDR_FLAG_ANYCAST 0x2000 /* just experimental. not in spec */
#endif
#else /* draft-ietf-ipngwg-icmp-name-lookups-05 (and later?) */
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define NI_NODEADDR_FLAG_TRUNCATE 0x1
#define NI_NODEADDR_FLAG_ALL 0x2
#define NI_NODEADDR_FLAG_COMPAT 0x4
@@ -381,7 +381,7 @@ struct icmp6_nodeinfo {
#define NI_NODEADDR_FLAG_SITELOCAL 0x10
#define NI_NODEADDR_FLAG_GLOBAL 0x20
#define NI_NODEADDR_FLAG_ANYCAST 0x40 /* just experimental. not in spec */
-#elif BYTE_ORDER == LITTLE_ENDIAN
+#elif _BYTE_ORDER == _LITTLE_ENDIAN
#define NI_NODEADDR_FLAG_TRUNCATE 0x0100
#define NI_NODEADDR_FLAG_ALL 0x0200
#define NI_NODEADDR_FLAG_COMPAT 0x0400
@@ -449,10 +449,10 @@ struct rr_pco_use { /* use prefix part */
#define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK 0x80
#define ICMP6_RR_PCOUSE_RAFLAGS_AUTO 0x40
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME 0x80000000
#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME 0x40000000
-#elif BYTE_ORDER == LITTLE_ENDIAN
+#elif _BYTE_ORDER == _LITTLE_ENDIAN
#define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME 0x80
#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME 0x40
#endif
@@ -464,10 +464,10 @@ struct rr_result { /* router renumbering result message */
u_int32_t rrr_ifid;
struct in6_addr rrr_prefix;
} __packed;
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define ICMP6_RR_RESULT_FLAGS_OOB 0x0002
#define ICMP6_RR_RESULT_FLAGS_FORBIDDEN 0x0001
-#elif BYTE_ORDER == LITTLE_ENDIAN
+#elif _BYTE_ORDER == _LITTLE_ENDIAN
#define ICMP6_RR_RESULT_FLAGS_OOB 0x0200
#define ICMP6_RR_RESULT_FLAGS_FORBIDDEN 0x0100
#endif
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 2d50aea2419..3f67040374b 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip.h,v 1.11 2005/12/10 01:30:14 deraadt Exp $ */
+/* $OpenBSD: ip.h,v 1.12 2006/04/27 02:19:32 tedu Exp $ */
/* $NetBSD: ip.h,v 1.9 1995/05/15 01:22:44 cgd Exp $ */
/*
@@ -45,11 +45,11 @@
* Structure of an internet header, naked of options.
*/
struct ip {
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_int ip_hl:4, /* header length */
ip_v:4; /* version */
#endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
u_int ip_v:4, /* version */
ip_hl:4; /* header length */
#endif
@@ -141,11 +141,11 @@ struct ip_timestamp {
u_int8_t ipt_code; /* IPOPT_TS */
u_int8_t ipt_len; /* size of structure (variable) */
u_int8_t ipt_ptr; /* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_int ipt_flg:4, /* flags, see below */
ipt_oflw:4; /* overflow counter */
#endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
u_int ipt_oflw:4, /* overflow counter */
ipt_flg:4; /* flags, see below */
#endif
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 5ef86fe00b8..30577a8b662 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6.h,v 1.16 2004/07/09 09:14:12 itojun Exp $ */
+/* $OpenBSD: ip6.h,v 1.17 2006/04/27 02:19:32 tedu Exp $ */
/* $KAME: ip6.h,v 1.45 2003/06/05 04:46:38 keiichi Exp $ */
/*
@@ -93,14 +93,14 @@ struct ip6_hdr {
#define IPV6_VERSION 0x60
#define IPV6_VERSION_MASK 0xf0
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define IPV6_FLOWINFO_MASK 0x0fffffff /* flow info (28 bits) */
#define IPV6_FLOWLABEL_MASK 0x000fffff /* flow label (20 bits) */
#else
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
#define IPV6_FLOWINFO_MASK 0xffffff0f /* flow info (28 bits) */
#define IPV6_FLOWLABEL_MASK 0xffff0f00 /* flow label (20 bits) */
-#endif /* LITTLE_ENDIAN */
+#endif /* _LITTLE_ENDIAN */
#endif
#if 1
/* ECN bits proposed by Sally Floyd */
@@ -207,16 +207,16 @@ struct ip6_opt_router {
u_int8_t ip6or_value[2];
} __packed;
/* Router alert values (in network byte order) */
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define IP6_ALERT_MLD 0x0000
#define IP6_ALERT_RSVP 0x0001
#define IP6_ALERT_AN 0x0002
#else
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
#define IP6_ALERT_MLD 0x0000
#define IP6_ALERT_RSVP 0x0100
#define IP6_ALERT_AN 0x0200
-#endif /* LITTLE_ENDIAN */
+#endif /* _LITTLE_ENDIAN */
#endif
/* Routing header */
@@ -245,15 +245,15 @@ struct ip6_frag {
u_int32_t ip6f_ident; /* identification */
} __packed;
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
#define IP6F_OFF_MASK 0xfff8 /* mask out offset from _offlg */
#define IP6F_RESERVED_MASK 0x0006 /* reserved bits in ip6f_offlg */
#define IP6F_MORE_FRAG 0x0001 /* more-fragments flag */
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
+#else /* _BYTE_ORDER == _LITTLE_ENDIAN */
#define IP6F_OFF_MASK 0xf8ff /* mask out offset from _offlg */
#define IP6F_RESERVED_MASK 0x0600 /* reserved bits in ip6f_offlg */
#define IP6F_MORE_FRAG 0x0100 /* more-fragments flag */
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
/*
* Internet implementation parameters.
diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index 34c9f79020b..2ea0155941e 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.h,v 1.19 2005/12/10 01:30:14 deraadt Exp $ */
+/* $OpenBSD: ip_carp.h,v 1.20 2006/04/27 02:19:32 tedu Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -57,11 +57,11 @@
*/
struct carp_header {
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_int carp_type:4,
carp_version:4;
#endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
u_int carp_version:4,
carp_type:4;
#endif
diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h
index 2b0f8bb069a..9b35c4fc5b9 100644
--- a/sys/netinet/ip_ipsp.h
+++ b/sys/netinet/ip_ipsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.h,v 1.132 2006/01/13 10:11:23 mpf Exp $ */
+/* $OpenBSD: ip_ipsp.h,v 1.133 2006/04/27 02:19:32 tedu Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -414,7 +414,7 @@ struct ipsecinit {
#define IPSEC_ZEROES_SIZE 256 /* Larger than an IP6 extension hdr. */
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
static __inline u_int64_t
htonq(u_int64_t q)
{
@@ -427,7 +427,7 @@ htonq(u_int64_t q)
#define ntohq(_x) htonq(_x)
-#elif BYTE_ORDER == BIG_ENDIAN
+#elif _BYTE_ORDER == _BIG_ENDIAN
#define htonq(_x) (_x)
#define ntohq(_x) htonq(_x)
diff --git a/sys/netinet/pim.h b/sys/netinet/pim.h
index 03c5ea76a25..df5c1dca3ec 100644
--- a/sys/netinet/pim.h
+++ b/sys/netinet/pim.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pim.h,v 1.1 2005/01/14 14:51:28 mcbride Exp $ */
+/* $OpenBSD: pim.h,v 1.2 2006/04/27 02:19:32 tedu Exp $ */
/* $NetBSD: pim.h,v 1.1 2004/09/04 23:32:29 manu Exp $ */
/*
@@ -48,11 +48,11 @@
#include <sys/types.h>
#ifndef _PIM_VT
-#ifndef BYTE_ORDER
-# error BYTE_ORDER is not defined!
+#ifndef _BYTE_ORDER
+# error _BYTE_ORDER is not defined!
#endif
-#if (BYTE_ORDER != BIG_ENDIAN) && (BYTE_ORDER != LITTLE_ENDIAN)
-# error BYTE_ORDER must be defined to either BIG_ENDIAN or LITTLE_ENDIAN
+#if (_BYTE_ORDER != _BIG_ENDIAN) && (_BYTE_ORDER != _LITTLE_ENDIAN)
+# error _BYTE_ORDER must be defined to either _BIG_ENDIAN or _LITTLE_ENDIAN
#endif
#endif /* ! _PIM_VT */
@@ -63,11 +63,11 @@ struct pim {
#ifdef _PIM_VT
uint8_t pim_vt; /* PIM version and message type */
#else /* ! _PIM_VT */
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
u_int pim_vers:4, /* PIM protocol version */
pim_type:4; /* PIM message type */
#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_int pim_type:4, /* PIM message type */
pim_vers:4; /* PIM protocol version */
#endif
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index bc2f224928f..c6b22e70c3b 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp.h,v 1.16 2005/12/10 01:30:14 deraadt Exp $ */
+/* $OpenBSD: tcp.h,v 1.17 2006/04/27 02:19:32 tedu Exp $ */
/* $NetBSD: tcp.h,v 1.8 1995/04/17 05:32:58 cgd Exp $ */
/*
@@ -46,11 +46,11 @@ struct tcphdr {
u_int16_t th_dport; /* destination port */
tcp_seq th_seq; /* sequence number */
tcp_seq th_ack; /* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
u_int th_x2:4, /* (unused) */
th_off:4; /* data offset */
#endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
u_int th_off:4, /* data offset */
th_x2:4; /* (unused) */
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 13:00:19 +0000