diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 18:17:16 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 18:17:16 +0000 |
| commit | 88a191f109e4bbf287e317e4115185aa904a7757 (patch) | |
| tree | d59cebde657eda0af31fdab513367f5ad61113cd /contrib/tcpdump/extract.h | |
| parent | 281e9d71408deb6e8c5046c746c2e97002b0e7fe (diff) | |
| download | FreeBSD-src-88a191f109e4bbf287e317e4115185aa904a7757.zip FreeBSD-src-88a191f109e4bbf287e317e4115185aa904a7757.tar.gz | |
Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org
Diffstat (limited to 'contrib/tcpdump/extract.h')
| -rw-r--r-- | contrib/tcpdump/extract.h | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/contrib/tcpdump/extract.h b/contrib/tcpdump/extract.h index 25980e4..f3db250 100644 --- a/contrib/tcpdump/extract.h +++ b/contrib/tcpdump/extract.h @@ -18,11 +18,12 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/extract.h,v 1.19 2002/12/11 07:13:51 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/extract.h,v 1.24 2005/01/15 02:06:50 guy Exp $ (LBL) */ -/* Network to host order macros */ - +/* + * Macros to extract possibly-unaligned big-endian integral values. + */ #ifdef LBL_ALIGN /* * The processor doesn't natively handle unaligned loads. @@ -54,6 +55,10 @@ typedef struct { ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))->val)) #define EXTRACT_32BITS(p) \ ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))->val)) +#define EXTRACT_64BITS(p) \ + ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 0)->val)) << 32 | \ + ((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 1)->val)) << 0)) + #else /* HAVE___ATTRIBUTE__ */ /* * We don't have __attribute__, so do unaligned loads of big-endian @@ -68,6 +73,15 @@ typedef struct { (u_int32_t)*((const u_int8_t *)(p) + 1) << 16 | \ (u_int32_t)*((const u_int8_t *)(p) + 2) << 8 | \ (u_int32_t)*((const u_int8_t *)(p) + 3))) +#define EXTRACT_64BITS(p) \ + ((u_int64_t)((u_int64_t)*((const u_int8_t *)(p) + 0) << 56 | \ + (u_int64_t)*((const u_int8_t *)(p) + 1) << 48 | \ + (u_int64_t)*((const u_int8_t *)(p) + 2) << 40 | \ + (u_int64_t)*((const u_int8_t *)(p) + 3) << 32 | \ + (u_int64_t)*((const u_int8_t *)(p) + 4) << 24 | \ + (u_int64_t)*((const u_int8_t *)(p) + 5) << 16 | \ + (u_int64_t)*((const u_int8_t *)(p) + 6) << 8 | \ + (u_int64_t)*((const u_int8_t *)(p) + 7))) #endif /* HAVE___ATTRIBUTE__ */ #else /* LBL_ALIGN */ /* @@ -78,6 +92,9 @@ typedef struct { ((u_int16_t)ntohs(*(const u_int16_t *)(p))) #define EXTRACT_32BITS(p) \ ((u_int32_t)ntohl(*(const u_int32_t *)(p))) +#define EXTRACT_64BITS(p) \ + ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0))) << 32 | \ + ((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) << 0)) #endif /* LBL_ALIGN */ #define EXTRACT_24BITS(p) \ @@ -85,8 +102,10 @@ typedef struct { (u_int32_t)*((const u_int8_t *)(p) + 1) << 8 | \ (u_int32_t)*((const u_int8_t *)(p) + 2))) -/* Little endian protocol host order macros */ - +/* + * Macros to extract possibly-unaligned little-endian integral values. + * XXX - do loads on little-endian machines that support unaligned loads? + */ #define EXTRACT_LE_8BITS(p) (*(p)) #define EXTRACT_LE_16BITS(p) \ ((u_int16_t)((u_int16_t)*((const u_int8_t *)(p) + 1) << 8 | \ @@ -96,3 +115,12 @@ typedef struct { (u_int32_t)*((const u_int8_t *)(p) + 2) << 16 | \ (u_int32_t)*((const u_int8_t *)(p) + 1) << 8 | \ (u_int32_t)*((const u_int8_t *)(p) + 0))) +#define EXTRACT_LE_64BITS(p) \ + ((u_int64_t)((u_int64_t)*((const u_int8_t *)(p) + 7) << 56 | \ + (u_int64_t)*((const u_int8_t *)(p) + 6) << 48 | \ + (u_int64_t)*((const u_int8_t *)(p) + 5) << 40 | \ + (u_int64_t)*((const u_int8_t *)(p) + 4) << 32 | \ + (u_int64_t)*((const u_int8_t *)(p) + 3) << 24 | \ + (u_int64_t)*((const u_int8_t *)(p) + 2) << 16 | \ + (u_int64_t)*((const u_int8_t *)(p) + 1) << 8 | \ + (u_int64_t)*((const u_int8_t *)(p) + 0))) |
