Fix mkdep invocations.

[tcpdump] / cpack.c

diff --git a/cpack.c b/cpack.c
index b863d8e71fb55b029ee32bb8e3725bad3aee81d4..7628a5c3e3dee8b093bc823c07e239a61146edda 100644 (file)
--- a/cpack.c
+++ b/cpack.c
@@ -33,13 +33,13 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include "cpack.h"
 #include "extract.h"
 
 
 #include "cpack.h"
 #include "extract.h"
 

-u_int8_t *
-cpack_next_boundary(u_int8_t *buf, u_int8_t *p, size_t alignment)
+const uint8_t *
+cpack_next_boundary(const uint8_t *buf, const uint8_t *p, size_t alignment)

 {
        size_t misalignment = (size_t)(p - buf) % alignment;
 
 {
        size_t misalignment = (size_t)(p - buf) % alignment;
 


@@ -53,10 +53,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.
  */
  * wordsize bytes remain in the buffer after the boundary.  Otherwise,
  * return a pointer to the boundary.
  */

-u_int8_t *
+const uint8_t *

 cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize)
 {
 cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize)
 {

-       u_int8_t *next;
+       const uint8_t *next;

 
        /* Ensure alignment. */
        next = cpack_next_boundary(cs->c_buf, cs->c_next, wordsize);
 
        /* Ensure alignment. */
        next = cpack_next_boundary(cs->c_buf, cs->c_next, wordsize);


@@ -80,7 +80,7 @@ cpack_advance(struct cpack_state *cs, const size_t toskip)
 }
 
 int
 }
 
 int

-cpack_init(struct cpack_state *cs, u_int8_t *buf, size_t buflen)
+cpack_init(struct cpack_state *cs, const uint8_t *buf, size_t buflen)

 {
        memset(cs, 0, sizeof(*cs));
 
 {
        memset(cs, 0, sizeof(*cs));
 


@@ -93,63 +93,126 @@ cpack_init(struct cpack_state *cs, u_int8_t *buf, size_t buflen)
 
 /* Unpack a 64-bit unsigned integer. */
 int
 
 /* 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;
+       const uint8_t *next;

 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 
 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 

-       *u = EXTRACT_LE_64BITS(next);
+       *u = EXTRACT_LE_U_8(next);

 
 

-       /* Move pointer past the u_int64_t. */
+       /* Move pointer past the uint64_t. */
+       cs->c_next = next + sizeof(*u);
+       return 0;
+}
+
+/* Unpack a 64-bit signed integer. */
+int
+cpack_int64(struct cpack_state *cs, int64_t *u)
+{
+       const uint8_t *next;
+
+       if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+               return -1;
+
+       *u = EXTRACT_LE_S_8(next);
+
+       /* Move pointer past the int64_t. */

        cs->c_next = next + sizeof(*u);
        return 0;
 }
 
 /* Unpack a 32-bit unsigned integer. */
 int
        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)
+{
+       const uint8_t *next;
+
+       if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+               return -1;
+
+       *u = EXTRACT_LE_U_4(next);
+
+       /* Move pointer past the uint32_t. */
+       cs->c_next = next + sizeof(*u);
+       return 0;
+}
+
+/* Unpack a 32-bit signed integer. */
+int
+cpack_int32(struct cpack_state *cs, int32_t *u)

 {
 {

-       u_int8_t *next;
+       const uint8_t *next;

 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 
 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 

-       *u = EXTRACT_LE_32BITS(next);
+       *u = EXTRACT_LE_S_4(next);

 
 

-       /* Move pointer past the u_int32_t. */
+       /* Move pointer past the int32_t. */

        cs->c_next = next + sizeof(*u);
        return 0;
 }
 
 /* Unpack a 16-bit unsigned integer. */
 int
        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;
+       const uint8_t *next;

 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 
 
        if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
                return -1;
 

-       *u = EXTRACT_LE_16BITS(next);
+       *u = EXTRACT_LE_U_2(next);

 
 

-       /* Move pointer past the u_int16_t. */
+       /* Move pointer past the uint16_t. */
+       cs->c_next = next + sizeof(*u);
+       return 0;
+}
+
+/* Unpack a 16-bit signed integer. */
+int
+cpack_int16(struct cpack_state *cs, int16_t *u)
+{
+       const uint8_t *next;
+
+       if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+               return -1;
+
+       *u = EXTRACT_LE_S_2(next);
+
+       /* Move pointer past the int16_t. */

        cs->c_next = next + sizeof(*u);
        return 0;
 }
 
 /* Unpack an 8-bit unsigned integer. */
 int
        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)
+               return -1;
+
+       *u = EXTRACT_U_1(cs->c_next);
+
+       /* Move pointer past the uint8_t. */
+       cs->c_next++;
+       return 0;
+}
+
+/* Unpack an 8-bit signed integer. */
+int
+cpack_int8(struct cpack_state *cs, int8_t *u)

 {
        /* No space left? */
        if ((size_t)(cs->c_next - cs->c_buf) >= cs->c_len)
                return -1;
 
 {
        /* No space left? */
        if ((size_t)(cs->c_next - cs->c_buf) >= cs->c_len)
                return -1;
 

-       *u = *cs->c_next;
+       *u = EXTRACT_S_1(cs->c_next);

 
 

-       /* Move pointer past the u_int8_t. */
+       /* Move pointer past the int8_t. */

        cs->c_next++;
        return 0;
 }
        cs->c_next++;
        return 0;
 }