diff options
Diffstat (limited to 'sys')
35 files changed, 240 insertions, 324 deletions
diff --git a/sys/alpha/include/endian.h b/sys/alpha/include/endian.h index 0ba53cd..d9e64c8 100644 --- a/sys/alpha/include/endian.h +++ b/sys/alpha/include/endian.h @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* From: NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp */ - -/* +/*- * Copyright (c) 1987, 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -34,10 +31,14 @@ * SUCH DAMAGE. * * @(#)endian.h 8.1 (Berkeley) 6/10/93 + * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ + * $FreeBSD$ */ -#ifndef _ENDIAN_H_ -#define _ENDIAN_H_ +#ifndef _MACHINE_ENDIAN_H_ +#define _MACHINE_ENDIAN_H_ + +#include <machine/ansi.h> /* * Define the order of 32-bit words in 64-bit words. @@ -45,52 +46,16 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ +#ifndef _POSIX_SOURCE #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ #define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ #define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ #define BYTE_ORDER LITTLE_ENDIAN - -#ifndef _KERNEL -#include <sys/cdefs.h> -#endif -#include <machine/ansi.h> - -__BEGIN_DECLS -__uint32_t htonl __P((__uint32_t)); -__uint16_t htons __P((__uint16_t)); -__uint32_t ntohl __P((__uint32_t)); -__uint16_t ntohs __P((__uint16_t)); -__uint16_t bswap16 __P((__uint16_t)); -__uint32_t bswap32 __P((__uint32_t)); -__uint64_t bswap64 __P((__uint64_t)); -__END_DECLS - -/* - * Macros for network/external number representation conversion. - */ -#if BYTE_ORDER == BIG_ENDIAN && !defined(lint) -#define ntohl(x) (x) -#define ntohs(x) (x) -#define htonl(x) (x) -#define htons(x) (x) - -#define NTOHL(x) (x) -#define NTOHS(x) (x) -#define HTONL(x) (x) -#define HTONS(x) (x) - -#else - -#define NTOHL(x) (x) = ntohl((__uint32_t)x) -#define NTOHS(x) (x) = ntohs((__uint16_t)x) -#define HTONL(x) (x) = htonl((__uint32_t)x) -#define HTONS(x) (x) = htons((__uint16_t)x) -#endif #endif /* !_POSIX_SOURCE */ -#endif /* !_ENDIAN_H_ */ + +#endif /* !_MACHINE_ENDIAN_H_ */ diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 7ac3195..550ef41 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -1991,7 +1991,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) bcd2bin(th->starting_track); th->ending_track = bcd2bin(th->ending_track); } - NTOHS(th->len); + th->len = ntohs(th->len); bcopy(th, addr, sizeof(*th)); free(th, M_TEMP); } diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h index be87af2..f22988b 100644 --- a/sys/i386/include/endian.h +++ b/sys/i386/include/endian.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1987, 1991 Regents of the University of California. * All rights reserved. * @@ -30,55 +30,37 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)endian.h 7.8 (Berkeley) 4/3/91 + * @(#)endian.h 7.8 (Berkeley) 4/3/91 * $FreeBSD$ */ #ifndef _MACHINE_ENDIAN_H_ #define _MACHINE_ENDIAN_H_ +#include <machine/ansi.h> + /* * Define the order of 32-bit words in 64-bit words. */ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE - /* * Definitions for byte order, according to byte significance from low * address to high. */ +#ifndef _POSIX_SOURCE #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ #define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ #define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ #define BYTE_ORDER LITTLE_ENDIAN - -#ifndef _KERNEL -#include <sys/cdefs.h> -#endif -#include <machine/ansi.h> - -__BEGIN_DECLS -__uint32_t htonl(__uint32_t); -__uint16_t htons(__uint16_t); -__uint32_t ntohl(__uint32_t); -__uint16_t ntohs(__uint16_t); -__END_DECLS +#endif /* ! _POSIX_SOURCE */ #ifdef __GNUC__ static __inline __uint32_t -__uint16_swap_uint32(__uint32_t __x) -{ - __asm ("rorl $16, %0" : "+r" (__x)); - - return __x; -} - -static __inline __uint32_t -__uint8_swap_uint32(__uint32_t __x) +__htonl(__uint32_t __x) { #if defined(_KERNEL) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)) && !defined(I386_CPU) __asm ("bswap %0" : "+r" (__x)); @@ -92,29 +74,27 @@ __uint8_swap_uint32(__uint32_t __x) } static __inline __uint16_t -__uint8_swap_uint16(__uint16_t __x) +__htons(__uint16_t __x) { __asm ("xchgb %h0, %b0" : "+q" (__x)); return __x; } -/* - * Macros for network/external number representation conversion. - */ -#define ntohl __uint8_swap_uint32 -#define ntohs __uint8_swap_uint16 -#define htonl __uint8_swap_uint32 -#define htons __uint8_swap_uint16 +static __inline __uint32_t +__ntohl(__uint32_t __x) +{ -#endif /* __GNUC__ */ + return (__htonl(__x)); +} -#define NTOHL(x) ((x) = ntohl(x)) -#define NTOHS(x) ((x) = ntohs(x)) -#define HTONL(x) ((x) = htonl(x)) -#define HTONS(x) ((x) = htons(x)) +static __inline __uint16_t +__ntohs(__uint16_t __x) +{ + return (__htons(__x)); +} -#endif /* ! _POSIX_SOURCE */ +#endif /* __GNUC__ */ #endif /* !_MACHINE_ENDIAN_H_ */ diff --git a/sys/ia64/include/endian.h b/sys/ia64/include/endian.h index b4b5a0b..bfc2381 100644 --- a/sys/ia64/include/endian.h +++ b/sys/ia64/include/endian.h @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* From: NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp */ - -/* +/*- * Copyright (c) 1987, 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -34,10 +31,14 @@ * SUCH DAMAGE. * * @(#)endian.h 8.1 (Berkeley) 6/10/93 + * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ + * $FreeBSD$ */ -#ifndef _ENDIAN_H_ -#define _ENDIAN_H_ +#ifndef _MACHINE_ENDIAN_H_ +#define _MACHINE_ENDIAN_H_ + +#include <sys/cdefs.h> /* * Define the order of 32-bit words in 64-bit words. @@ -45,44 +46,17 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ +#ifndef _POSIX_SOURCE #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ #define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ #define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ #define BYTE_ORDER LITTLE_ENDIAN - -#ifndef _KERNEL -#include <sys/cdefs.h> -#endif -#include <machine/ansi.h> - -__BEGIN_DECLS -__uint32_t htonl __P((__uint32_t)); -__uint16_t htons __P((__uint16_t)); -__uint32_t ntohl __P((__uint32_t)); -__uint16_t ntohs __P((__uint16_t)); -__END_DECLS - -/* - * Macros for network/external number representation conversion. - */ -#if BYTE_ORDER == BIG_ENDIAN && !defined(lint) -#define ntohl(x) (x) -#define ntohs(x) (x) -#define htonl(x) (x) -#define htons(x) (x) - -#define NTOHL(x) (x) -#define NTOHS(x) (x) -#define HTONL(x) (x) -#define HTONS(x) (x) - -#else +#endif /* !_POSIX_SOURCE */ #ifdef __GNUC__ @@ -96,31 +70,33 @@ __uint8_swap_uint64(__uint64_t __x) } static __inline __uint32_t -__uint8_swap_uint32(__uint32_t __x) +__htonl(__uint32_t __x) { - return __uint8_swap_uint64(__x) >> 32; + + return (__uint8_swap_uint64(__x) >> 32); } static __inline __uint16_t -__uint8_swap_uint16(__uint16_t __x) +__htons(__uint16_t __x) { - return __uint8_swap_uint64(__x) >> 48; + + return (__uint8_swap_uint64(__x) >> 48); } -/* - * Macros for network/external number representation conversion. - */ -#define ntohl __uint8_swap_uint32 -#define ntohs __uint8_swap_uint16 -#define htonl __uint8_swap_uint32 -#define htons __uint8_swap_uint16 - -#endif /* __GNUC__ */ - -#define NTOHL(x) (x) = ntohl((__uint32_t)x) -#define NTOHS(x) (x) = ntohs((__uint16_t)x) -#define HTONL(x) (x) = htonl((__uint32_t)x) -#define HTONS(x) (x) = htons((__uint16_t)x) -#endif -#endif /* !_POSIX_SOURCE */ -#endif /* !_ENDIAN_H_ */ +static __inline __uint32_t +__ntohl(__uint32_t __x) +{ + + return (__uint8_swap_uint64(__x) >> 32); +} + +static __inline __uint16_t +__ntohs(__uint16_t __x) +{ + + return (__uint8_swap_uint64(__x) >> 48); +} + +#endif /* __GNUC__ */ + +#endif /* !_MACHINE_ENDIAN_H_ */ diff --git a/sys/libkern/alpha/byte_swap_2.S b/sys/libkern/alpha/byte_swap_2.S index a9d70a9..8111918 100644 --- a/sys/libkern/alpha/byte_swap_2.S +++ b/sys/libkern/alpha/byte_swap_2.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#ifndef NAME -#define NAME byte_swap_2 +#if !defined(ALIAS) || !defined(NAME) +#error ALIAS or NAME not defined #endif /* @@ -39,6 +39,7 @@ * * Argument is an unsigned 2-byte integer (u_int16_t). */ +XLEAF(ALIAS, 1) LEAF(NAME, 1) /* a0 contains 0x0123 */ extbl a0, 0, t0 /* t0 = 0x 23 */ extbl a0, 1, t1 /* t1 = 0x 01 */ diff --git a/sys/libkern/alpha/byte_swap_4.S b/sys/libkern/alpha/byte_swap_4.S index 9f6df34..d31bbe8 100644 --- a/sys/libkern/alpha/byte_swap_4.S +++ b/sys/libkern/alpha/byte_swap_4.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#ifndef NAME -#define NAME byte_swap_4 +#if !defined(ALIAS) || !defined(NAME) +#error ALIAS or NAME not defined #endif /* @@ -39,6 +39,7 @@ * * Argument is an unsigned 4-byte integer (u_int32_t). */ +XLEAF(ALIAS, 1) LEAF(NAME, 1) /* a0 contains 0x01234567 */ extbl a0, 0, t0 /* t0 = 0x 67 */ extbl a0, 1, t1 /* t1 = 0x 45 */ diff --git a/sys/libkern/alpha/htonl.S b/sys/libkern/alpha/htonl.S index b5ebaa5..2604034 100644 --- a/sys/libkern/alpha/htonl.S +++ b/sys/libkern/alpha/htonl.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME htonl +#define ALIAS htonl +#define NAME __htonl #include <libkern/alpha/byte_swap_4.S> diff --git a/sys/libkern/alpha/htons.S b/sys/libkern/alpha/htons.S index 9ffabf4..6b8ea16 100644 --- a/sys/libkern/alpha/htons.S +++ b/sys/libkern/alpha/htons.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME htons +#define ALIAS htons +#define NAME __htons #include <libkern/alpha/byte_swap_2.S> diff --git a/sys/libkern/alpha/ntohl.S b/sys/libkern/alpha/ntohl.S index f86a404..590203a 100644 --- a/sys/libkern/alpha/ntohl.S +++ b/sys/libkern/alpha/ntohl.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME ntohl +#define ALIAS ntohl +#define NAME __ntohl #include <libkern/alpha/byte_swap_4.S> diff --git a/sys/libkern/alpha/ntohs.S b/sys/libkern/alpha/ntohs.S index 496f75c..9306881 100644 --- a/sys/libkern/alpha/ntohs.S +++ b/sys/libkern/alpha/ntohs.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME ntohs +#define ALIAS ntohs +#define NAME __ntohs #include <libkern/alpha/byte_swap_2.S> diff --git a/sys/libkern/ia64/byte_swap_2.S b/sys/libkern/ia64/byte_swap_2.S index fbee3c8..19d0eef 100644 --- a/sys/libkern/ia64/byte_swap_2.S +++ b/sys/libkern/ia64/byte_swap_2.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#ifndef NAME -#define NAME byte_swap_2 +#if !defined(ALIAS) || !defined(NAME) +#error ALIAS or NAME not defined #endif /* @@ -39,6 +39,7 @@ * * Argument is an unsigned 2-byte integer (u_int16_t). */ +WEAK_ALIAS(ALIAS, NAME) ENTRY(NAME, 1) mux1 r16=in0,@rev ;; diff --git a/sys/libkern/ia64/byte_swap_4.S b/sys/libkern/ia64/byte_swap_4.S index d183644..71019ba 100644 --- a/sys/libkern/ia64/byte_swap_4.S +++ b/sys/libkern/ia64/byte_swap_4.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#ifndef NAME -#define NAME byte_swap_4 +#if !defined(ALIAS) || !defined(NAME) +#error ALIAS or NAME not defined #endif /* @@ -39,6 +39,7 @@ * * Argument is an unsigned 4-byte integer (u_int32_t). */ +WEAK_ALIAS(ALIAS, NAME) ENTRY(NAME, 1) mux1 r16=in0,@rev ;; diff --git a/sys/libkern/ia64/htonl.S b/sys/libkern/ia64/htonl.S index 666f702..f0c89f4 100644 --- a/sys/libkern/ia64/htonl.S +++ b/sys/libkern/ia64/htonl.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME htonl +#define ALIAS htonl +#define NAME __htonl #include <libkern/ia64/byte_swap_4.S> diff --git a/sys/libkern/ia64/htons.S b/sys/libkern/ia64/htons.S index aaea4da..16a83d6 100644 --- a/sys/libkern/ia64/htons.S +++ b/sys/libkern/ia64/htons.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME htons +#define ALIAS htons +#define NAME __htons #include <libkern/ia64/byte_swap_2.S> diff --git a/sys/libkern/ia64/ntohl.S b/sys/libkern/ia64/ntohl.S index b306222..2f2e7ba 100644 --- a/sys/libkern/ia64/ntohl.S +++ b/sys/libkern/ia64/ntohl.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME ntohl +#define ALIAS ntohl +#define NAME __ntohl #include <libkern/ia64/byte_swap_4.S> diff --git a/sys/libkern/ia64/ntohs.S b/sys/libkern/ia64/ntohs.S index ddd7344..051f103 100644 --- a/sys/libkern/ia64/ntohs.S +++ b/sys/libkern/ia64/ntohs.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME ntohs +#define ALIAS ntohs +#define NAME __ntohs #include <libkern/ia64/byte_swap_2.S> diff --git a/sys/net/bridge.c b/sys/net/bridge.c index f05221c..f3412b5 100644 --- a/sys/net/bridge.c +++ b/sys/net/bridge.c @@ -867,8 +867,8 @@ bdg_forward(struct mbuf *m0, struct ether_header *const eh, struct ifnet *dst) * here we assume the pkt is an IP one and the header is contiguous */ ip = mtod(m0, struct ip *); - NTOHS(ip->ip_len); - NTOHS(ip->ip_off); + ip->ip_len = ntohs(ip->ip_len); + ip->ip_off = ntohs(ip->ip_off); /* * The third parameter to the firewall code is the dst. interface. @@ -881,11 +881,11 @@ bdg_forward(struct mbuf *m0, struct ether_header *const eh, struct ifnet *dst) return m0 ; /* * If we get here, the firewall has passed the pkt, but the mbuf - * pointer might have changed. Restore ip and the fields NTOHS()'d. + * pointer might have changed. Restore ip and the fields ntohs()'d. */ ip = mtod(m0, struct ip *); - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); if (i == 0) /* a PASS rule. */ goto forward ; diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c index 0ebd7d2..ec1428f 100644 --- a/sys/netgraph/ng_mppc.c +++ b/sys/netgraph/ng_mppc.c @@ -574,7 +574,7 @@ ng_mppc_decompress(node_p node, struct mbuf *m, struct mbuf **resultp) if (m->m_pkthdr.len < MPPC_HDRLEN) return (EINVAL); m_copydata(m, 0, MPPC_HDRLEN, (caddr_t)&header); - NTOHS(header); + header = ntohs(header); cc = (header & MPPC_CCOUNT_MASK); /* Copy payload into a contiguous region of memory */ diff --git a/sys/netinet/in.h b/sys/netinet/in.h index cf72e57..cfd55ca 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -496,6 +496,23 @@ char *inet_ntoa_r __P((struct in_addr ina, char *buf)); /* in libkern */ #define sintosa(sin) ((struct sockaddr *)(sin)) #define ifatoia(ifa) ((struct in_ifaddr *)(ifa)) +#else /* !_KERNEL */ + +#ifndef _BYTEORDER_FUNC_DEFINED +#define _BYTEORDER_FUNC_DEFINED +#define htonl(x) __htonl(x) +#define htons(x) __htons(x) +#define ntohl(x) __ntohl(x) +#define ntohs(x) __ntohs(x) #endif +__BEGIN_DECLS +__uint32_t htonl __P((__uint32_t)); +__uint16_t htons __P((__uint16_t)); +__uint32_t ntohl __P((__uint32_t)); +__uint16_t ntohs __P((__uint16_t)); +__END_DECLS + +#endif /* _KERNEL */ + #endif diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 1341e18..2fa823f 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -291,8 +291,8 @@ div_output(so, m, addr, control) } /* Convert fields to host order for ip_output() */ - NTOHS(ip->ip_len); - NTOHS(ip->ip_off); + ip->ip_len = ntohs(ip->ip_len); + ip->ip_off = ntohs(ip->ip_off); /* Send packet to output processing */ ipstat.ips_rawout++; /* XXX */ diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index b176512..5c6e155 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -1575,8 +1575,8 @@ got_match: ti.ti_i = *((struct ipovly *) ip); ti.ti_t = *tcp; bcopy(&ti, ip, sizeof(ti)); - NTOHL(tip->ti_seq); - NTOHL(tip->ti_ack); + tip->ti_seq = ntohl(tip->ti_seq); + tip->ti_ack = ntohl(tip->ti_ack); tip->ti_len = ip_len - hlen - (tip->ti_off << 2); if (tcp->th_flags & TH_ACK) { tcp_respond(NULL, (void *)ip, tcp, *m, diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index b1d37dc..e19c642 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -193,8 +193,8 @@ icmp_error(n, type, code, dest, destifp) /* * Convert fields to network representation. */ - HTONS(nip->ip_len); - HTONS(nip->ip_off); + nip->ip_len = htons(nip->ip_len); + nip->ip_off = htons(nip->ip_off); /* * Now, copy old ip header (without options) @@ -363,7 +363,7 @@ icmp_input(m, off) icmpstat.icps_badlen++; goto freeit; } - NTOHS(icp->icmp_ip.ip_len); + icp->icmp_ip.ip_len = ntohs(icp->icmp_ip.ip_len); /* Discard ICMP's in response to multicast packets */ if (IN_MULTICAST(ntohl(icp->icmp_ip.ip_dst.s_addr))) goto badcode; diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 9a4c248..e82e66f 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -369,12 +369,12 @@ ip_input(struct mbuf *m) /* * Convert fields to host representation. */ - NTOHS(ip->ip_len); + ip->ip_len = ntohs(ip->ip_len); if (ip->ip_len < hlen) { ipstat.ips_badlen++; goto bad; } - NTOHS(ip->ip_off); + ip->ip_off = ntohs(ip->ip_off); /* * Check that the amount of data in the buffers @@ -762,15 +762,15 @@ found: /* Restore original checksum before diverting packet */ if (divert_info != 0) { ip->ip_len += hlen; - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); ip->ip_sum = 0; if (hlen == sizeof(struct ip)) ip->ip_sum = in_cksum_hdr(ip); else ip->ip_sum = in_cksum(m, hlen); - NTOHS(ip->ip_off); - NTOHS(ip->ip_len); + ip->ip_off = ntohs(ip->ip_off); + ip->ip_len = ntohs(ip->ip_len); ip->ip_len -= hlen; } #endif @@ -793,8 +793,8 @@ found: /* Restore packet header fields to original values */ ip->ip_len += hlen; - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); /* Deliver packet to divert input routine */ ip_divert_cookie = divert_cookie; diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 956c466..54d5cd7 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1661,8 +1661,8 @@ encap_send(ip, vifp, m) */ ip = (struct ip *)((caddr_t)ip_copy + sizeof(multicast_encap_iphdr)); --ip->ip_ttl; - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); ip->ip_sum = 0; mb_copy->m_data += sizeof(multicast_encap_iphdr); ip->ip_sum = in_cksum(mb_copy, ip->ip_hl << 2); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index aab04c9..d6ee761 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -513,8 +513,8 @@ sendit: m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); error = ipsec4_output(&state, sp, flags); @@ -573,8 +573,8 @@ sendit: } /* make it flipped, again. */ - NTOHS(ip->ip_len); - NTOHS(ip->ip_off); + ip->ip_len = ntohs(ip->ip_len); + ip->ip_off = ntohs(ip->ip_off); skip_ipsec: #endif /*IPSEC*/ @@ -681,8 +681,8 @@ skip_ipsec: } /* Restore packet header fields to original values */ - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); /* Deliver packet to divert input routine */ ip_divert_cookie = divert_cookie; @@ -755,8 +755,8 @@ skip_ipsec: } m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED | CSUM_IP_VALID; - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); ip_input(m); goto done; } @@ -837,8 +837,8 @@ pass: */ if ((u_short)ip->ip_len <= ifp->if_mtu || ifp->if_hwassist & CSUM_FRAGMENT) { - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); ip->ip_sum = 0; if (sw_csum & CSUM_DELAY_IP) { if (ip->ip_vhl == IP_VHL_BORING) { @@ -943,7 +943,7 @@ pass: m->m_pkthdr.len = mhlen + len; m->m_pkthdr.rcvif = (struct ifnet *)0; m->m_pkthdr.csum_flags = m0->m_pkthdr.csum_flags; - HTONS(mhip->ip_off); + mhip->ip_off = htons(mhip->ip_off); mhip->ip_sum = 0; if (sw_csum & CSUM_DELAY_IP) { if (mhip->ip_vhl == IP_VHL_BORING) { @@ -972,7 +972,7 @@ pass: m->m_pkthdr.len = hlen + firstlen; ip->ip_len = htons((u_short)m->m_pkthdr.len); ip->ip_off |= IP_MF; - HTONS(ip->ip_off); + ip->ip_off = htons(ip->ip_off); ip->ip_sum = 0; if (sw_csum & CSUM_DELAY_IP) { if (ip->ip_vhl == IP_VHL_BORING) { @@ -1950,8 +1950,8 @@ ip_mloopback(ifp, m, dst, hlen) * than the interface's MTU. Can this possibly matter? */ ip = mtod(copym, struct ip *); - HTONS(ip->ip_len); - HTONS(ip->ip_off); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); ip->ip_sum = 0; if (ip->ip_vhl == IP_VHL_BORING) { ip->ip_sum = in_cksum_hdr(ip); diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index d6a1760..dc06328 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -424,7 +424,7 @@ tcp_input(m, off0) len = sizeof (struct ip) + tlen; bzero(ipov->ih_x1, sizeof(ipov->ih_x1)); ipov->ih_len = (u_short)tlen; - HTONS(ipov->ih_len); + ipov->ih_len = htons(ipov->ih_len); th->th_sum = in_cksum(m, len); } if (th->th_sum) { @@ -486,10 +486,10 @@ tcp_input(m, off0) /* * Convert TCP protocol specific fields to host format. */ - NTOHL(th->th_seq); - NTOHL(th->th_ack); - NTOHS(th->th_win); - NTOHS(th->th_urp); + th->th_seq = ntohl(th->th_seq); + th->th_ack = ntohl(th->th_ack); + th->th_win = ntohs(th->th_win); + th->th_urp = ntohs(th->th_urp); /* * Delay droping TCP, IP headers, IPv6 ext headers, and TCP options, @@ -2246,7 +2246,7 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_MSS; bcopy((char *)cp + 2, (char *)&to->to_mss, sizeof(to->to_mss)); - NTOHS(to->to_mss); + to->to_mss = ntohs(to->to_mss); break; case TCPOPT_WINDOW: if (optlen != TCPOLEN_WINDOW) @@ -2262,10 +2262,10 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_TS; bcopy((char *)cp + 2, (char *)&to->to_tsval, sizeof(to->to_tsval)); - NTOHL(to->to_tsval); + to->to_tsval = ntohl(to->to_tsval); bcopy((char *)cp + 6, (char *)&to->to_tsecr, sizeof(to->to_tsecr)); - NTOHL(to->to_tsecr); + to->to_tsecr = ntohl(to->to_tsecr); break; case TCPOPT_CC: if (optlen != TCPOLEN_CC) @@ -2273,7 +2273,7 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_CC; bcopy((char *)cp + 2, (char *)&to->to_cc, sizeof(to->to_cc)); - NTOHL(to->to_cc); + to->to_cc = ntohl(to->to_cc); break; case TCPOPT_CCNEW: if (optlen != TCPOLEN_CC) @@ -2283,7 +2283,7 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_CCNEW; bcopy((char *)cp + 2, (char *)&to->to_cc, sizeof(to->to_cc)); - NTOHL(to->to_cc); + to->to_cc = ntohl(to->to_cc); break; case TCPOPT_CCECHO: if (optlen != TCPOLEN_CC) @@ -2293,7 +2293,7 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_CCECHO; bcopy((char *)cp + 2, (char *)&to->to_ccecho, sizeof(to->to_ccecho)); - NTOHL(to->to_ccecho); + to->to_ccecho = ntohl(to->to_ccecho); break; default: continue; diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index d6a1760..dc06328 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -424,7 +424,7 @@ tcp_input(m, off0) len = sizeof (struct ip) + tlen; bzero(ipov->ih_x1, sizeof(ipov->ih_x1)); ipov->ih_len = (u_short)tlen; - HTONS(ipov->ih_len); + ipov->ih_len = htons(ipov->ih_len); th->th_sum = in_cksum(m, len); } if (th->th_sum) { @@ -486,10 +486,10 @@ tcp_input(m, off0) /* * Convert TCP protocol specific fields to host format. */ - NTOHL(th->th_seq); - NTOHL(th->th_ack); - NTOHS(th->th_win); - NTOHS(th->th_urp); + th->th_seq = ntohl(th->th_seq); + th->th_ack = ntohl(th->th_ack); + th->th_win = ntohs(th->th_win); + th->th_urp = ntohs(th->th_urp); /* * Delay droping TCP, IP headers, IPv6 ext headers, and TCP options, @@ -2246,7 +2246,7 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_MSS; bcopy((char *)cp + 2, (char *)&to->to_mss, sizeof(to->to_mss)); - NTOHS(to->to_mss); + to->to_mss = ntohs(to->to_mss); break; case TCPOPT_WINDOW: if (optlen != TCPOLEN_WINDOW) @@ -2262,10 +2262,10 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_TS; bcopy((char *)cp + 2, (char *)&to->to_tsval, sizeof(to->to_tsval)); - NTOHL(to->to_tsval); + to->to_tsval = ntohl(to->to_tsval); bcopy((char *)cp + 6, (char *)&to->to_tsecr, sizeof(to->to_tsecr)); - NTOHL(to->to_tsecr); + to->to_tsecr = ntohl(to->to_tsecr); break; case TCPOPT_CC: if (optlen != TCPOLEN_CC) @@ -2273,7 +2273,7 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_CC; bcopy((char *)cp + 2, (char *)&to->to_cc, sizeof(to->to_cc)); - NTOHL(to->to_cc); + to->to_cc = ntohl(to->to_cc); break; case TCPOPT_CCNEW: if (optlen != TCPOLEN_CC) @@ -2283,7 +2283,7 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_CCNEW; bcopy((char *)cp + 2, (char *)&to->to_cc, sizeof(to->to_cc)); - NTOHL(to->to_cc); + to->to_cc = ntohl(to->to_cc); break; case TCPOPT_CCECHO: if (optlen != TCPOLEN_CC) @@ -2293,7 +2293,7 @@ tcp_dooptions(to, cp, cnt, is_syn) to->to_flags |= TOF_CCECHO; bcopy((char *)cp + 2, (char *)&to->to_ccecho, sizeof(to->to_ccecho)); - NTOHL(to->to_ccecho); + to->to_ccecho = ntohl(to->to_ccecho); break; default: continue; diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c index a861e65..468400c 100644 --- a/sys/netinet6/ip6_fw.c +++ b/sys/netinet6/ip6_fw.c @@ -756,8 +756,8 @@ got_match: ti.ip6 = *ip6; ti.th = *tcp; - NTOHL(ti.th.th_seq); - NTOHL(ti.th.th_ack); + ti.th.th_seq = ntohl(ti.th.th_seq); + ti.th.th_ack = ntohl(ti.th.th_ack); ti.ip6.ip6_nxt = IPPROTO_TCP; if (ti.th.th_flags & TH_ACK) { ack = 0; diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 268884d..d84ba59 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -269,7 +269,7 @@ nd6_ra_input(m, off, icmp6len) dr0.advints_lost = 0; /* Mobile IPv6 */ /* unspecified or not? (RFC 2461 6.3.4) */ if (advreachable) { - NTOHL(advreachable); + advreachable = ntohl(advreachable); if (advreachable <= MAX_REACHABLE_TIME && ndi->basereachable != advreachable) { ndi->basereachable = advreachable; diff --git a/sys/powerpc/include/endian.h b/sys/powerpc/include/endian.h index a1f5ce6..3b45b73 100644 --- a/sys/powerpc/include/endian.h +++ b/sys/powerpc/include/endian.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1987, 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -35,8 +35,10 @@ * $FreeBSD$ */ -#ifndef _ENDIAN_H_ -#define _ENDIAN_H_ +#ifndef _MACHINE_ENDIAN_H_ +#define _MACHINE_ENDIAN_H_ + +#include <machine/ansi.h> /* * Define the order of 32-bit words in 64-bit words. @@ -44,53 +46,32 @@ #define _QUAD_HIGHWORD 0 #define _QUAD_LOWWORD 1 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ +#ifndef _POSIX_SOURCE #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ #define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ #define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ #define BYTE_ORDER BIG_ENDIAN +#endif /* !_POSIX_SOURCE */ #ifndef _KERNEL #include <sys/cdefs.h> -#endif -#include <machine/ansi.h> __BEGIN_DECLS -__uint32_t htonl __P((__uint32_t)); -__uint16_t htons __P((__uint16_t)); -__uint32_t ntohl __P((__uint32_t)); -__uint16_t ntohs __P((__uint16_t)); -__uint16_t bswap16 __P((__uint16_t)); -__uint32_t bswap32 __P((__uint32_t)); -__uint64_t bswap64 __P((__uint64_t)); +__uint32_t __htonl __P((__uint32_t)); +__uint16_t __htons __P((__uint16_t)); +__uint32_t __ntohl __P((__uint32_t)); +__uint16_t __ntohs __P((__uint16_t)); __END_DECLS +#endif /* _KERNEL */ -/* - * Macros for network/external number representation conversion. - */ -#if BYTE_ORDER == BIG_ENDIAN && !defined(lint) -#define ntohl(x) (x) -#define ntohs(x) (x) -#define htonl(x) (x) -#define htons(x) (x) - -#define NTOHL(x) (x) -#define NTOHS(x) (x) -#define HTONL(x) (x) -#define HTONS(x) (x) +#define __htonl(x) (x) +#define __htons(x) (x) +#define __ntohl(x) (x) +#define __ntohs(x) (x) -#else - -#define NTOHL(x) (x) = ntohl((__uint32_t)(x)) -#define NTOHS(x) (x) = ntohs((__uint16_t)(x)) -#define HTONL(x) (x) = htonl((__uint32_t)(x)) -#define HTONS(x) (x) = htons((__uint16_t)(x)) -#endif - -#endif /* !_POSIX_SOURCE */ -#endif /* !_ENDIAN_H_ */ +#endif /* !_MACHINE_ENDIAN_H_ */ diff --git a/sys/sparc64/include/endian.h b/sys/sparc64/include/endian.h index 54cc624..532daab 100644 --- a/sys/sparc64/include/endian.h +++ b/sys/sparc64/include/endian.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1987, 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -10,6 +10,13 @@ * 2. Redistributions in binary form must reproduce the above copyright * 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 + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -30,58 +37,29 @@ #ifndef _MACHINE_ENDIAN_H_ #define _MACHINE_ENDIAN_H_ +#include <machine/ansi.h> + /* * Define the order of 32-bit words in 64-bit words. */ #define _QUAD_HIGHWORD 0 #define _QUAD_LOWWORD 1 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ +#ifndef _POSIX_SOURCE #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ #define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ #define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ #define BYTE_ORDER BIG_ENDIAN +#endif /* !_POSIX_SOURCE */ -#ifndef _KERNEL -#include <sys/cdefs.h> -#endif -#include <machine/ansi.h> - -__BEGIN_DECLS -__uint32_t htonl __P((__uint32_t)); -__uint16_t htons __P((__uint16_t)); -__uint32_t ntohl __P((__uint32_t)); -__uint16_t ntohs __P((__uint16_t)); -__uint16_t bswap16 __P((__uint16_t)); -__uint32_t bswap32 __P((__uint32_t)); -__uint64_t bswap64 __P((__uint64_t)); -__END_DECLS - -/* - * Macros for network/external number representation conversion. - */ -#if BYTE_ORDER == BIG_ENDIAN && !defined(lint) -#define ntohl(x) (x) -#define ntohs(x) (x) -#define htonl(x) (x) -#define htons(x) (x) - -#define NTOHL(x) -#define NTOHS(x) -#define HTONL(x) -#define HTONS(x) - -#else +#define __htonl(x) (x) +#define __htons(x) (x) +#define __ntohl(x) (x) +#define __ntohs(x) (x) -#define NTOHL(x) (x) = ntohl((in_addr_t)x) -#define NTOHS(x) (x) = ntohs((in_port_t)x) -#define HTONL(x) (x) = htonl((in_addr_t)x) -#define HTONS(x) (x) = htons((in_port_t)x) -#endif -#endif /* !_POSIX_SOURCE */ #endif /* !_MACHINE_ENDIAN_H_ */ diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h index 39d6baf..4b20b87 100644 --- a/sys/sys/imgact_aout.h +++ b/sys/sys/imgact_aout.h @@ -50,14 +50,14 @@ ((mag) & 0xffff) ) #define N_GETMAGIC_NET(ex) \ - (ntohl((ex).a_midmag) & 0xffff) + (__ntohl((ex).a_midmag) & 0xffff) #define N_GETMID_NET(ex) \ - ((ntohl((ex).a_midmag) >> 16) & 0x03ff) + ((__ntohl((ex).a_midmag) >> 16) & 0x03ff) #define N_GETFLAG_NET(ex) \ - ((ntohl((ex).a_midmag) >> 26) & 0x3f) + ((__ntohl((ex).a_midmag) >> 26) & 0x3f) #define N_SETMAGIC_NET(ex,mag,mid,flag) \ - ( (ex).a_midmag = htonl( (((flag)&0x3f)<<26) | (((mid)&0x03ff)<<16) | \ - (((mag)&0xffff)) ) ) + ( (ex).a_midmag = __htonl( (((flag)&0x3f)<<26) | (((mid)&0x03ff)<<16) \ + | (((mag)&0xffff)) ) ) #define N_ALIGN(ex,x) \ (N_GETMAGIC(ex) == ZMAGIC || N_GETMAGIC(ex) == QMAGIC || \ diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h index e79fbfb..57278f4 100644 --- a/sys/sys/mchain.h +++ b/sys/sys/mchain.h @@ -48,23 +48,23 @@ #define htoleq(x) ((int64_t)(x)) #define letohq(x) ((int64_t)(x)) -#define htobes(x) (htons(x)) -#define betohs(x) (ntohs(x)) -#define htobel(x) (htonl(x)) -#define betohl(x) (ntohl(x)) +#define htobes(x) (__htons(x)) +#define betohs(x) (__ntohs(x)) +#define htobel(x) (__htonl(x)) +#define betohl(x) (__ntohl(x)) static __inline int64_t htobeq(int64_t x) { - return (int64_t)htonl((u_int32_t)(x >> 32)) | - (int64_t)htonl((u_int32_t)(x & 0xffffffff)) << 32; + return (int64_t)__htonl((u_int32_t)(x >> 32)) | + (int64_t)__htonl((u_int32_t)(x & 0xffffffff)) << 32; } static __inline int64_t betohq(int64_t x) { - return (int64_t)ntohl((u_int32_t)(x >> 32)) | - (int64_t)ntohl((u_int32_t)(x & 0xffffffff)) << 32; + return (int64_t)__ntohl((u_int32_t)(x >> 32)) | + (int64_t)__ntohl((u_int32_t)(x & 0xffffffff)) << 32; } #else /* (BYTE_ORDER == LITTLE_ENDIAN) */ diff --git a/sys/sys/param.h b/sys/sys/param.h index fe77232..90cc586 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -189,6 +189,30 @@ #endif /* + * Kernel exposed versions of byteorder(3) functions. + * + * XXX this section should only be defined in the kernel, but some userland + * software utilizes it. + */ +#ifndef _BYTEORDER_FUNC_DEFINED +#define _BYTEORDER_FUNC_DEFINED +#define htonl(x) __htonl(x) +#define htons(x) __htons(x) +#define ntohl(x) __ntohl(x) +#define ntohs(x) __ntohs(x) +#endif + +/* + * XXX deprecated uppercase variants for byteorder(3) functions. + */ +#ifndef _POSIX_SOURCE +#define NTOHL(x) ((x) = __ntohl(x)) +#define NTOHS(x) ((x) = __ntohs(x)) +#define HTONL(x) ((x) = __htonl(x)) +#define HTONS(x) ((x) = __htons(x)) +#endif /* _POSIX_SOURCE */ + +/* * Constants for setting the parameters of the kernel memory allocator. * * 2 ** MINBUCKET is the smallest unit of memory that will be diff --git a/sys/sys/types.h b/sys/sys/types.h index f01d985..e80462b 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -46,6 +46,7 @@ /* Machine type dependent parameters. */ #include <sys/stdint.h> /* includes <machine/ansi.h> */ +#include <machine/endian.h> #include <machine/types.h> #ifndef _POSIX_SOURCE @@ -122,12 +123,6 @@ typedef u_int32_t dev_t; /* device number */ #endif /* !_KERNEL */ -/* - * XXX: Deprecated; - * byteorder(3) functions now defined in <arpa/inet.h>. - */ -#include <machine/endian.h> - #ifdef _BSD_CLOCK_T_ typedef _BSD_CLOCK_T_ clock_t; #undef _BSD_CLOCK_T_ @@ -143,18 +138,6 @@ typedef _BSD_FFLAGS_T_ fflags_t; /* file flags */ #undef _BSD_FFLAGS_T_ #endif -/* XXX: Deprecated; now defined in <arpa/inet.h>. */ -#ifndef _IN_ADDR_T_DECLARED_ -typedef __uint32_t in_addr_t; -#define _IN_ADDR_T_DECLARED_ -#endif - -/* XXX: Deprecated; now defined in <arpa/inet.h>. */ -#ifndef _IN_PORT_T_DECLARED_ -typedef __uint16_t in_port_t; -#define _IN_PORT_T_DECLARED_ -#endif - #ifdef _BSD_SIZE_T_ typedef _BSD_SIZE_T_ size_t; #undef _BSD_SIZE_T_ |
