aboutsummaryrefslogtreecommitdiff
path: root/contrib/tcpdump/cpack.h
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2012-05-17 05:11:57 +0000
committerXin LI <delphij@FreeBSD.org>2012-05-17 05:11:57 +0000
commitcac3dcd5f981d8843fb0acc27b4d28af1339af66 (patch)
tree1720d207a135a239a304163c4635810a1094209a /contrib/tcpdump/cpack.h
parentc3a9b90973c6add91710a6a213af772245017d76 (diff)
parent60894fde29002aac35c5aff244b0f45c4d590413 (diff)
downloadsrc-cac3dcd5f981d8843fb0acc27b4d28af1339af66.tar.gz
src-cac3dcd5f981d8843fb0acc27b4d28af1339af66.zip
Merge tcpdump 4.2.1.
MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=235530
Diffstat (limited to 'contrib/tcpdump/cpack.h')
-rw-r--r--contrib/tcpdump/cpack.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/tcpdump/cpack.h b/contrib/tcpdump/cpack.h
index 14ed37692cd9..74f97960adb8 100644
--- a/contrib/tcpdump/cpack.h
+++ b/contrib/tcpdump/cpack.h
@@ -43,6 +43,9 @@ int cpack_uint16(struct cpack_state *, u_int16_t *);
int cpack_uint32(struct cpack_state *, u_int32_t *);
int cpack_uint64(struct cpack_state *, u_int64_t *);
+u_int8_t *cpack_next_boundary(u_int8_t *buf, u_int8_t *p, size_t alignment);
+u_int8_t *cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize);
+
#define cpack_int8(__s, __p) cpack_uint8((__s), (u_int8_t*)(__p))
#define cpack_int16(__s, __p) cpack_uint16((__s), (u_int16_t*)(__p))
#define cpack_int32(__s, __p) cpack_uint32((__s), (u_int32_t*)(__p))