#include <stdlib.h>
#include <string.h>
+#include "netdissect-ctype.h"
+
#include "netdissect.h"
#include "extract.h"
#include "smb.h"
/* convert a UCS-2 string into an ASCII string */
#define MAX_UNISTR_SIZE 1000
-static int
+static const u_char *
unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
- const u_char *s, uint32_t *len, int is_null_terminated, int use_unicode)
+ const u_char *s, uint32_t strsize, int is_null_terminated,
+ int use_unicode)
{
u_int c;
size_t l = 0;
- uint32_t strsize;
const u_char *sp;
- int padding = 0;
if (use_unicode) {
/*
if (((s - startbuf) % 2) != 0) {
ND_TCHECK_1(s);
s++;
- padding++;
}
}
if (is_null_terminated) {
if (!use_unicode) {
for (;;) {
ND_TCHECK_1(sp);
- *len += 1;
- if (GET_U_1(sp) == 0)
- break;
+ c = GET_U_1(sp);
sp++;
+ strsize++;
+ if (c == '\0')
+ break;
}
- strsize = *len - 1;
} else {
for (;;) {
ND_TCHECK_2(sp);
- *len += 2;
- if (GET_U_1(sp) == 0 && GET_U_1(sp + 1) == 0)
- break;
+ c = GET_LE_U_2(sp);
sp += 2;
+ strsize += 2;
+ if (c == '\0')
+ break;
}
- strsize = *len - 2;
}
- *len += padding;
- } else {
- /*
- * Counted string.
- */
- strsize = *len;
- *len += padding;
}
if (!use_unicode) {
while (strsize != 0) {
* skipping past it.
*/
ND_TCHECK_LEN(s, strsize);
+ s += strsize;
+ strsize = 0;
break;
}
if (l < MAX_UNISTR_SIZE) {
- if (ND_ISPRINT(c)) {
+ if (ND_ASCII_ISPRINT(c)) {
/* It's a printable ASCII character */
- (*buf)[l] = c;
+ (*buf)[l] = (char)c;
} else {
/* It's a non-ASCII character or a non-printable ASCII character */
(*buf)[l] = '.';
* skipping past it.
*/
ND_TCHECK_LEN(s, strsize);
+ s += strsize;
+ strsize = 0;
break;
}
if (l < MAX_UNISTR_SIZE) {
- if (ND_ISPRINT(c)) {
+ if (ND_ASCII_ISPRINT(c)) {
/* It's a printable ASCII character */
- (*buf)[l] = c;
+ (*buf)[l] = (char)c;
} else {
/* It's a non-ASCII character or a non-printable ASCII character */
(*buf)[l] = '.';
}
}
(*buf)[l] = 0;
- return 0;
+ return s;
trunc:
(*buf)[l] = 0;
- return -1;
+ return NULL;
}
static const u_char *
ND_TCHECK_LEN(buf, l);
buf += l;
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
case 'R': /* like 'S', but always ASCII */
{
/*XXX unistr() */
- uint32_t len;
- int result;
-
- len = 0;
- result = unistr(ndo, &strbuf, buf, &len, 1, (*fmt == 'R') ? 0 : unicodestr);
+ buf = unistr(ndo, &strbuf, buf, 0, 1, (*fmt == 'R') ? 0 : unicodestr);
ND_PRINT("%s", strbuf);
- if (result == -1)
+ if (buf == NULL)
goto trunc;
- buf += len;
fmt++;
break;
}
case 'Z':
case 'Y': /* like 'Z', but always ASCII */
{
- uint32_t len;
- int result;
-
ND_TCHECK_1(buf);
if (GET_U_1(buf) != 4 && GET_U_1(buf) != 2) {
ND_PRINT("Error! ASCIIZ buffer of type %u", GET_U_1(buf));
return maxbuf; /* give up */
}
- len = 0;
- result = unistr(ndo, &strbuf, buf + 1, &len, 1, (*fmt == 'Y') ? 0 : unicodestr);
+ buf = unistr(ndo, &strbuf, buf + 1, 0, 1, (*fmt == 'Y') ? 0 : unicodestr);
ND_PRINT("%s", strbuf);
- if (result == -1)
+ if (buf == NULL)
goto trunc;
- buf += len + 1;
fmt++;
break;
}
ND_PRINT("%-*.*s", l, l, buf);
buf += l;
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
ND_PRINT("%-*.*s", (int)stringlen, (int)stringlen, buf);
buf += stringlen;
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
case 'C':
{
- int result;
-
if (!stringlen_is_set) {
ND_PRINT("{stringlen not set}");
goto trunc;
}
- result = unistr(ndo, &strbuf, buf, &stringlen, 0, unicodestr);
+ buf = unistr(ndo, &strbuf, buf, stringlen, 0, unicodestr);
ND_PRINT("%s", strbuf);
- if (result == -1)
+ if (buf == NULL)
goto trunc;
- buf += stringlen;
fmt++;
break;
}
buf++;
}
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
break;
}
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
tstring = "NULL\n";
ND_PRINT("%s", tstring);
fmt++;
- while (isdigit((unsigned char)*fmt))
+ while (ND_ASCII_ISDIGIT(*fmt))
fmt++;
break;
}
while (*fmt) {
switch (*fmt) {
case '*':
+ /*
+ * List of multiple instances of something described by the
+ * remainder of the string (which may itself include a list
+ * of multiple instances of something, so we recurse).
+ */
fmt++;
while (buf < maxbuf) {
const u_char *buf2;
depth++;
- buf2 = smb_fdata(ndo, buf, fmt, maxbuf, unicodestr);
+ /*
+ * In order to avoid stack exhaustion recurse at most 10
+ * levels; that "should not happen", as no SMB structure
+ * should be nested *that* deeply, and we thus shouldn't
+ * have format strings with that level of nesting.
+ */
+ if (depth == 10) {
+ ND_PRINT("(too many nested levels, not recursing)");
+ buf2 = buf;
+ } else
+ buf2 = smb_fdata(ndo, buf, fmt, maxbuf, unicodestr);
depth--;
if (buf2 == NULL)
return(NULL);
return(buf);
case '|':
+ /*
+ * Just do a bounds check.
+ */
fmt++;
if (buf >= maxbuf)
return(buf);
break;
case '%':
+ /*
+ * XXX - unused?
+ */
fmt++;
buf = maxbuf;
break;
case '#':
+ /*
+ * Done?
+ */
fmt++;
return(buf);
break;
case '[':
+ /*
+ * Format of an item, enclosed in square brackets; dissect
+ * the item with smb_fdata1().
+ */
fmt++;
if (buf >= maxbuf)
return(buf);
break;
default:
+ /*
+ * Not a formatting character, so just print it.
+ */
ND_PRINT("%c", *fmt);
fmt++;
break;
const err_code_struct *err = err_classes[i].err_msgs;
for (j = 0; err[j].name; j++)
if (num == err[j].code) {
- nd_snprintf(ret, sizeof(ret), "%s - %s (%s)",
+ snprintf(ret, sizeof(ret), "%s - %s (%s)",
err_classes[i].class, err[j].name, err[j].message);
return ret;
}
}
- nd_snprintf(ret, sizeof(ret), "%s - %d", err_classes[i].class, num);
+ snprintf(ret, sizeof(ret), "%s - %d", err_classes[i].class, num);
return ret;
}
- nd_snprintf(ret, sizeof(ret), "ERROR: Unknown error (%d,%d)", class, num);
+ snprintf(ret, sizeof(ret), "ERROR: Unknown error (%d,%d)", class, num);
return(ret);
}
return nt_errors[i].name;
}
- nd_snprintf(ret, sizeof(ret), "0x%08x", err);
+ snprintf(ret, sizeof(ret), "0x%08x", err);
return ret;
}
projects / tcpdump / blobdiff