/*
* txtproto_print() derived from original code by Hannes Gredler
- * (hannes@juniper.net):
+ * (hannes@gredler.at):
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code
#include <string.h>
#include "netdissect.h"
+#include "extract.h"
#include "ascii_strcasecmp.h"
#include "timeval-operations.h"
}
/*
- * Print out a null-terminated filename (or other ascii string).
+ * Print out a null-terminated filename (or other ASCII string).
* If ep is NULL, assume no truncation check is needed.
* Return true if truncated.
* Stop at ep (if given) or before the null char, whichever is first.
*/
int
fn_print(netdissect_options *ndo,
- register const u_char *s, register const u_char *ep)
+ const u_char *s, const u_char *ep)
{
- register int ret;
- register u_char c;
+ int ret;
+ u_char c;
ret = 1; /* assume truncated */
while (ep == NULL || s < ep) {
}
/*
- * Print out a null-terminated filename (or other ascii string) from
+ * Print out a null-terminated filename (or other ASCII string) from
* a fixed-length buffer.
* If ep is NULL, assume no truncation check is needed.
* Return the number of bytes of string processed, including the
*/
u_int
fn_printztn(netdissect_options *ndo,
- register const u_char *s, register u_int n, register const u_char *ep)
+ const u_char *s, u_int n, const u_char *ep)
{
- register u_int bytes;
- register u_char c;
+ u_int bytes;
+ u_char c;
bytes = 0;
for (;;) {
}
/*
- * Print out a counted filename (or other ascii string).
+ * Print out a counted filename (or other ASCII string).
* If ep is NULL, assume no truncation check is needed.
* Return true if truncated.
* Stop at ep (if given) or after n bytes, whichever is first.
*/
int
fn_printn(netdissect_options *ndo,
- register const u_char *s, register u_int n, register const u_char *ep)
+ const u_char *s, u_int n, const u_char *ep)
{
- register u_char c;
+ u_char c;
while (n > 0 && (ep == NULL || s < ep)) {
n--;
}
/*
- * Print out a null-padded filename (or other ascii string).
+ * Print out a null-padded filename (or other ASCII string).
* If ep is NULL, assume no truncation check is needed.
* Return true if truncated.
* Stop at ep (if given) or after n bytes or before the null char,
*/
int
fn_printzp(netdissect_options *ndo,
- register const u_char *s, register u_int n,
- register const u_char *ep)
+ const u_char *s, u_int n,
+ const u_char *ep)
{
- register int ret;
- register u_char c;
+ int ret;
+ u_char c;
ret = 1; /* assume truncated */
while (n > 0 && (ep == NULL || s < ep)) {
*/
void
ts_print(netdissect_options *ndo,
- register const struct timeval *tvp)
+ const struct timeval *tvp)
{
- register int s;
+ int s;
struct tm *tm;
time_t Time;
char buf[TS_BUF_SIZE];
* Convert a token value to a string; use "fmt" if not found.
*/
const char *
-tok2strbuf(register const struct tok *lp, register const char *fmt,
- register u_int v, char *buf, size_t bufsize)
+tok2strbuf(const struct tok *lp, const char *fmt,
+ u_int v, char *buf, size_t bufsize)
{
if (lp != NULL) {
while (lp->s != NULL) {
/*
* Convert a token value to a string; use "fmt" if not found.
+ * Uses tok2strbuf() on one of four local static buffers of size TOKBUFSIZE
+ * in round-robin fashion.
*/
const char *
-tok2str(register const struct tok *lp, register const char *fmt,
- register u_int v)
+tok2str(const struct tok *lp, const char *fmt,
+ u_int v)
{
static char buf[4][TOKBUFSIZE];
static int idx = 0;
* if the s field is positive.
*/
static char *
-bittok2str_internal(register const struct tok *lp, register const char *fmt,
- register u_int v, const char *sep)
+bittok2str_internal(const struct tok *lp, const char *fmt,
+ u_int v, const char *sep)
{
- static char buf[256]; /* our stringbuffer */
- int buflen=0;
- register u_int rotbit; /* this is the bit we rotate through all bitpositions */
- register u_int tokval;
+ static char buf[1024+1]; /* our string buffer */
+ char *bufp = buf;
+ size_t space_left = sizeof(buf), string_size;
+ u_int rotbit; /* this is the bit we rotate through all bitpositions */
+ u_int tokval;
const char * sepstr = "";
while (lp != NULL && lp->s != NULL) {
*/
if (tokval == (v&rotbit)) {
/* ok we have found something */
- buflen+=snprintf(buf+buflen, sizeof(buf)-buflen, "%s%s",
- sepstr, lp->s);
+ if (space_left <= 1)
+ return (buf); /* only enough room left for NUL, if that */
+ string_size = strlcpy(bufp, sepstr, space_left);
+ if (string_size >= space_left)
+ return (buf); /* we ran out of room */
+ bufp += string_size;
+ space_left -= string_size;
+ if (space_left <= 1)
+ return (buf); /* only enough room left for NUL, if that */
+ string_size = strlcpy(bufp, lp->s, space_left);
+ if (string_size >= space_left)
+ return (buf); /* we ran out of room */
+ bufp += string_size;
+ space_left -= string_size;
sepstr = sep;
break;
}
lp++;
}
- if (buflen == 0)
+ if (bufp == buf)
/* bummer - lets print the "unknown" message as advised in the fmt string if we got one */
(void)snprintf(buf, sizeof(buf), fmt == NULL ? "#%08x" : fmt, v);
return (buf);
* this is useful for parsing bitfields, the output strings are not seperated.
*/
char *
-bittok2str_nosep(register const struct tok *lp, register const char *fmt,
- register u_int v)
+bittok2str_nosep(const struct tok *lp, const char *fmt,
+ u_int v)
{
return (bittok2str_internal(lp, fmt, v, ""));
}
* this is useful for parsing bitfields, the output strings are comma seperated.
*/
char *
-bittok2str(register const struct tok *lp, register const char *fmt,
- register u_int v)
+bittok2str(const struct tok *lp, const char *fmt,
+ u_int v)
{
return (bittok2str_internal(lp, fmt, v, ", "));
}
* correct for bounds-checking.
*/
const char *
-tok2strary_internal(register const char **lp, int n, register const char *fmt,
- register int v)
+tok2strary_internal(const char **lp, int n, const char *fmt,
+ int v)
{
static char buf[TOKBUFSIZE];
size_t toklen = 0;
for (; idx < len; idx++) {
- if (!ND_TTEST(*(pptr + idx))) {
+ if (!ND_TTEST_1(pptr + idx)) {
/* ran past end of captured data */
return (0);
}
* an end-of-line (CR or LF).
*/
for (; idx < len; idx++) {
- if (!ND_TTEST(*(pptr + idx))) {
+ if (!ND_TTEST_1(pptr + idx)) {
/* ran past end of captured data */
break;
}
startidx = idx;
while (idx < len) {
- ND_TCHECK(*(pptr+idx));
+ ND_TCHECK_1(pptr + idx);
if (*(pptr+idx) == '\n') {
/*
* LF without CR; end of line.
/* not in this packet */
return (0);
}
- ND_TCHECK(*(pptr+idx+1));
+ ND_TCHECK_1(pptr + idx + 1);
if (*(pptr+idx+1) == '\n') {
/*
* CR-LF; end of line.
u_int idx, eol;
u_char token[MAX_TOKEN+1];
const char *cmd;
- int is_reqresp = 0;
+ int print_this = 0;
const char *pnp;
if (cmds != NULL) {
/*
* This protocol has more than just request and
* response lines; see whether this looks like a
- * request or response.
+ * request or response and, if so, print it and,
+ * in verbose mode, print everything after it.
+ *
+ * This is for HTTP-like protocols, where we
+ * want to print requests and responses, but
+ * don't want to print continuations of request
+ * or response bodies in packets that don't
+ * contain the request or response line.
*/
idx = fetch_token(ndo, pptr, 0, len, token, sizeof(token));
if (idx != 0) {
while ((cmd = *cmds++) != NULL) {
if (ascii_strcasecmp((const char *)token, cmd) == 0) {
/* Yes. */
- is_reqresp = 1;
+ print_this = 1;
break;
}
}
if (isdigit(token[0]) && isdigit(token[1]) &&
isdigit(token[2]) && token[3] == '\0') {
/* Yes. */
- is_reqresp = 1;
+ print_this = 1;
}
}
}
} else {
/*
- * This protocol has only request and response lines
- * (e.g., FTP, where all the data goes over a
- * different connection); assume the payload is
- * a request or response.
+ * Either:
+ *
+ * 1) This protocol has only request and response lines
+ * (e.g., FTP, where all the data goes over a different
+ * connection); assume the payload is a request or
+ * response.
+ *
+ * or
+ *
+ * 2) This protocol is just text, so that we should
+ * always, at minimum, print the first line and,
+ * in verbose mode, print all lines.
*/
- is_reqresp = 1;
+ print_this = 1;
}
/* Capitalize the protocol name */
for (pnp = protoname; *pnp != '\0'; pnp++)
ND_PRINT((ndo, "%c", toupper((u_char)*pnp)));
- if (is_reqresp) {
+ if (print_this) {
/*
* In non-verbose mode, just print the protocol, followed
- * by the first line as the request or response info.
+ * by the first line.
*
* In verbose mode, print lines as text until we run out
* of characters or see something that's not a
{
u_int idx = 0;
- while (*s && idx < maxlen) {
+ while (idx < maxlen && *s) {
safeputchar(ndo, *s);
idx++;
s++;
ND_PRINT((ndo, (c < 0x80 && ND_ISPRINT(c)) ? "%c" : "\\0x%02x", c));
}
-#ifdef LBL_ALIGN
+#if (defined(__i386__) || defined(_M_IX86) || defined(__X86__) || defined(__x86_64__) || defined(_M_X64)) || \
+ (defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)) || \
+ (defined(__m68k__) && (!defined(__mc68000__) && !defined(__mc68010__))) || \
+ (defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PPC64)) || \
+ (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || \
+ defined(__vax__)
/*
- * Some compilers try to optimize memcpy(), using the alignment constraint
- * on the argument pointer type. by using this function, we try to avoid the
- * optimization.
+ * The procesor natively handles unaligned loads, so just use memcpy()
+ * and memcmp(), to enable those optimizations.
+ *
+ * XXX - are those all the x86 tests we need?
+ * XXX - do we need to worry about ARMv1 through ARMv5, which didn't
+ * support unaligned loads, and, if so, do we need to worry about all
+ * of them, or just some of them, e.g. ARMv5?
+ * XXX - are those the only 68k tests we need not to generated
+ * unaligned accesses if the target is the 68000 or 68010?
+ * XXX - are there any tests we don't need, because some definitions are for
+ * compilers that also predefine the GCC symbols?
+ * XXX - do we need to test for both 32-bit and 64-bit versions of those
+ * architectures in all cases?
+ */
+#else
+/*
+ * The processor doesn't natively handle unaligned loads,
+ * and the compiler might "helpfully" optimize memcpy()
+ * and memcmp(), when handed pointers that would normally
+ * be properly aligned, into sequences that assume proper
+ * alignment.
+ *
+ * Do copies and compares of possibly-unaligned data by
+ * calling routines that wrap memcpy() and memcmp(), to
+ * prevent that optimization.
*/
void
unaligned_memcpy(void *p, const void *q, size_t l)
projects / tcpdump / blobdiff