rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-14 18:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

tcpdump: Update to FreeBSD head 2017-04-04

Browse Source 
Update tcpdump from Git mirror commit
99a648a912e81e29d9c4c159cbbe263462f2d719 to
642b174daddbd0efd9bb5f242c43f4ab4db6869f.
This commit is contained in:
Sebastian Huber
2017-10-10 12:55:06 +02:00
parent cd7d52dbe9
commit 1043048648
423 changed files with 44407 additions and 29727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
freebsd/contrib/tcpdump/cpack.c
View File

@@ -1,5 +1,8 @@
#include <machine/rtems-bsd-user-space.h>
#ifdef __rtems__
#include <machine/rtems-bsd-program.h>
#include "rtems-bsd-tcpdump-namespace.h"
#endif /* __rtems__ */
/*-
* Copyright (c) 2003, 2004 David Young. All rights reserved.
*
@@ -35,13 +38,13 @@
#include <stdlib.h>
#include <string.h>
#include <tcpdump-stdinc.h>
#include <netdissect-stdinc.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;
@@ -55,10 +58,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.
*/
u_int8_t *
const uint8_t *
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);
@@ -70,8 +73,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, const uint8_t *buf, size_t buflen)
{
memset(cs, 0, sizeof(*cs));
@@ -84,55 +98,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;
const 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;
const 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;
const 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)
@@ -140,7 +154,10 @@ 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;
}
#ifdef __rtems__
#include "rtems-bsd-tcpdump-cpack-data.h"
#endif /* __rtems__ */