Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / cpack.c

diff --git a/cpack.c b/cpack.c
index 14c0a9ee2a3e06ab1e2391177bf0139255aa0dca..16bfd151698e8c195193a1880944f74c6e3f538f 100644 (file)
--- a/cpack.c
+++ b/cpack.c
@@ -27,6 +27,7 @@
  * OF SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -38,8 +39,8 @@
 #include "cpack.h"
 #include "extract.h"
 
-static u_int8_t *
-cpack_next_boundary(u_int8_t *buf, u_int8_t *p, size_t alignment)
+uint8_t *
+cpack_next_boundary(uint8_t *buf, uint8_t *p, size_t alignment)
 {
        size_t misalignment = (size_t)(p - buf) % alignment;
 
@@ -53,10 +54,10 @@ cpack_next_boundary(u_int8_t *buf, u_int8_t *p, size_t alignment)
  * wordsize bytes remain in the buffer after the boundary.  Otherwise,
  * return a pointer to the boundary.
  */
-static u_int8_t *
+uint8_t *
 cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize)
 {
-       u_int8_t *next;
+       uint8_t *next;
 
        /* Ensure alignment. */
        next = cpack_next_boundary(cs->c_buf, cs->c_next, wordsize);
@@ -68,8 +69,19 @@ cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize)
        return next;
 }
 
+/* Advance by N bytes without returning them. */
 int
-cpack_init(struct cpack_state *cs, u_int8_t *buf, size_t buflen)
+cpack_advance(struct cpack_state *cs, const size_t toskip)
+{
+       /* No space left? */
+       if (cs->c_next - cs->c_buf + toskip > cs->c_len)
+               return -1;
+       cs->c_next += toskip;
+       return 0;
+}
+
+int
+cpack_init(struct cpack_state *cs, uint8_t *buf, size_t buflen)
 {
        memset(cs, 0, sizeof(*cs));
 
@@ -82,55 +94,55 @@ cpack_init(struct cpack_state *cs, u_int8_t *buf, size_t buflen)
 
 /* Unpack a 64-bit unsigned integer. */
 int
-cpack_uint64(struct cpack_state *cs, u_int64_t *u)
+cpack_uint64(struct cpack_state *cs, uint64_t *u)
 {
-       u_int8_t *next;
+       uint8_t *next;
 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 
        *u = EXTRACT_LE_64BITS(next);
 
-       /* Move pointer past the u_int64_t. */
+       /* Move pointer past the uint64_t. */
        cs->c_next = next + sizeof(*u);
        return 0;
 }
 
 /* Unpack a 32-bit unsigned integer. */
 int
-cpack_uint32(struct cpack_state *cs, u_int32_t *u)
+cpack_uint32(struct cpack_state *cs, uint32_t *u)
 {
-       u_int8_t *next;
+       uint8_t *next;
 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 
        *u = EXTRACT_LE_32BITS(next);
 
-       /* Move pointer past the u_int32_t. */
+       /* Move pointer past the uint32_t. */
        cs->c_next = next + sizeof(*u);
        return 0;
 }
 
 /* Unpack a 16-bit unsigned integer. */
 int
-cpack_uint16(struct cpack_state *cs, u_int16_t *u)
+cpack_uint16(struct cpack_state *cs, uint16_t *u)
 {
-       u_int8_t *next;
+       uint8_t *next;
 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 
        *u = EXTRACT_LE_16BITS(next);
 
-       /* Move pointer past the u_int16_t. */
+       /* Move pointer past the uint16_t. */
        cs->c_next = next + sizeof(*u);
        return 0;
 }
 
 /* Unpack an 8-bit unsigned integer. */
 int
-cpack_uint8(struct cpack_state *cs, u_int8_t *u)
+cpack_uint8(struct cpack_state *cs, uint8_t *u)
 {
        /* No space left? */
        if ((size_t)(cs->c_next - cs->c_buf) >= cs->c_len)
@@ -138,7 +150,7 @@ cpack_uint8(struct cpack_state *cs, u_int8_t *u)
 
        *u = *cs->c_next;
 
-       /* Move pointer past the u_int8_t. */
+       /* Move pointer past the uint8_t. */
        cs->c_next++;
        return 0;
 }