Fix mkdep invocations.

[tcpdump] / smbutil.c

diff --git a/smbutil.c b/smbutil.c
index 1c1742c26dd32383478b358167cc1914458a1d5c..38bd76de1be51d857409e2513b13610c2611a1e8 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -6,18 +6,17 @@
  * or later
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "smb.h"
 
@@ -74,7 +73,7 @@ make_unix_date(const u_char *date_ptr)
 {
     uint32_t dos_date = 0;
 
-    dos_date = EXTRACT_LE_32BITS(date_ptr);
+    dos_date = EXTRACT_LE_U_4(date_ptr);
 
     return int_unix_date(dos_date);
 }
@@ -88,7 +87,7 @@ make_unix_date2(const u_char *date_ptr)
 {
     uint32_t x, x2;
 
-    x = EXTRACT_LE_32BITS(date_ptr);
+    x = EXTRACT_LE_U_4(date_ptr);
     x2 = ((x & 0xFFFF) << 16) | ((x & 0xFFFF0000) >> 16);
     return int_unix_date(x2);
 }
@@ -104,7 +103,7 @@ interpret_long_date(const u_char *p)
     time_t ret;
 
     /* this gives us seconds since jan 1st 1601 (approx) */
-    d = (EXTRACT_LE_32BITS(p + 4) * 256.0 + p[3]) * (1.0e-7 * (1 << 24));
+    d = (EXTRACT_LE_U_4(p + 4) * 256.0 + p[3]) * (1.0e-7 * (1 << 24));
 
     /* now adjust by 369 years to make the secs since 1970 */
     d -= 369.0 * 365.25 * 24 * 60 * 60;
@@ -133,8 +132,9 @@ name_interpret(netdissect_options *ndo,
 
     if (in >= maxbuf)
        return(-1);     /* name goes past the end of the buffer */
-    ND_TCHECK2(*in, 1);
-    len = (*in++) / 2;
+    ND_TCHECK_1(in);
+    len = EXTRACT_U_1(in) / 2;
+    in++;
 
     *out=0;
 
@@ -142,7 +142,7 @@ name_interpret(netdissect_options *ndo,
        return(0);
 
     while (len--) {
-       ND_TCHECK2(*in, 2);
+       ND_TCHECK_2(in);
        if (in + 1 >= maxbuf)
            return(-1); /* name goes past the end of the buffer */
        if (in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') {
@@ -175,7 +175,7 @@ name_ptr(netdissect_options *ndo,
     p = buf + ofs;
     if (p >= maxbuf)
        return(NULL);   /* name goes past the end of the buffer */
-    ND_TCHECK2(*p, 1);
+    ND_TCHECK_1(p);
 
     c = *p;
 
@@ -183,10 +183,10 @@ name_ptr(netdissect_options *ndo,
     if ((c & 0xC0) == 0xC0) {
        uint16_t l;
 
-       ND_TCHECK2(*p, 2);
+       ND_TCHECK_2(p);
        if ((p + 1) >= maxbuf)
            return(NULL);       /* name goes past the end of the buffer */
-       l = EXTRACT_16BITS(p) & 0x3FFF;
+       l = EXTRACT_BE_U_2(p) & 0x3FFF;
        if (l == 0) {
            /* We have a pointer that points to itself. */
            return(NULL);
@@ -194,7 +194,7 @@ name_ptr(netdissect_options *ndo,
        p = buf + l;
        if (p >= maxbuf)
            return(NULL);       /* name goes past the end of the buffer */
-       ND_TCHECK2(*p, 1);
+       ND_TCHECK_1(p);
     }
     return(p);
 
@@ -229,15 +229,16 @@ name_len(netdissect_options *ndo,
 
     if (s >= maxbuf)
        return(-1);     /* name goes past the end of the buffer */
-    ND_TCHECK2(*s, 1);
+    ND_TCHECK_1(s);
     c = *s;
     if ((c & 0xC0) == 0xC0)
        return(2);
     while (*s) {
        if (s >= maxbuf)
            return(-1); /* name goes past the end of the buffer */
-       ND_TCHECK2(*s, 1);
+       ND_TCHECK_1(s);
        s += (*s) + 1;
+       ND_TCHECK_1(s);
     }
     return(PTR_DIFF(s, s0) + 1);
 
@@ -272,8 +273,7 @@ name_type_str(int name_type)
 }
 
 void
-print_data(netdissect_options *ndo,
-           const unsigned char *buf, int len)
+smb_print_data(netdissect_options *ndo, const unsigned char *buf, int len)
 {
     int i = 0;
 
@@ -374,7 +374,7 @@ unistr(netdissect_options *ndo,
            strsize = *len - 1;
        } else {
            for (;;) {
-               ND_TCHECK2(sp[0], 2);
+               ND_TCHECK_2(sp);
                *len += 2;
                if (sp[0] == 0 && sp[1] == 0)
                    break;
@@ -406,7 +406,7 @@ unistr(netdissect_options *ndo,
        }
     } else {
        while (strsize != 0) {
-           ND_TCHECK2(s[0], 2);
+           ND_TCHECK_2(s);
            if (l >= MAX_UNISTR_SIZE)
                break;
            if (s[1] == 0 && ND_ISPRINT(s[0])) {
@@ -450,8 +450,8 @@ smb_fdata1(netdissect_options *ndo,
            break;
 
        case 'A':
-           ND_TCHECK2(buf[0], 2);
-           write_bits(ndo, EXTRACT_LE_16BITS(buf), attrib_fmt);
+           ND_TCHECK_2(buf);
+           write_bits(ndo, EXTRACT_LE_U_2(buf), attrib_fmt);
            buf += 2;
            fmt++;
            break;
@@ -504,9 +504,9 @@ smb_fdata1(netdissect_options *ndo,
        case 'd':
          {
            unsigned int x;
-           ND_TCHECK2(buf[0], 2);
-           x = reverse ? EXTRACT_16BITS(buf) :
-                         EXTRACT_LE_16BITS(buf);
+           ND_TCHECK_2(buf);
+           x = reverse ? EXTRACT_BE_U_2(buf) :
+                         EXTRACT_LE_U_2(buf);
            ND_PRINT((ndo, "%d (0x%x)", x, x));
            buf += 2;
            fmt++;
@@ -515,9 +515,9 @@ smb_fdata1(netdissect_options *ndo,
        case 'D':
          {
            unsigned int x;
-           ND_TCHECK2(buf[0], 4);
-           x = reverse ? EXTRACT_32BITS(buf) :
-                         EXTRACT_LE_32BITS(buf);
+           ND_TCHECK_4(buf);
+           x = reverse ? EXTRACT_BE_U_4(buf) :
+                         EXTRACT_LE_U_4(buf);
            ND_PRINT((ndo, "%d (0x%x)", x, x));
            buf += 4;
            fmt++;
@@ -526,9 +526,9 @@ smb_fdata1(netdissect_options *ndo,
        case 'L':
          {
            uint64_t x;
-           ND_TCHECK2(buf[0], 8);
-           x = reverse ? EXTRACT_64BITS(buf) :
-                         EXTRACT_LE_64BITS(buf);
+           ND_TCHECK_8(buf);
+           x = reverse ? EXTRACT_BE_U_8(buf) :
+                         EXTRACT_LE_U_8(buf);
            ND_PRINT((ndo, "%" PRIu64 " (0x%" PRIx64 ")", x, x));
            buf += 8;
            fmt++;
@@ -539,11 +539,11 @@ smb_fdata1(netdissect_options *ndo,
            /* Weird mixed-endian length values in 64-bit locks */
            uint32_t x1, x2;
            uint64_t x;
-           ND_TCHECK2(buf[0], 8);
-           x1 = reverse ? EXTRACT_32BITS(buf) :
-                          EXTRACT_LE_32BITS(buf);
-           x2 = reverse ? EXTRACT_32BITS(buf + 4) :
-                          EXTRACT_LE_32BITS(buf + 4);
+           ND_TCHECK_8(buf);
+           x1 = reverse ? EXTRACT_BE_U_4(buf) :
+                          EXTRACT_LE_U_4(buf);
+           x2 = reverse ? EXTRACT_BE_U_4(buf + 4) :
+                          EXTRACT_LE_U_4(buf + 4);
            x = (((uint64_t)x1) << 32) | x2;
            ND_PRINT((ndo, "%" PRIu64 " (0x%" PRIx64 ")", x, x));
            buf += 8;
@@ -563,9 +563,9 @@ smb_fdata1(netdissect_options *ndo,
        case 'w':
          {
            unsigned int x;
-           ND_TCHECK2(buf[0], 2);
-           x = reverse ? EXTRACT_16BITS(buf) :
-                         EXTRACT_LE_16BITS(buf);
+           ND_TCHECK_2(buf);
+           x = reverse ? EXTRACT_BE_U_2(buf) :
+                         EXTRACT_LE_U_2(buf);
            ND_PRINT((ndo, "0x%X", x));
            buf += 2;
            fmt++;
@@ -574,9 +574,9 @@ smb_fdata1(netdissect_options *ndo,
        case 'W':
          {
            unsigned int x;
-           ND_TCHECK2(buf[0], 4);
-           x = reverse ? EXTRACT_32BITS(buf) :
-                         EXTRACT_LE_32BITS(buf);
+           ND_TCHECK_4(buf);
+           x = reverse ? EXTRACT_BE_U_4(buf) :
+                         EXTRACT_LE_U_4(buf);
            ND_PRINT((ndo, "0x%X", x));
            buf += 4;
            fmt++;
@@ -595,17 +595,17 @@ smb_fdata1(netdissect_options *ndo,
                break;
 
            case 'd':
-               ND_TCHECK2(buf[0], 2);
-               stringlen = reverse ? EXTRACT_16BITS(buf) :
-                                     EXTRACT_LE_16BITS(buf);
+               ND_TCHECK_2(buf);
+               stringlen = reverse ? EXTRACT_BE_U_2(buf) :
+                                     EXTRACT_LE_U_2(buf);
                ND_PRINT((ndo, "%u", stringlen));
                buf += 2;
                break;
 
            case 'D':
-               ND_TCHECK2(buf[0], 4);
-               stringlen = reverse ? EXTRACT_32BITS(buf) :
-                                     EXTRACT_LE_32BITS(buf);
+               ND_TCHECK_4(buf);
+               stringlen = reverse ? EXTRACT_BE_U_4(buf) :
+                                     EXTRACT_LE_U_4(buf);
                ND_PRINT((ndo, "%u", stringlen));
                buf += 4;
                break;
@@ -637,7 +637,7 @@ smb_fdata1(netdissect_options *ndo,
 
            ND_TCHECK(*buf);
            if (*buf != 4 && *buf != 2) {
-               ND_PRINT((ndo, "Error! ASCIIZ buffer of type %u", *buf));
+               ND_PRINT((ndo, "Error! ASCIIZ buffer of type %u", EXTRACT_U_1(buf)));
                return maxbuf;  /* give up */
            }
            len = 0;
@@ -685,8 +685,10 @@ smb_fdata1(netdissect_options *ndo,
          {
            int l = atoi(fmt + 1);
            ND_TCHECK2(*buf, l);
-           while (l--)
-               ND_PRINT((ndo, "%02x", *buf++));
+           while (l--) {
+               ND_PRINT((ndo, "%02x", EXTRACT_U_1(buf)));
+               buf++;
+           }
            fmt++;
            while (isdigit((unsigned char)*fmt))
                fmt++;
@@ -734,8 +736,8 @@ smb_fdata1(netdissect_options *ndo,
 
            switch (atoi(fmt + 1)) {
            case 1:
-               ND_TCHECK2(buf[0], 4);
-               x = EXTRACT_LE_32BITS(buf);
+               ND_TCHECK_4(buf);
+               x = EXTRACT_LE_U_4(buf);
                if (x == 0 || x == 0xFFFFFFFF)
                    t = 0;
                else
@@ -743,8 +745,8 @@ smb_fdata1(netdissect_options *ndo,
                buf += 4;
                break;
            case 2:
-               ND_TCHECK2(buf[0], 4);
-               x = EXTRACT_LE_32BITS(buf);
+               ND_TCHECK_4(buf);
+               x = EXTRACT_LE_U_4(buf);
                if (x == 0 || x == 0xFFFFFFFF)
                    t = 0;
                else
@@ -752,7 +754,7 @@ smb_fdata1(netdissect_options *ndo,
                buf += 4;
                break;
            case 3:
-               ND_TCHECK2(buf[0], 8);
+               ND_TCHECK_8(buf);
                t = interpret_long_date(buf);
                buf += 8;
                break;
@@ -861,7 +863,7 @@ smb_fdata(netdissect_options *ndo,
     if (!depth && buf < maxbuf) {
        size_t len = PTR_DIFF(maxbuf, buf);
        ND_PRINT((ndo, "Data: (%lu bytes)\n", (unsigned long)len));
-       print_data(ndo, buf, len);
+       smb_print_data(ndo, buf, len);
        return(buf + len);
     }
     return(buf);