rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-17 20:23:58 +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

100
freebsd/contrib/tcpdump/print-ascii.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__ */
/* $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $ */
/*-
@@ -38,18 +41,16 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/* \summary: ASCII packet dump printer */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef lint
static const char rcsid[] _U_ =
"@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.17 2005-07-06 20:53:32 guy Exp $";
#endif
#include <tcpdump-stdinc.h>
#include <netdissect-stdinc.h>
#include <stdio.h>
#include "interface.h"
#include "netdissect.h"
#define ASCII_LINELENGTH 300
#define HEXDUMP_BYTES_PER_LINE 16
@@ -59,32 +60,55 @@ static const char rcsid[] _U_ =
(HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
void
ascii_print(register const u_char *cp, register u_int length)
ascii_print(netdissect_options *ndo,
const u_char *cp, u_int length)
{
register int s;
u_int caplength;
register u_char s;
putchar('\n');
caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
if (length > caplength)
length = caplength;
ND_PRINT((ndo, "\n"));
while (length > 0) {
s = *cp++;
length--;
if (!isgraph(s) &&
(s != '\t' && s != ' ' && s != '\n' && s != '\r'))
putchar('.');
else
putchar(s);
if (s == '\r') {
/*
* Don't print CRs at the end of the line; they
* don't belong at the ends of lines on UN*X,
* and the standard I/O library will give us one
* on Windows so we don't need to print one
* ourselves.
*
* In the middle of a line, just print a '.'.
*/
if (length > 1 && *cp != '\n')
ND_PRINT((ndo, "."));
} else {
if (!ND_ISGRAPH(s) &&
(s != '\t' && s != ' ' && s != '\n'))
ND_PRINT((ndo, "."));
else
ND_PRINT((ndo, "%c", s));
}
}
}
void
hex_and_ascii_print_with_offset(register const char *ident,
hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *ident,
register const u_char *cp, register u_int length, register u_int oset)
{
u_int caplength;
register u_int i;
register int s1, s2;
register int nshorts;
char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
char asciistuff[ASCII_LINELENGTH+1], *asp;
caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
if (length > caplength)
length = caplength;
nshorts = length / sizeof(u_short);
i = 0;
hsp = hexstuff; asp = asciistuff;
@@ -94,14 +118,14 @@ hex_and_ascii_print_with_offset(register const char *ident,
(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
" %02x%02x", s1, s2);
hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
*(asp++) = (isgraph(s1) ? s1 : '.');
*(asp++) = (isgraph(s2) ? s2 : '.');
*(asp++) = (ND_ISGRAPH(s1) ? s1 : '.');
*(asp++) = (ND_ISGRAPH(s2) ? s2 : '.');
i++;
if (i >= HEXDUMP_SHORTS_PER_LINE) {
*hsp = *asp = '\0';
(void)printf("%s0x%04x: %-*s %s",
ND_PRINT((ndo, "%s0x%04x: %-*s %s",
ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
hexstuff, asciistuff);
hexstuff, asciistuff));
i = 0; hsp = hexstuff; asp = asciistuff;
oset += HEXDUMP_BYTES_PER_LINE;
}
@@ -111,48 +135,53 @@ hex_and_ascii_print_with_offset(register const char *ident,
(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
" %02x", s1);
hsp += 3;
*(asp++) = (isgraph(s1) ? s1 : '.');
*(asp++) = (ND_ISGRAPH(s1) ? s1 : '.');
++i;
}
if (i > 0) {
*hsp = *asp = '\0';
(void)printf("%s0x%04x: %-*s %s",
ND_PRINT((ndo, "%s0x%04x: %-*s %s",
ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
hexstuff, asciistuff);
hexstuff, asciistuff));
}
}
void
hex_and_ascii_print(register const char *ident, register const u_char *cp,
register u_int length)
hex_and_ascii_print(netdissect_options *ndo, register const char *ident,
register const u_char *cp, register u_int length)
{
hex_and_ascii_print_with_offset(ident, cp, length, 0);
hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0);
}
/*
* telnet_print() wants this. It is essentially default_print_unaligned()
*/
void
hex_print_with_offset(register const char *ident, register const u_char *cp, register u_int length,
register u_int oset)
hex_print_with_offset(netdissect_options *ndo,
const char *ident, const u_char *cp, u_int length,
u_int oset)
{
u_int caplength;
register u_int i, s;
register int nshorts;
caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
if (length > caplength)
length = caplength;
nshorts = (u_int) length / sizeof(u_short);
i = 0;
while (--nshorts >= 0) {
if ((i++ % 8) == 0) {
(void)printf("%s0x%04x: ", ident, oset);
ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
oset += HEXDUMP_BYTES_PER_LINE;
}
s = *cp++;
(void)printf(" %02x%02x", s, *cp++);
ND_PRINT((ndo," %02x%02x", s, *cp++));
}
if (length & 1) {
if ((i % 8) == 0)
(void)printf("%s0x%04x: ", ident, oset);
(void)printf(" %02x", *cp);
ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
ND_PRINT((ndo," %02x", *cp));
}
}
@@ -160,9 +189,9 @@ hex_print_with_offset(register const char *ident, register const u_char *cp, reg
* just for completeness
*/
void
hex_print(register const char *ident, register const u_char *cp, register u_int length)
hex_print(netdissect_options *ndo,const char *ident, const u_char *cp, u_int length)
{
hex_print_with_offset(ident, cp, length, 0);
hex_print_with_offset(ndo, ident, cp, length, 0);
}
#ifdef MAIN
@@ -183,3 +212,6 @@ main(int argc, char *argv[])
exit(0);
}
#endif /* MAIN */
#ifdef __rtems__
#include "rtems-bsd-tcpdump-print-ascii-data.h"
#endif /* __rtems__ */