remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-smb.c

diff --git a/print-smb.c b/print-smb.c
index 0f0d9cebde3cd3559ddc4b74092c1a6a1a7f896c..bcd7363dec955c22a7cb42db4ee8bdd2d26f7fb0 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -9,10 +9,10 @@
 /* \summary: SMB/CIFS printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: SMB/CIFS printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -20,11 +20,12 @@
 #include "extract.h"
 #include "smb.h"
 
 #include "extract.h"
 #include "smb.h"
 

-static const char tstr[] = "[|SMB]";

 
 static int request = 0;
 static int unicodestr = 0;
 
 
 static int request = 0;
 static int unicodestr = 0;
 

+extern const u_char *startbuf;
+

 const u_char *startbuf = NULL;
 
 struct smbdescript {
 const u_char *startbuf = NULL;
 
 struct smbdescript {


@@ -40,7 +41,7 @@ struct smbdescriptint {
     const char *req_f2;
     const char *rep_f1;
     const char *rep_f2;
     const char *req_f2;
     const char *rep_f1;
     const char *rep_f2;

-    void (*fn)(netdissect_options *, const u_char *, const u_char *, int, int);
+    void (*fn)(netdissect_options *, const u_char *, const u_char *, u_int, u_int);

 };
 
 struct smbfns
 };
 
 struct smbfns


@@ -89,44 +90,43 @@ smbfindint(int id, const struct smbfnsint *list)
 
 static void
 trans2_findfirst(netdissect_options *ndo,
 
 static void
 trans2_findfirst(netdissect_options *ndo,

-                 const u_char *param, const u_char *data, int pcnt, int dcnt)
+                 const u_char *param, const u_char *data, u_int pcnt, u_int dcnt)

 {
     const char *fmt;
 
     if (request)
 {
     const char *fmt;
 
     if (request)

-       fmt = "Attribute=[A]\nSearchCount=[d]\nFlags=[w]\nLevel=[dP4]\nFile=[S]\n";
+       fmt = "Attribute=[A]\nSearchCount=[u]\nFlags=[w]\nLevel=[uP4]\nFile=[S]\n";

     else
     else

-       fmt = "Handle=[w]\nCount=[d]\nEOS=[w]\nEoffset=[d]\nLastNameOfs=[w]\n";
+       fmt = "Handle=[w]\nCount=[u]\nEOS=[w]\nEoffset=[u]\nLastNameOfs=[w]\n";

 
     smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);
     if (dcnt) {
 
     smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);
     if (dcnt) {

-       ND_PRINT((ndo, "data:\n"));
-       smb_print_data(ndo, data, dcnt);
+       ND_PRINT("data:\n");
+       smb_data_print(ndo, data, dcnt);

     }
 }
 
 static void
 trans2_qfsinfo(netdissect_options *ndo,
     }
 }
 
 static void
 trans2_qfsinfo(netdissect_options *ndo,

-               const u_char *param, const u_char *data, int pcnt, int dcnt)
+               const u_char *param, const u_char *data, u_int pcnt, u_int dcnt)

 {
 {

-    static int level = 0;
+    static u_int level = 0;

     const char *fmt="";
 
     if (request) {
     const char *fmt="";
 
     if (request) {

-       ND_TCHECK_2(param);
-       level = EXTRACT_LE_U_2(param);
-       fmt = "InfoLevel=[d]\n";
+       level = GET_LE_U_2(param);
+       fmt = "InfoLevel=[u]\n";

        smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);
     } else {
        switch (level) {
        case 1:
        smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);
     } else {
        switch (level) {
        case 1:

-           fmt = "idFileSystem=[W]\nSectorUnit=[D]\nUnit=[D]\nAvail=[D]\nSectorSize=[d]\n";
+           fmt = "idFileSystem=[W]\nSectorUnit=[U]\nUnit=[U]\nAvail=[U]\nSectorSize=[u]\n";

            break;
        case 2:
            fmt = "CreationTime=[T2]VolNameLength=[lb]\nVolumeLabel=[c]\n";
            break;
        case 0x105:
            break;
        case 2:
            fmt = "CreationTime=[T2]VolNameLength=[lb]\nVolumeLabel=[c]\n";
            break;
        case 0x105:

-           fmt = "Capabilities=[W]\nMaxFileLen=[D]\nVolNameLen=[lD]\nVolume=[C]\n";
+           fmt = "Capabilities=[W]\nMaxFileLen=[U]\nVolNameLen=[lU]\nVolume=[C]\n";

            break;
        default:
            fmt = "UnknownLevel\n";
            break;
        default:
            fmt = "UnknownLevel\n";


@@ -135,19 +135,16 @@ trans2_qfsinfo(netdissect_options *ndo,
        smb_fdata(ndo, data, fmt, data + dcnt, unicodestr);
     }
     if (dcnt) {
        smb_fdata(ndo, data, fmt, data + dcnt, unicodestr);
     }
     if (dcnt) {

-       ND_PRINT((ndo, "data:\n"));
-       smb_print_data(ndo, data, dcnt);
+       ND_PRINT("data:\n");
+       smb_data_print(ndo, data, dcnt);

     }
     }

-    return;
-trunc:
-    ND_PRINT((ndo, "%s", tstr));

 }
 
 static const struct smbfnsint trans2_fns[] = {
     { 0, "TRANSACT2_OPEN", 0,
 }
 
 static const struct smbfnsint trans2_fns[] = {
     { 0, "TRANSACT2_OPEN", 0,

-       { "Flags2=[w]\nMode=[w]\nSearchAttrib=[A]\nAttrib=[A]\nTime=[T2]\nOFun=[w]\nSize=[D]\nRes=([w, w, w, w, w])\nPath=[S]",
+       { "Flags2=[w]\nMode=[w]\nSearchAttrib=[A]\nAttrib=[A]\nTime=[T2]\nOFun=[w]\nSize=[U]\nRes=([w, w, w, w, w])\nPath=[S]",

          NULL,
          NULL,

-         "Handle=[d]\nAttrib=[A]\nTime=[T2]\nSize=[D]\nAccess=[w]\nType=[w]\nState=[w]\nAction=[w]\nInode=[W]\nOffErr=[d]\n|EALength=[d]\n",
+         "Handle=[u]\nAttrib=[A]\nTime=[T2]\nSize=[U]\nAccess=[w]\nType=[w]\nState=[w]\nAction=[w]\nInode=[W]\nOffErr=[u]\n|EALength=[u]\n",

          NULL, NULL }},
     { 1, "TRANSACT2_FINDFIRST", 0,
        { NULL, NULL, NULL, NULL, trans2_findfirst }},
          NULL, NULL }},
     { 1, "TRANSACT2_FINDFIRST", 0,
        { NULL, NULL, NULL, NULL, trans2_findfirst }},


@@ -177,55 +174,54 @@ print_trans2(netdissect_options *ndo,
     const u_char *data, *param;
     const u_char *w = words + 1;
     const char *f1 = NULL, *f2 = NULL;
     const u_char *data, *param;
     const u_char *w = words + 1;
     const char *f1 = NULL, *f2 = NULL;

-    int pcnt, dcnt;
+    u_int pcnt, dcnt;

 
 

-    ND_TCHECK(words[0]);
+    ND_TCHECK_1(words);

     if (request) {
        ND_TCHECK_2(w + (14 * 2));
     if (request) {
        ND_TCHECK_2(w + (14 * 2));

-       pcnt = EXTRACT_LE_U_2(w + 9 * 2);
-       param = buf + EXTRACT_LE_U_2(w + 10 * 2);
-       dcnt = EXTRACT_LE_U_2(w + 11 * 2);
-       data = buf + EXTRACT_LE_U_2(w + 12 * 2);
-       fn = smbfindint(EXTRACT_LE_U_2(w + 14 * 2), trans2_fns);
+       pcnt = GET_LE_U_2(w + 9 * 2);
+       param = buf + GET_LE_U_2(w + 10 * 2);
+       dcnt = GET_LE_U_2(w + 11 * 2);
+       data = buf + GET_LE_U_2(w + 12 * 2);
+       fn = smbfindint(GET_LE_U_2(w + 14 * 2), trans2_fns);

     } else {
     } else {

-       if (EXTRACT_U_1(words) == 0) {
-           ND_PRINT((ndo, "%s\n", fn->name));
-           ND_PRINT((ndo, "Trans2Interim\n"));
+       if (GET_U_1(words) == 0) {
+           ND_PRINT("%s\n", fn->name);
+           ND_PRINT("Trans2Interim\n");

            return;
        }
        ND_TCHECK_2(w + (7 * 2));
            return;
        }
        ND_TCHECK_2(w + (7 * 2));

-       pcnt = EXTRACT_LE_U_2(w + 3 * 2);
-       param = buf + EXTRACT_LE_U_2(w + 4 * 2);
-       dcnt = EXTRACT_LE_U_2(w + 6 * 2);
-       data = buf + EXTRACT_LE_U_2(w + 7 * 2);
+       pcnt = GET_LE_U_2(w + 3 * 2);
+       param = buf + GET_LE_U_2(w + 4 * 2);
+       dcnt = GET_LE_U_2(w + 6 * 2);
+       data = buf + GET_LE_U_2(w + 7 * 2);

     }
 
     }
 

-    ND_PRINT((ndo, "%s param_length=%d data_length=%d\n", fn->name, pcnt, dcnt));
+    ND_PRINT("%s param_length=%u data_length=%u\n", fn->name, pcnt, dcnt);

 
     if (request) {
 
     if (request) {

-       if (words[0] == 8) {
+       if (GET_U_1(words) == 8) {

            smb_fdata(ndo, words + 1,
            smb_fdata(ndo, words + 1,

-               "Trans2Secondary\nTotParam=[d]\nTotData=[d]\nParamCnt=[d]\nParamOff=[d]\nParamDisp=[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nHandle=[d]\n",
+               "Trans2Secondary\nTotParam=[u]\nTotData=[u]\nParamCnt=[u]\nParamOff=[u]\nParamDisp=[u]\nDataCnt=[u]\nDataOff=[u]\nDataDisp=[u]\nHandle=[u]\n",

                maxbuf, unicodestr);
            return;
        } else {
            smb_fdata(ndo, words + 1,
                maxbuf, unicodestr);
            return;
        } else {
            smb_fdata(ndo, words + 1,

-               "TotParam=[d]\nTotData=[d]\nMaxParam=[d]\nMaxData=[d]\nMaxSetup=[b][P1]\nFlags=[w]\nTimeOut=[D]\nRes1=[w]\nParamCnt=[d]\nParamOff=[d]\nDataCnt=[d]\nDataOff=[d]\nSetupCnt=[b][P1]\n",
+               "TotParam=[u]\nTotData=[u]\nMaxParam=[u]\nMaxData=[u]\nMaxSetup=[b][P1]\nFlags=[w]\nTimeOut=[D]\nRes1=[w]\nParamCnt=[u]\nParamOff=[u]\nDataCnt=[u]\nDataOff=[u]\nSetupCnt=[b][P1]\n",

                words + 1 + 14 * 2, unicodestr);
        }
        f1 = fn->descript.req_f1;
        f2 = fn->descript.req_f2;
     } else {
        smb_fdata(ndo, words + 1,
                words + 1 + 14 * 2, unicodestr);
        }
        f1 = fn->descript.req_f1;
        f2 = fn->descript.req_f2;
     } else {
        smb_fdata(ndo, words + 1,

-           "TotParam=[d]\nTotData=[d]\nRes1=[w]\nParamCnt=[d]\nParamOff=[d]\nParamDisp[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nSetupCnt=[b][P1]\n",
+           "TotParam=[u]\nTotData=[u]\nRes1=[w]\nParamCnt=[u]\nParamOff=[u]\nParamDisp[u]\nDataCnt=[u]\nDataOff=[u]\nDataDisp=[u]\nSetupCnt=[b][P1]\n",

            words + 1 + 10 * 2, unicodestr);
        f1 = fn->descript.rep_f1;
        f2 = fn->descript.rep_f2;
     }
 
            words + 1 + 10 * 2, unicodestr);
        f1 = fn->descript.rep_f1;
        f2 = fn->descript.rep_f2;
     }
 

-    ND_TCHECK_2(dat);
-    bcc = EXTRACT_LE_U_2(dat);
-    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+    bcc = GET_LE_U_2(dat);
+    ND_PRINT("smb_bcc=%u\n", bcc);

     if (fn->descript.fn)
        (*fn->descript.fn)(ndo, param, data, pcnt, dcnt);
     else {
     if (fn->descript.fn)
        (*fn->descript.fn)(ndo, param, data, pcnt, dcnt);
     else {


@@ -234,31 +230,30 @@ print_trans2(netdissect_options *ndo,
     }
     return;
 trunc:
     }
     return;
 trunc:

-    ND_PRINT((ndo, "%s", tstr));
+    nd_print_trunc(ndo);

 }
 
 static void
 print_browse(netdissect_options *ndo,
 }
 
 static void
 print_browse(netdissect_options *ndo,

-             const u_char *param, int paramlen, const u_char *data, int datalen)
+             const u_char *param, u_int paramlen, const u_char *data, u_int datalen)

 {
     const u_char *maxbuf = data + datalen;
 {
     const u_char *maxbuf = data + datalen;

-    int command;
+    u_int command;

 
 

-    ND_TCHECK(data[0]);
-    command = data[0];
+    command = GET_U_1(data);

 
     smb_fdata(ndo, param, "BROWSE PACKET\n|Param ", param+paramlen, unicodestr);
 
     switch (command) {
     case 0xF:
        data = smb_fdata(ndo, data,
 
     smb_fdata(ndo, param, "BROWSE PACKET\n|Param ", param+paramlen, unicodestr);
 
     switch (command) {
     case 0xF:
        data = smb_fdata(ndo, data,

-           "BROWSE PACKET:\nType=[B] (LocalMasterAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[d]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nElectionVersion=[w]\nBrowserConstant=[w]\n",
+           "BROWSE PACKET:\nType=[B] (LocalMasterAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[u]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nElectionVersion=[w]\nBrowserConstant=[w]\n",

            maxbuf, unicodestr);
        break;
 
     case 0x1:
        data = smb_fdata(ndo, data,
            maxbuf, unicodestr);
        break;
 
     case 0x1:
        data = smb_fdata(ndo, data,

-           "BROWSE PACKET:\nType=[B] (HostAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[d]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nElectionVersion=[w]\nBrowserConstant=[w]\n",
+           "BROWSE PACKET:\nType=[B] (HostAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[u]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nElectionVersion=[w]\nBrowserConstant=[w]\n",

            maxbuf, unicodestr);
        break;
 
            maxbuf, unicodestr);
        break;
 


@@ -270,7 +265,7 @@ print_browse(netdissect_options *ndo,
 
     case 0xc:
        data = smb_fdata(ndo, data,
 
     case 0xc:
        data = smb_fdata(ndo, data,

-           "BROWSE PACKET:\nType=[B] (WorkgroupAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[d]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nCommentPointer=[W]\nServerName=[S]\n",
+           "BROWSE PACKET:\nType=[B] (WorkgroupAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[u]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nCommentPointer=[W]\nServerName=[S]\n",

            maxbuf, unicodestr);
        break;
 
            maxbuf, unicodestr);
        break;
 


@@ -313,15 +308,12 @@ print_browse(netdissect_options *ndo,
        data = smb_fdata(ndo, data, "Unknown Browser Frame ", maxbuf, unicodestr);
        break;
     }
        data = smb_fdata(ndo, data, "Unknown Browser Frame ", maxbuf, unicodestr);
        break;
     }

-    return;
-trunc:
-    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 static void
 print_ipc(netdissect_options *ndo,
 }
 
 
 static void
 print_ipc(netdissect_options *ndo,

-          const u_char *param, int paramlen, const u_char *data, int datalen)
+          const u_char *param, u_int paramlen, const u_char *data, u_int datalen)

 {
     if (paramlen)
        smb_fdata(ndo, param, "Command=[w]\nStr1=[S]\nStr2=[S]\n", param + paramlen,
 {
     if (paramlen)
        smb_fdata(ndo, param, "Command=[w]\nStr1=[S]\nStr2=[S]\n", param + paramlen,


@@ -339,57 +331,63 @@ print_trans(netdissect_options *ndo,
     const char *f1, *f2, *f3, *f4;
     const u_char *data, *param;
     const u_char *w = words + 1;
     const char *f1, *f2, *f3, *f4;
     const u_char *data, *param;
     const u_char *w = words + 1;

-    int datalen, paramlen;
+    u_int datalen, paramlen;

 
     if (request) {
        ND_TCHECK_2(w + (12 * 2));
 
     if (request) {
        ND_TCHECK_2(w + (12 * 2));

-       paramlen = EXTRACT_LE_U_2(w + 9 * 2);
-       param = buf + EXTRACT_LE_U_2(w + 10 * 2);
-       datalen = EXTRACT_LE_U_2(w + 11 * 2);
-       data = buf + EXTRACT_LE_U_2(w + 12 * 2);
-       f1 = "TotParamCnt=[d] \nTotDataCnt=[d] \nMaxParmCnt=[d] \nMaxDataCnt=[d]\nMaxSCnt=[d] \nTransFlags=[w] \nRes1=[w] \nRes2=[w] \nRes3=[w]\nParamCnt=[d] \nParamOff=[d] \nDataCnt=[d] \nDataOff=[d] \nSUCnt=[d]\n";
+       paramlen = GET_LE_U_2(w + 9 * 2);
+       param = buf + GET_LE_U_2(w + 10 * 2);
+       datalen = GET_LE_U_2(w + 11 * 2);
+       data = buf + GET_LE_U_2(w + 12 * 2);
+       f1 = "TotParamCnt=[u]\nTotDataCnt=[u]\nMaxParmCnt=[u]\nMaxDataCnt=[u]\nMaxSCnt=[u]\nTransFlags=[w]\nRes1=[w]\nRes2=[w]\nRes3=[w]\nParamCnt=[u]\nParamOff=[u]\nDataCnt=[u]\nDataOff=[u]\nSUCnt=[u]\n";

        f2 = "|Name=[S]\n";
        f3 = "|Param ";
        f4 = "|Data ";
     } else {
        ND_TCHECK_2(w + (7 * 2));
        f2 = "|Name=[S]\n";
        f3 = "|Param ";
        f4 = "|Data ";
     } else {
        ND_TCHECK_2(w + (7 * 2));

-       paramlen = EXTRACT_LE_U_2(w + 3 * 2);
-       param = buf + EXTRACT_LE_U_2(w + 4 * 2);
-       datalen = EXTRACT_LE_U_2(w + 6 * 2);
-       data = buf + EXTRACT_LE_U_2(w + 7 * 2);
-       f1 = "TotParamCnt=[d] \nTotDataCnt=[d] \nRes1=[d]\nParamCnt=[d] \nParamOff=[d] \nRes2=[d] \nDataCnt=[d] \nDataOff=[d] \nRes3=[d]\nLsetup=[d]\n";
+       paramlen = GET_LE_U_2(w + 3 * 2);
+       param = buf + GET_LE_U_2(w + 4 * 2);
+       datalen = GET_LE_U_2(w + 6 * 2);
+       data = buf + GET_LE_U_2(w + 7 * 2);
+       f1 = "TotParamCnt=[u]\nTotDataCnt=[u]\nRes1=[u]\nParamCnt=[u]\nParamOff=[u]\nRes2=[u]\nDataCnt=[u]\nDataOff=[u]\nRes3=[u]\nLsetup=[u]\n";

        f2 = "|Unknown ";
        f3 = "|Param ";
        f4 = "|Data ";
     }
 
        f2 = "|Unknown ";
        f3 = "|Param ";
        f4 = "|Data ";
     }
 

-    smb_fdata(ndo, words + 1, f1, min(words + 1 + 2 * words[0], maxbuf),
-        unicodestr);
+    smb_fdata(ndo, words + 1, f1,
+              ND_MIN(words + 1 + 2 * GET_U_1(words), maxbuf),
+              unicodestr);

 
 

-    ND_TCHECK_2(data1);
-    bcc = EXTRACT_LE_U_2(data1);
-    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+    bcc = GET_LE_U_2(data1);
+    ND_PRINT("smb_bcc=%u\n", bcc);

     if (bcc > 0) {
        smb_fdata(ndo, data1 + 2, f2, maxbuf - (paramlen + datalen), unicodestr);
 
     if (bcc > 0) {
        smb_fdata(ndo, data1 + 2, f2, maxbuf - (paramlen + datalen), unicodestr);
 

-       if (strcmp((const char *)(data1 + 2), "\\MAILSLOT\\BROWSE") == 0) {
+#define MAILSLOT_BROWSE_STR "\\MAILSLOT\\BROWSE"
+       ND_TCHECK_LEN(data1 + 2, strlen(MAILSLOT_BROWSE_STR) + 1);
+       if (strcmp((const char *)(data1 + 2), MAILSLOT_BROWSE_STR) == 0) {

            print_browse(ndo, param, paramlen, data, datalen);
            return;
        }
            print_browse(ndo, param, paramlen, data, datalen);
            return;
        }

+#undef MAILSLOT_BROWSE_STR

 
 

-       if (strcmp((const char *)(data1 + 2), "\\PIPE\\LANMAN") == 0) {
+#define PIPE_LANMAN_STR "\\PIPE\\LANMAN"
+       ND_TCHECK_LEN(data1 + 2, strlen(PIPE_LANMAN_STR) + 1);
+       if (strcmp((const char *)(data1 + 2), PIPE_LANMAN_STR) == 0) {

            print_ipc(ndo, param, paramlen, data, datalen);
            return;
        }
            print_ipc(ndo, param, paramlen, data, datalen);
            return;
        }

+#undef PIPE_LANMAN_STR

 
        if (paramlen)
 
        if (paramlen)

-           smb_fdata(ndo, param, f3, min(param + paramlen, maxbuf), unicodestr);
+           smb_fdata(ndo, param, f3, ND_MIN(param + paramlen, maxbuf), unicodestr);

        if (datalen)
        if (datalen)

-           smb_fdata(ndo, data, f4, min(data + datalen, maxbuf), unicodestr);
+           smb_fdata(ndo, data, f4, ND_MIN(data + datalen, maxbuf), unicodestr);

     }
     return;
 trunc:
     }
     return;
 trunc:

-    ND_PRINT((ndo, "%s", tstr));
+    nd_print_trunc(ndo);

 }
 
 
 }
 
 


@@ -400,39 +398,34 @@ print_negprot(netdissect_options *ndo,
     u_int wct, bcc;
     const char *f1 = NULL, *f2 = NULL;
 
     u_int wct, bcc;
     const char *f1 = NULL, *f2 = NULL;
 

-    ND_TCHECK(words[0]);
-    wct = words[0];
+    wct = GET_U_1(words);

     if (request)
        f2 = "*|Dialect=[Y]\n";
     else {
        if (wct == 1)
     if (request)
        f2 = "*|Dialect=[Y]\n";
     else {
        if (wct == 1)

-           f1 = "Core Protocol\nDialectIndex=[d]";
+           f1 = "Core Protocol\nDialectIndex=[u]";

        else if (wct == 17)
        else if (wct == 17)

-           f1 = "NT1 Protocol\nDialectIndex=[d]\nSecMode=[B]\nMaxMux=[d]\nNumVcs=[d]\nMaxBuffer=[D]\nRawSize=[D]\nSessionKey=[W]\nCapabilities=[W]\nServerTime=[T3]TimeZone=[d]\nCryptKey=";
+           f1 = "NT1 Protocol\nDialectIndex=[u]\nSecMode=[B]\nMaxMux=[u]\nNumVcs=[u]\nMaxBuffer=[U]\nRawSize=[U]\nSessionKey=[W]\nCapabilities=[W]\nServerTime=[T3]TimeZone=[u]\nCryptKey=";

        else if (wct == 13)
        else if (wct == 13)

-           f1 = "Coreplus/Lanman1/Lanman2 Protocol\nDialectIndex=[d]\nSecMode=[w]\nMaxXMit=[d]\nMaxMux=[d]\nMaxVcs=[d]\nBlkMode=[w]\nSessionKey=[W]\nServerTime=[T1]TimeZone=[d]\nRes=[W]\nCryptKey=";
+           f1 = "Coreplus/Lanman1/Lanman2 Protocol\nDialectIndex=[u]\nSecMode=[w]\nMaxXMit=[u]\nMaxMux=[u]\nMaxVcs=[u]\nBlkMode=[w]\nSessionKey=[W]\nServerTime=[T1]TimeZone=[u]\nRes=[W]\nCryptKey=";

     }
 
     if (f1)
     }
 
     if (f1)

-       smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf),
+       smb_fdata(ndo, words + 1, f1, ND_MIN(words + 1 + wct * 2, maxbuf),

            unicodestr);
     else
            unicodestr);
     else

-       smb_print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));
+       smb_data_print(ndo, words + 1, ND_MIN(wct * 2, ND_BYTES_BETWEEN(maxbuf, words + 1)));

 
 

-    ND_TCHECK_2(data);
-    bcc = EXTRACT_LE_U_2(data);
-    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+    bcc = GET_LE_U_2(data);
+    ND_PRINT("smb_bcc=%u\n", bcc);

     if (bcc > 0) {
        if (f2)
     if (bcc > 0) {
        if (f2)

-           smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
+           smb_fdata(ndo, data + 2, f2, ND_MIN(data + 2 + GET_LE_U_2(data),

                                              maxbuf), unicodestr);
        else
                                              maxbuf), unicodestr);
        else

-           smb_print_data(ndo, data + 2,
-                           min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
+           smb_data_print(ndo, data + 2,
+                           ND_MIN(GET_LE_U_2(data), ND_BYTES_BETWEEN(maxbuf, data + 2)));

     }
     }

-    return;
-trunc:
-    ND_PRINT((ndo, "%s", tstr));

 }
 
 static void
 }
 
 static void


@@ -442,42 +435,37 @@ print_sesssetup(netdissect_options *ndo,
     u_int wct, bcc;
     const char *f1 = NULL, *f2 = NULL;
 
     u_int wct, bcc;
     const char *f1 = NULL, *f2 = NULL;
 

-    ND_TCHECK(words[0]);
-    wct = words[0];
+    wct = GET_U_1(words);

     if (request) {
        if (wct == 10)
     if (request) {
        if (wct == 10)

-           f1 = "Com2=[w]\nOff2=[d]\nBufSize=[d]\nMpxMax=[d]\nVcNum=[d]\nSessionKey=[W]\nPassLen=[d]\nCryptLen=[d]\nCryptOff=[d]\nPass&Name=\n";
+           f1 = "Com2=[w]\nOff2=[u]\nBufSize=[u]\nMpxMax=[u]\nVcNum=[u]\nSessionKey=[W]\nPassLen=[u]\nCryptLen=[u]\nCryptOff=[u]\nPass&Name=\n";

        else
        else

-           f1 = "Com2=[B]\nRes1=[B]\nOff2=[d]\nMaxBuffer=[d]\nMaxMpx=[d]\nVcNumber=[d]\nSessionKey=[W]\nCaseInsensitivePasswordLength=[d]\nCaseSensitivePasswordLength=[d]\nRes=[W]\nCapabilities=[W]\nPass1&Pass2&Account&Domain&OS&LanMan=\n";
+           f1 = "Com2=[B]\nRes1=[B]\nOff2=[u]\nMaxBuffer=[u]\nMaxMpx=[u]\nVcNumber=[u]\nSessionKey=[W]\nCaseInsensitivePasswordLength=[u]\nCaseSensitivePasswordLength=[u]\nRes=[W]\nCapabilities=[W]\nPass1&Pass2&Account&Domain&OS&LanMan=\n";

     } else {
        if (wct == 3) {
     } else {
        if (wct == 3) {

-           f1 = "Com2=[w]\nOff2=[d]\nAction=[w]\n";
+           f1 = "Com2=[w]\nOff2=[u]\nAction=[w]\n";

        } else if (wct == 13) {
        } else if (wct == 13) {

-           f1 = "Com2=[B]\nRes=[B]\nOff2=[d]\nAction=[w]\n";
+           f1 = "Com2=[B]\nRes=[B]\nOff2=[u]\nAction=[w]\n";

            f2 = "NativeOS=[S]\nNativeLanMan=[S]\nPrimaryDomain=[S]\n";
        }
     }
 
     if (f1)
            f2 = "NativeOS=[S]\nNativeLanMan=[S]\nPrimaryDomain=[S]\n";
        }
     }
 
     if (f1)

-       smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf),
+       smb_fdata(ndo, words + 1, f1, ND_MIN(words + 1 + wct * 2, maxbuf),

            unicodestr);
     else
            unicodestr);
     else

-       smb_print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));
+       smb_data_print(ndo, words + 1, ND_MIN(wct * 2, ND_BYTES_BETWEEN(maxbuf, words + 1)));

 
 

-    ND_TCHECK_2(data);
-    bcc = EXTRACT_LE_U_2(data);
-    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+    bcc = GET_LE_U_2(data);
+    ND_PRINT("smb_bcc=%u\n", bcc);

     if (bcc > 0) {
        if (f2)
     if (bcc > 0) {
        if (f2)

-           smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
+           smb_fdata(ndo, data + 2, f2, ND_MIN(data + 2 + GET_LE_U_2(data),

                                              maxbuf), unicodestr);
        else
                                              maxbuf), unicodestr);
        else

-           smb_print_data(ndo, data + 2,
-                           min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
+           smb_data_print(ndo, data + 2,
+                           ND_MIN(GET_LE_U_2(data), ND_BYTES_BETWEEN(maxbuf, data + 2)));

     }
     }

-    return;
-trunc:
-    ND_PRINT((ndo, "%s", tstr));

 }
 
 static void
 }
 
 static void


@@ -488,37 +476,31 @@ print_lockingandx(netdissect_options *ndo,
     const u_char *maxwords;
     const char *f1 = NULL, *f2 = NULL;
 
     const u_char *maxwords;
     const char *f1 = NULL, *f2 = NULL;
 

-    ND_TCHECK(words[0]);
-    wct = words[0];
+    wct = GET_U_1(words);

     if (request) {
     if (request) {

-       f1 = "Com2=[w]\nOff2=[d]\nHandle=[d]\nLockType=[w]\nTimeOut=[D]\nUnlockCount=[d]\nLockCount=[d]\n";
-       ND_TCHECK(words[7]);
-       if (words[7] & 0x10)
-           f2 = "*Process=[d]\n[P2]Offset=[M]\nLength=[M]\n";
+       f1 = "Com2=[w]\nOff2=[u]\nHandle=[u]\nLockType=[w]\nTimeOut=[D]\nUnlockCount=[u]\nLockCount=[u]\n";
+       if (GET_U_1(words + 7) & 0x10)
+           f2 = "*Process=[u]\n[P2]Offset=[M]\nLength=[M]\n";

        else
        else

-           f2 = "*Process=[d]\nOffset=[D]\nLength=[D]\n";
+           f2 = "*Process=[u]\nOffset=[D]\nLength=[U]\n";

     } else {
     } else {

-       f1 = "Com2=[w]\nOff2=[d]\n";
+       f1 = "Com2=[w]\nOff2=[u]\n";

     }
 
     }
 

-    maxwords = min(words + 1 + wct * 2, maxbuf);
+    maxwords = ND_MIN(words + 1 + wct * 2, maxbuf);

     if (wct)
        smb_fdata(ndo, words + 1, f1, maxwords, unicodestr);
 
     if (wct)
        smb_fdata(ndo, words + 1, f1, maxwords, unicodestr);
 

-    ND_TCHECK_2(data);
-    bcc = EXTRACT_LE_U_2(data);
-    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+    bcc = GET_LE_U_2(data);
+    ND_PRINT("smb_bcc=%u\n", bcc);

     if (bcc > 0) {
        if (f2)
     if (bcc > 0) {
        if (f2)

-           smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
+           smb_fdata(ndo, data + 2, f2, ND_MIN(data + 2 + GET_LE_U_2(data),

                                              maxbuf), unicodestr);
        else
                                              maxbuf), unicodestr);
        else

-           smb_print_data(ndo, data + 2,
-                           min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
+           smb_data_print(ndo, data + 2,
+                           ND_MIN(GET_LE_U_2(data), ND_BYTES_BETWEEN(maxbuf, data + 2)));

     }
     }

-    return;
-trunc:
-    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 }
 
 


@@ -527,7 +509,7 @@ static const struct smbfns smb_fns[] = {
 
     { SMBtcon, "SMBtcon", 0,
        { NULL, "Path=[Z]\nPassword=[Z]\nDevice=[Z]\n",
 
     { SMBtcon, "SMBtcon", 0,
        { NULL, "Path=[Z]\nPassword=[Z]\nDevice=[Z]\n",

-         "MaxXmit=[d]\nTreeId=[d]\n", NULL,
+         "MaxXmit=[u]\nTreeId=[u]\n", NULL,

          NULL } },
 
     { SMBtdis, "SMBtdis", 0, DEFDESCRIPT },
          NULL } },
 
     { SMBtdis, "SMBtdis", 0, DEFDESCRIPT },


@@ -535,15 +517,15 @@ static const struct smbfns smb_fns[] = {
     { SMBioctl, "SMBioctl", 0, DEFDESCRIPT },
 
     { SMBecho, "SMBecho", 0,
     { SMBioctl, "SMBioctl", 0, DEFDESCRIPT },
 
     { SMBecho, "SMBecho", 0,

-       { "ReverbCount=[d]\n", NULL,
-         "SequenceNum=[d]\n", NULL,
+       { "ReverbCount=[u]\n", NULL,
+         "SequenceNum=[u]\n", NULL,

          NULL } },
 
     { SMBulogoffX, "SMBulogoffX", FLG_CHAIN, DEFDESCRIPT },
 
     { SMBgetatr, "SMBgetatr", 0,
        { NULL, "Path=[Z]\n",
          NULL } },
 
     { SMBulogoffX, "SMBulogoffX", FLG_CHAIN, DEFDESCRIPT },
 
     { SMBgetatr, "SMBgetatr", 0,
        { NULL, "Path=[Z]\n",

-         "Attribute=[A]\nTime=[T2]Size=[D]\nRes=([w,w,w,w,w])\n", NULL,
+         "Attribute=[A]\nTime=[T2]Size=[U]\nRes=([w,w,w,w,w])\n", NULL,

          NULL } },
 
     { SMBsetatr, "SMBsetatr", 0,
          NULL } },
 
     { SMBsetatr, "SMBsetatr", 0,


@@ -554,36 +536,36 @@ static const struct smbfns smb_fns[] = {
        { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
 
     { SMBsearch, "SMBsearch", 0,
        { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
 
     { SMBsearch, "SMBsearch", 0,

-       { "Count=[d]\nAttrib=[A]\n",
-         "Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\n",
-         "Count=[d]\n",
-         "BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",
+       { "Count=[u]\nAttrib=[A]\n",
+         "Path=[Z]\nBlkType=[B]\nBlkLen=[u]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[u]\nSrv2=[w]\nRes2=[W]\n",
+         "Count=[u]\n",
+         "BlkType=[B]\nBlkLen=[u]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[u]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[U]\nName=[s13]\n",

          NULL } },
 
     { SMBopen, "SMBopen", 0,
        { "Mode=[w]\nAttribute=[A]\n", "Path=[Z]\n",
          NULL } },
 
     { SMBopen, "SMBopen", 0,
        { "Mode=[w]\nAttribute=[A]\n", "Path=[Z]\n",

-         "Handle=[d]\nOAttrib=[A]\nTime=[T2]Size=[D]\nAccess=[w]\n",
+         "Handle=[u]\nOAttrib=[A]\nTime=[T2]Size=[U]\nAccess=[w]\n",

          NULL, NULL } },
 
     { SMBcreate, "SMBcreate", 0,
          NULL, NULL } },
 
     { SMBcreate, "SMBcreate", 0,

-       { "Attrib=[A]\nTime=[T2]", "Path=[Z]\n", "Handle=[d]\n", NULL, NULL } },
+       { "Attrib=[A]\nTime=[T2]", "Path=[Z]\n", "Handle=[u]\n", NULL, NULL } },

 
     { SMBmknew, "SMBmknew", 0,
 
     { SMBmknew, "SMBmknew", 0,

-       { "Attrib=[A]\nTime=[T2]", "Path=[Z]\n", "Handle=[d]\n", NULL, NULL } },
+       { "Attrib=[A]\nTime=[T2]", "Path=[Z]\n", "Handle=[u]\n", NULL, NULL } },

 
     { SMBunlink, "SMBunlink", 0,
        { "Attrib=[A]\n", "Path=[Z]\n", NULL, NULL, NULL } },
 
     { SMBread, "SMBread", 0,
 
     { SMBunlink, "SMBunlink", 0,
        { "Attrib=[A]\n", "Path=[Z]\n", NULL, NULL, NULL } },
 
     { SMBread, "SMBread", 0,

-       { "Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n", NULL,
-         "Count=[d]\nRes=([w,w,w,w])\n", NULL, NULL } },
+       { "Handle=[u]\nByteCount=[u]\nOffset=[D]\nCountLeft=[u]\n", NULL,
+         "Count=[u]\nRes=([w,w,w,w])\n", NULL, NULL } },

 
     { SMBwrite, "SMBwrite", 0,
 
     { SMBwrite, "SMBwrite", 0,

-       { "Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n", NULL,
-         "Count=[d]\n", NULL, NULL } },
+       { "Handle=[u]\nByteCount=[u]\nOffset=[D]\nCountLeft=[u]\n", NULL,
+         "Count=[u]\n", NULL, NULL } },

 
     { SMBclose, "SMBclose", 0,
 
     { SMBclose, "SMBclose", 0,

-       { "Handle=[d]\nTime=[T2]", NULL, NULL, NULL, NULL } },
+       { "Handle=[u]\nTime=[T2]", NULL, NULL, NULL, NULL } },

 
     { SMBmkdir, "SMBmkdir", 0,
        { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
 
     { SMBmkdir, "SMBmkdir", 0,
        { NULL, "Path=[Z]\n", NULL, NULL, NULL } },


@@ -593,7 +575,7 @@ static const struct smbfns smb_fns[] = {
 
     { SMBdskattr, "SMBdskattr", 0,
        { NULL, NULL,
 
     { SMBdskattr, "SMBdskattr", 0,
        { NULL, NULL,

-         "TotalUnits=[d]\nBlocksPerUnit=[d]\nBlockSize=[d]\nFreeUnits=[d]\nMedia=[w]\n",
+         "TotalUnits=[u]\nBlocksPerUnit=[u]\nBlockSize=[u]\nFreeUnits=[u]\nMedia=[w]\n",

          NULL, NULL } },
 
     { SMBmv, "SMBmv", 0,
          NULL, NULL } },
 
     { SMBmv, "SMBmv", 0,


@@ -606,147 +588,147 @@ static const struct smbfns smb_fns[] = {
     { pSETDIR, "SMBsetdir", 0, { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
 
     { SMBlseek, "SMBlseek", 0,
     { pSETDIR, "SMBsetdir", 0, { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
 
     { SMBlseek, "SMBlseek", 0,

-       { "Handle=[d]\nMode=[w]\nOffset=[D]\n", "Offset=[D]\n", NULL, NULL, NULL } },
+       { "Handle=[u]\nMode=[w]\nOffset=[D]\n", "Offset=[D]\n", NULL, NULL, NULL } },

 
 

-    { SMBflush, "SMBflush", 0, { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
+    { SMBflush, "SMBflush", 0, { "Handle=[u]\n", NULL, NULL, NULL, NULL } },

 
     { SMBsplopen, "SMBsplopen", 0,
 
     { SMBsplopen, "SMBsplopen", 0,

-       { "SetupLen=[d]\nMode=[w]\n", "Ident=[Z]\n", "Handle=[d]\n",
+       { "SetupLen=[u]\nMode=[w]\n", "Ident=[Z]\n", "Handle=[u]\n",

          NULL, NULL } },
 
     { SMBsplclose, "SMBsplclose", 0,
          NULL, NULL } },
 
     { SMBsplclose, "SMBsplclose", 0,

-       { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
+       { "Handle=[u]\n", NULL, NULL, NULL, NULL } },

 
     { SMBsplretq, "SMBsplretq", 0,
 
     { SMBsplretq, "SMBsplretq", 0,

-       { "MaxCount=[d]\nStartIndex=[d]\n", NULL,
-         "Count=[d]\nIndex=[d]\n",
-         "*Time=[T2]Status=[B]\nJobID=[d]\nSize=[D]\nRes=[B]Name=[s16]\n",
+       { "MaxCount=[u]\nStartIndex=[u]\n", NULL,
+         "Count=[u]\nIndex=[u]\n",
+         "*Time=[T2]Status=[B]\nJobID=[u]\nSize=[U]\nRes=[B]Name=[s16]\n",

          NULL } },
 
     { SMBsplwr, "SMBsplwr", 0,
          NULL } },
 
     { SMBsplwr, "SMBsplwr", 0,

-       { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
+       { "Handle=[u]\n", NULL, NULL, NULL, NULL } },

 
     { SMBlock, "SMBlock", 0,
 
     { SMBlock, "SMBlock", 0,

-       { "Handle=[d]\nCount=[D]\nOffset=[D]\n", NULL, NULL, NULL, NULL } },
+       { "Handle=[u]\nCount=[U]\nOffset=[D]\n", NULL, NULL, NULL, NULL } },

 
     { SMBunlock, "SMBunlock", 0,
 
     { SMBunlock, "SMBunlock", 0,

-       { "Handle=[d]\nCount=[D]\nOffset=[D]\n", NULL, NULL, NULL, NULL } },
+       { "Handle=[u]\nCount=[U]\nOffset=[D]\n", NULL, NULL, NULL, NULL } },

 
     /* CORE+ PROTOCOL FOLLOWS */
 
     { SMBreadbraw, "SMBreadbraw", 0,
 
     /* CORE+ PROTOCOL FOLLOWS */
 
     { SMBreadbraw, "SMBreadbraw", 0,

-       { "Handle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nRes=[d]\n",
+       { "Handle=[u]\nOffset=[D]\nMaxCount=[u]\nMinCount=[u]\nTimeOut=[D]\nRes=[u]\n",

          NULL, NULL, NULL, NULL } },
 
     { SMBwritebraw, "SMBwritebraw", 0,
          NULL, NULL, NULL, NULL } },
 
     { SMBwritebraw, "SMBwritebraw", 0,

-       { "Handle=[d]\nTotalCount=[d]\nRes=[w]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nRes2=[W]\n|DataSize=[d]\nDataOff=[d]\n",
+       { "Handle=[u]\nTotalCount=[u]\nRes=[w]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nRes2=[W]\n|DataSize=[u]\nDataOff=[u]\n",

          NULL, "WriteRawAck", NULL, NULL } },
 
     { SMBwritec, "SMBwritec", 0,
          NULL, "WriteRawAck", NULL, NULL } },
 
     { SMBwritec, "SMBwritec", 0,

-       { NULL, NULL, "Count=[d]\n", NULL, NULL } },
+       { NULL, NULL, "Count=[u]\n", NULL, NULL } },

 
     { SMBwriteclose, "SMBwriteclose", 0,
 
     { SMBwriteclose, "SMBwriteclose", 0,

-       { "Handle=[d]\nCount=[d]\nOffset=[D]\nTime=[T2]Res=([w,w,w,w,w,w])",
-         NULL, "Count=[d]\n", NULL, NULL } },
+       { "Handle=[u]\nCount=[u]\nOffset=[D]\nTime=[T2]Res=([w,w,w,w,w,w])",
+         NULL, "Count=[u]\n", NULL, NULL } },

 
     { SMBlockread, "SMBlockread", 0,
 
     { SMBlockread, "SMBlockread", 0,

-       { "Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n", NULL,
-         "Count=[d]\nRes=([w,w,w,w])\n", NULL, NULL } },
+       { "Handle=[u]\nByteCount=[u]\nOffset=[D]\nCountLeft=[u]\n", NULL,
+         "Count=[u]\nRes=([w,w,w,w])\n", NULL, NULL } },

 
     { SMBwriteunlock, "SMBwriteunlock", 0,
 
     { SMBwriteunlock, "SMBwriteunlock", 0,

-       { "Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n", NULL,
-         "Count=[d]\n", NULL, NULL } },
+       { "Handle=[u]\nByteCount=[u]\nOffset=[D]\nCountLeft=[u]\n", NULL,
+         "Count=[u]\n", NULL, NULL } },

 
     { SMBreadBmpx, "SMBreadBmpx", 0,
 
     { SMBreadBmpx, "SMBreadBmpx", 0,

-       { "Handle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nRes=[w]\n",
+       { "Handle=[u]\nOffset=[D]\nMaxCount=[u]\nMinCount=[u]\nTimeOut=[D]\nRes=[w]\n",

          NULL,
          NULL,

-         "Offset=[D]\nTotCount=[d]\nRemaining=[d]\nRes=([w,w])\nDataSize=[d]\nDataOff=[d]\n",
+         "Offset=[D]\nTotCount=[u]\nRemaining=[u]\nRes=([w,w])\nDataSize=[u]\nDataOff=[u]\n",

          NULL, NULL } },
 
     { SMBwriteBmpx, "SMBwriteBmpx", 0,
          NULL, NULL } },
 
     { SMBwriteBmpx, "SMBwriteBmpx", 0,

-       { "Handle=[d]\nTotCount=[d]\nRes=[w]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nRes2=[W]\nDataSize=[d]\nDataOff=[d]\n", NULL,
-         "Remaining=[d]\n", NULL, NULL } },
+       { "Handle=[u]\nTotCount=[u]\nRes=[w]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nRes2=[W]\nDataSize=[u]\nDataOff=[u]\n", NULL,
+         "Remaining=[u]\n", NULL, NULL } },

 
     { SMBwriteBs, "SMBwriteBs", 0,
 
     { SMBwriteBs, "SMBwriteBs", 0,

-       { "Handle=[d]\nTotCount=[d]\nOffset=[D]\nRes=[W]\nDataSize=[d]\nDataOff=[d]\n",
-         NULL, "Count=[d]\n", NULL, NULL } },
+       { "Handle=[u]\nTotCount=[u]\nOffset=[D]\nRes=[W]\nDataSize=[u]\nDataOff=[u]\n",
+         NULL, "Count=[u]\n", NULL, NULL } },

 
     { SMBsetattrE, "SMBsetattrE", 0,
 
     { SMBsetattrE, "SMBsetattrE", 0,

-       { "Handle=[d]\nCreationTime=[T2]AccessTime=[T2]ModifyTime=[T2]", NULL,
+       { "Handle=[u]\nCreationTime=[T2]AccessTime=[T2]ModifyTime=[T2]", NULL,

          NULL, NULL, NULL } },
 
     { SMBgetattrE, "SMBgetattrE", 0,
          NULL, NULL, NULL } },
 
     { SMBgetattrE, "SMBgetattrE", 0,

-       { "Handle=[d]\n", NULL,
-         "CreationTime=[T2]AccessTime=[T2]ModifyTime=[T2]Size=[D]\nAllocSize=[D]\nAttribute=[A]\n",
+       { "Handle=[u]\n", NULL,
+         "CreationTime=[T2]AccessTime=[T2]ModifyTime=[T2]Size=[U]\nAllocSize=[U]\nAttribute=[A]\n",

          NULL, NULL } },
 
     { SMBtranss, "SMBtranss", 0, DEFDESCRIPT },
     { SMBioctls, "SMBioctls", 0, DEFDESCRIPT },
 
     { SMBcopy, "SMBcopy", 0,
          NULL, NULL } },
 
     { SMBtranss, "SMBtranss", 0, DEFDESCRIPT },
     { SMBioctls, "SMBioctls", 0, DEFDESCRIPT },
 
     { SMBcopy, "SMBcopy", 0,

-       { "TreeID2=[d]\nOFun=[w]\nFlags=[w]\n", "Path=[S]\nNewPath=[S]\n",
-         "CopyCount=[d]\n",  "|ErrStr=[S]\n",  NULL } },
+       { "TreeID2=[u]\nOFun=[w]\nFlags=[w]\n", "Path=[S]\nNewPath=[S]\n",
+         "CopyCount=[u]\n",  "|ErrStr=[S]\n",  NULL } },

 
     { SMBmove, "SMBmove", 0,
 
     { SMBmove, "SMBmove", 0,

-       { "TreeID2=[d]\nOFun=[w]\nFlags=[w]\n", "Path=[S]\nNewPath=[S]\n",
-         "MoveCount=[d]\n",  "|ErrStr=[S]\n",  NULL } },
+       { "TreeID2=[u]\nOFun=[w]\nFlags=[w]\n", "Path=[S]\nNewPath=[S]\n",
+         "MoveCount=[u]\n",  "|ErrStr=[S]\n",  NULL } },

 
     { SMBopenX, "SMBopenX", FLG_CHAIN,
 
     { SMBopenX, "SMBopenX", FLG_CHAIN,

-       { "Com2=[w]\nOff2=[d]\nFlags=[w]\nMode=[w]\nSearchAttrib=[A]\nAttrib=[A]\nTime=[T2]OFun=[w]\nSize=[D]\nTimeOut=[D]\nRes=[W]\n",
+       { "Com2=[w]\nOff2=[u]\nFlags=[w]\nMode=[w]\nSearchAttrib=[A]\nAttrib=[A]\nTime=[T2]OFun=[w]\nSize=[U]\nTimeOut=[D]\nRes=[W]\n",

          "Path=[S]\n",
          "Path=[S]\n",

-         "Com2=[w]\nOff2=[d]\nHandle=[d]\nAttrib=[A]\nTime=[T2]Size=[D]\nAccess=[w]\nType=[w]\nState=[w]\nAction=[w]\nFileID=[W]\nRes=[w]\n",
+         "Com2=[w]\nOff2=[u]\nHandle=[u]\nAttrib=[A]\nTime=[T2]Size=[U]\nAccess=[w]\nType=[w]\nState=[w]\nAction=[w]\nFileID=[W]\nRes=[w]\n",

          NULL, NULL } },
 
     { SMBreadX, "SMBreadX", FLG_CHAIN,
          NULL, NULL } },
 
     { SMBreadX, "SMBreadX", FLG_CHAIN,

-       { "Com2=[w]\nOff2=[d]\nHandle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nCountLeft=[d]\n",
+       { "Com2=[w]\nOff2=[u]\nHandle=[u]\nOffset=[D]\nMaxCount=[u]\nMinCount=[u]\nTimeOut=[D]\nCountLeft=[u]\n",

          NULL,
          NULL,

-         "Com2=[w]\nOff2=[d]\nRemaining=[d]\nRes=[W]\nDataSize=[d]\nDataOff=[d]\nRes=([w,w,w,w])\n",
+         "Com2=[w]\nOff2=[u]\nRemaining=[u]\nRes=[W]\nDataSize=[u]\nDataOff=[u]\nRes=([w,w,w,w])\n",

          NULL, NULL } },
 
     { SMBwriteX, "SMBwriteX", FLG_CHAIN,
          NULL, NULL } },
 
     { SMBwriteX, "SMBwriteX", FLG_CHAIN,

-       { "Com2=[w]\nOff2=[d]\nHandle=[d]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nCountLeft=[d]\nRes=[w]\nDataSize=[d]\nDataOff=[d]\n",
+       { "Com2=[w]\nOff2=[u]\nHandle=[u]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nCountLeft=[u]\nRes=[w]\nDataSize=[u]\nDataOff=[u]\n",

          NULL,
          NULL,

-         "Com2=[w]\nOff2=[d]\nCount=[d]\nRemaining=[d]\nRes=[W]\n",
+         "Com2=[w]\nOff2=[u]\nCount=[u]\nRemaining=[u]\nRes=[W]\n",

          NULL, NULL } },
 
     { SMBffirst, "SMBffirst", 0,
          NULL, NULL } },
 
     { SMBffirst, "SMBffirst", 0,

-       { "Count=[d]\nAttrib=[A]\n",
-         "Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
-         "Count=[d]\n",
-         "BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",
+       { "Count=[u]\nAttrib=[A]\n",
+         "Path=[Z]\nBlkType=[B]\nBlkLen=[u]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[u]\nSrv2=[w]\n",
+         "Count=[u]\n",
+         "BlkType=[B]\nBlkLen=[u]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[u]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[U]\nName=[s13]\n",

          NULL } },
 
     { SMBfunique, "SMBfunique", 0,
          NULL } },
 
     { SMBfunique, "SMBfunique", 0,

-       { "Count=[d]\nAttrib=[A]\n",
-         "Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
-         "Count=[d]\n",
-         "BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",
+       { "Count=[u]\nAttrib=[A]\n",
+         "Path=[Z]\nBlkType=[B]\nBlkLen=[u]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[u]\nSrv2=[w]\n",
+         "Count=[u]\n",
+         "BlkType=[B]\nBlkLen=[u]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[u]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[U]\nName=[s13]\n",

          NULL } },
 
     { SMBfclose, "SMBfclose", 0,
          NULL } },
 
     { SMBfclose, "SMBfclose", 0,

-       { "Count=[d]\nAttrib=[A]\n",
-         "Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
-         "Count=[d]\n",
-         "BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",
+       { "Count=[u]\nAttrib=[A]\n",
+         "Path=[Z]\nBlkType=[B]\nBlkLen=[u]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[u]\nSrv2=[w]\n",
+         "Count=[u]\n",
+         "BlkType=[B]\nBlkLen=[u]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[u]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[U]\nName=[s13]\n",

          NULL } },
 
     { SMBfindnclose, "SMBfindnclose", 0,
          NULL } },
 
     { SMBfindnclose, "SMBfindnclose", 0,

-       { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
+       { "Handle=[u]\n", NULL, NULL, NULL, NULL } },

 
     { SMBfindclose, "SMBfindclose", 0,
 
     { SMBfindclose, "SMBfindclose", 0,

-       { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
+       { "Handle=[u]\n", NULL, NULL, NULL, NULL } },

 
     { SMBsends, "SMBsends", 0,
        { NULL, "Source=[Z]\nDest=[Z]\n", NULL, NULL, NULL } },
 
     { SMBsendstrt, "SMBsendstrt", 0,
 
     { SMBsends, "SMBsends", 0,
        { NULL, "Source=[Z]\nDest=[Z]\n", NULL, NULL, NULL } },
 
     { SMBsendstrt, "SMBsendstrt", 0,

-       { NULL, "Source=[Z]\nDest=[Z]\n", "GroupID=[d]\n", NULL, NULL } },
+       { NULL, "Source=[Z]\nDest=[Z]\n", "GroupID=[u]\n", NULL, NULL } },

 
     { SMBsendend, "SMBsendend", 0,
 
     { SMBsendend, "SMBsendend", 0,

-       { "GroupID=[d]\n", NULL, NULL, NULL, NULL } },
+       { "GroupID=[u]\n", NULL, NULL, NULL, NULL } },

 
     { SMBsendtxt, "SMBsendtxt", 0,
 
     { SMBsendtxt, "SMBsendtxt", 0,

-       { "GroupID=[d]\n", NULL, NULL, NULL, NULL } },
+       { "GroupID=[u]\n", NULL, NULL, NULL, NULL } },

 
     { SMBsendb, "SMBsendb", 0,
        { NULL, "Source=[Z]\nDest=[Z]\n", NULL, NULL, NULL } },
 
     { SMBsendb, "SMBsendb", 0,
        { NULL, "Source=[Z]\nDest=[Z]\n", NULL, NULL, NULL } },


@@ -762,8 +744,8 @@ static const struct smbfns smb_fns[] = {
        { NULL, NULL, NULL, NULL, print_sesssetup } },
 
     { SMBtconX, "SMBtconX", FLG_CHAIN,
        { NULL, NULL, NULL, NULL, print_sesssetup } },
 
     { SMBtconX, "SMBtconX", FLG_CHAIN,

-       { "Com2=[w]\nOff2=[d]\nFlags=[w]\nPassLen=[d]\nPasswd&Path&Device=\n",
-         NULL, "Com2=[w]\nOff2=[d]\n", "ServiceType=[R]\n", NULL } },
+       { "Com2=[w]\nOff2=[u]\nFlags=[w]\nPassLen=[u]\nPasswd&Path&Device=\n",
+         NULL, "Com2=[w]\nOff2=[u]\n", "ServiceType=[R]\n", NULL } },

 
     { SMBlockingX, "SMBlockingX", FLG_CHAIN,
        { NULL, NULL, NULL, NULL, print_lockingandx } },
 
     { SMBlockingX, "SMBlockingX", FLG_CHAIN,
        { NULL, NULL, NULL, NULL, print_lockingandx } },


@@ -779,9 +761,9 @@ static const struct smbfns smb_fns[] = {
     { SMBnttranss, "SMBnttranss", 0, DEFDESCRIPT },
 
     { SMBntcreateX, "SMBntcreateX", FLG_CHAIN,
     { SMBnttranss, "SMBnttranss", 0, DEFDESCRIPT },
 
     { SMBntcreateX, "SMBntcreateX", FLG_CHAIN,

-       { "Com2=[w]\nOff2=[d]\nRes=[b]\nNameLen=[ld]\nFlags=[W]\nRootDirectoryFid=[D]\nAccessMask=[W]\nAllocationSize=[L]\nExtFileAttributes=[W]\nShareAccess=[W]\nCreateDisposition=[W]\nCreateOptions=[W]\nImpersonationLevel=[W]\nSecurityFlags=[b]\n",
+       { "Com2=[w]\nOff2=[u]\nRes=[b]\nNameLen=[lu]\nFlags=[W]\nRootDirectoryFid=[U]\nAccessMask=[W]\nAllocationSize=[L]\nExtFileAttributes=[W]\nShareAccess=[W]\nCreateDisposition=[W]\nCreateOptions=[W]\nImpersonationLevel=[W]\nSecurityFlags=[b]\n",

          "Path=[C]\n",
          "Path=[C]\n",

-         "Com2=[w]\nOff2=[d]\nOplockLevel=[b]\nFid=[d]\nCreateAction=[W]\nCreateTime=[T3]LastAccessTime=[T3]LastWriteTime=[T3]ChangeTime=[T3]ExtFileAttributes=[W]\nAllocationSize=[L]\nEndOfFile=[L]\nFileType=[w]\nDeviceState=[w]\nDirectory=[b]\n",
+         "Com2=[w]\nOff2=[u]\nOplockLevel=[b]\nFid=[u]\nCreateAction=[W]\nCreateTime=[T3]LastAccessTime=[T3]LastWriteTime=[T3]ChangeTime=[T3]ExtFileAttributes=[W]\nAllocationSize=[L]\nEndOfFile=[L]\nFileType=[w]\nDeviceState=[w]\nDirectory=[b]\n",

          NULL, NULL } },
 
     { SMBntcancel, "SMBntcancel", 0, DEFDESCRIPT },
          NULL, NULL } },
 
     { SMBntcancel, "SMBntcancel", 0, DEFDESCRIPT },


@@ -798,33 +780,34 @@ print_smb(netdissect_options *ndo,
           const u_char *buf, const u_char *maxbuf)
 {
     uint16_t flags2;
           const u_char *buf, const u_char *maxbuf)
 {
     uint16_t flags2;

-    int nterrcodes;
-    int command;
+    u_int nterrcodes;
+    u_int command;

     uint32_t nterror;
     const u_char *words, *maxwords, *data;
     const struct smbfns *fn;
     const char *fmt_smbheader =
     uint32_t nterror;
     const u_char *words, *maxwords, *data;
     const struct smbfns *fn;
     const char *fmt_smbheader =

-        "[P4]SMB Command   =  [B]\nError class   =  [BP1]\nError code    =  [d]\nFlags1        =  [B]\nFlags2        =  [B][P13]\nTree ID       =  [d]\nProc ID       =  [d]\nUID           =  [d]\nMID           =  [d]\nWord Count    =  [b]\n";
-    int smboffset;
+        "[P4]SMB Command   =  [B]\nError class   =  [BP1]\nError code    =  [u]\nFlags1        =  [B]\nFlags2        =  [B][P13]\nTree ID       =  [u]\nProc ID       =  [u]\nUID           =  [u]\nMID           =  [u]\nWord Count    =  [b]\n";
+    u_int smboffset;
+
+    ndo->ndo_protocol = "smb";

 
 

-    ND_TCHECK(buf[9]);
-    request = (buf[9] & 0x80) ? 0 : 1;
+    request = (GET_U_1(buf + 9) & 0x80) ? 0 : 1;

     startbuf = buf;
 
     startbuf = buf;
 

-    command = buf[4];
+    command = GET_U_1(buf + 4);

 
     fn = smbfind(command, smb_fns);
 
     if (ndo->ndo_vflag > 1)
 
     fn = smbfind(command, smb_fns);
 
     if (ndo->ndo_vflag > 1)

-       ND_PRINT((ndo, "\n"));
+       ND_PRINT("\n");

 
 

-    ND_PRINT((ndo, "SMB PACKET: %s (%s)\n", fn->name, request ? "REQUEST" : "REPLY"));
+    ND_PRINT("SMB PACKET: %s (%s)", fn->name, request ? "REQUEST" : "REPLY");

 
     if (ndo->ndo_vflag < 2)
        return;
 
 
     if (ndo->ndo_vflag < 2)
        return;
 

-    ND_TCHECK_2(buf + 10);
-    flags2 = EXTRACT_LE_U_2(buf + 10);
+    ND_PRINT("\n");
+    flags2 = GET_LE_U_2(buf + 10);

     unicodestr = flags2 & 0x8000;
     nterrcodes = flags2 & 0x4000;
 
     unicodestr = flags2 & 0x8000;
     nterrcodes = flags2 & 0x4000;
 


@@ -832,13 +815,13 @@ print_smb(netdissect_options *ndo,
     smb_fdata(ndo, buf, fmt_smbheader, buf + 33, unicodestr);
 
     if (nterrcodes) {
     smb_fdata(ndo, buf, fmt_smbheader, buf + 33, unicodestr);
 
     if (nterrcodes) {

-       nterror = EXTRACT_LE_U_4(buf + 5);
+       nterror = GET_LE_U_4(buf + 5);

        if (nterror)
        if (nterror)

-           ND_PRINT((ndo, "NTError = %s\n", nt_errstr(nterror)));
+           ND_PRINT("NTError = %s\n", nt_errstr(nterror));

     } else {
     } else {

-       if (EXTRACT_U_1(buf + 5))
-           ND_PRINT((ndo, "SMBError = %s\n", smb_errstr(EXTRACT_U_1(buf + 5),
-                     EXTRACT_LE_U_2(buf + 7))));
+       if (GET_U_1(buf + 5))
+           ND_PRINT("SMBError = %s\n", smb_errstr(GET_U_1(buf + 5),
+                                                   GET_LE_U_2(buf + 7)));

     }
 
     smboffset = 32;
     }
 
     smboffset = 32;


@@ -847,13 +830,12 @@ print_smb(netdissect_options *ndo,
        const char *f1, *f2;
        int wct;
        u_int bcc;
        const char *f1, *f2;
        int wct;
        u_int bcc;

-       int newsmboffset;
+       u_int newsmboffset;

 
        words = buf + smboffset;
 
        words = buf + smboffset;

-       ND_TCHECK(words[0]);
-       wct = words[0];
+       wct = GET_U_1(words);

        data = words + 1 + wct * 2;
        data = words + 1 + wct * 2;

-       maxwords = min(data, maxbuf);
+       maxwords = ND_MIN(data, maxbuf);

 
        if (request) {
            f1 = fn->descript.req_f1;
 
        if (request) {
            f1 = fn->descript.req_f1;


@@ -863,6 +845,7 @@ print_smb(netdissect_options *ndo,
            f2 = fn->descript.rep_f2;
        }
 
            f2 = fn->descript.rep_f2;
        }
 

+       smb_reset();

        if (fn->descript.fn)
            (*fn->descript.fn)(ndo, words, data, buf, maxbuf);
        else {
        if (fn->descript.fn)
            (*fn->descript.fn)(ndo, words, data, buf, maxbuf);
        else {


@@ -870,27 +853,25 @@ print_smb(netdissect_options *ndo,
                if (f1)
                    smb_fdata(ndo, words + 1, f1, words + 1 + wct * 2, unicodestr);
                else {
                if (f1)
                    smb_fdata(ndo, words + 1, f1, words + 1 + wct * 2, unicodestr);
                else {

-                   int i;
-                   int v;
+                   u_int i;
+                   u_int v;

 
 

-                   for (i = 0; &words[1 + 2 * i] < maxwords; i++) {
-                       ND_TCHECK_2(words + (1 + 2 * i));
-                       v = EXTRACT_LE_U_2(words + 1 + 2 * i);
-                       ND_PRINT((ndo, "smb_vwv[%d]=%d (0x%X)\n", i, v, v));
+                   for (i = 0; words + 1 + 2 * i < maxwords; i++) {
+                       v = GET_LE_U_2(words + 1 + 2 * i);
+                       ND_PRINT("smb_vwv[%u]=%u (0x%X)\n", i, v, v);

                    }
                }
            }
 
                    }
                }
            }
 

-           ND_TCHECK_2(data);
-           bcc = EXTRACT_LE_U_2(data);
-           ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+           bcc = GET_LE_U_2(data);
+           ND_PRINT("smb_bcc=%u\n", bcc);

            if (f2) {
                if (bcc > 0)
                    smb_fdata(ndo, data + 2, f2, data + 2 + bcc, unicodestr);
            } else {
                if (bcc > 0) {
            if (f2) {
                if (bcc > 0)
                    smb_fdata(ndo, data + 2, f2, data + 2 + bcc, unicodestr);
            } else {
                if (bcc > 0) {

-                   ND_PRINT((ndo, "smb_buf[]=\n"));
-                   smb_print_data(ndo, data + 2, min(bcc, PTR_DIFF(maxbuf, data + 2)));
+                   ND_PRINT("smb_buf[]=\n");
+                   smb_data_print(ndo, data + 2, ND_MIN(bcc, ND_BYTES_BETWEEN(maxbuf, data + 2)));

                }
            }
        }
                }
            }
        }


@@ -899,28 +880,21 @@ print_smb(netdissect_options *ndo,
            break;
        if (wct == 0)
            break;
            break;
        if (wct == 0)
            break;

-       ND_TCHECK(words[1]);
-       command = words[1];
+       command = GET_U_1(words + 1);

        if (command == 0xFF)
            break;
        if (command == 0xFF)
            break;

-       ND_TCHECK_2(words + 3);
-       newsmboffset = EXTRACT_LE_U_2(words + 3);
+       newsmboffset = GET_LE_U_2(words + 3);

 
        fn = smbfind(command, smb_fns);
 
 
        fn = smbfind(command, smb_fns);
 

-       ND_PRINT((ndo, "\nSMB PACKET: %s (%s) (CHAINED)\n",
-           fn->name, request ? "REQUEST" : "REPLY"));
+       ND_PRINT("\nSMB PACKET: %s (%s) (CHAINED)\n",
+           fn->name, request ? "REQUEST" : "REPLY");

        if (newsmboffset <= smboffset) {
        if (newsmboffset <= smboffset) {

-           ND_PRINT((ndo, "Bad andX offset: %u <= %u\n", newsmboffset, smboffset));
+           ND_PRINT("Bad andX offset: %u <= %u\n", newsmboffset, smboffset);

            break;
        }
        smboffset = newsmboffset;
     }
            break;
        }
        smboffset = newsmboffset;
     }

-
-    ND_PRINT((ndo, "\n"));
-    return;
-trunc:
-    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 }
 
 


@@ -929,46 +903,47 @@ trunc:
  */
 void
 nbt_tcp_print(netdissect_options *ndo,
  */
 void
 nbt_tcp_print(netdissect_options *ndo,

-              const u_char *data, int length)
+              const u_char *data, u_int length)

 {
 {

-    int caplen;
-    int type;
+    u_int caplen;
+    u_int type;

     u_int nbt_len;
     const u_char *maxbuf;
 
     u_int nbt_len;
     const u_char *maxbuf;
 

+    ndo->ndo_protocol = "nbt_tcp";

     if (length < 4)
        goto trunc;
     if (ndo->ndo_snapend < data)
        goto trunc;
     if (length < 4)
        goto trunc;
     if (ndo->ndo_snapend < data)
        goto trunc;

-    caplen = ndo->ndo_snapend - data;
+    caplen = ND_BYTES_AVAILABLE_AFTER(data);

     if (caplen < 4)
        goto trunc;
     maxbuf = data + caplen;
     if (caplen < 4)
        goto trunc;
     maxbuf = data + caplen;

-    type = data[0];
-    nbt_len = EXTRACT_BE_U_2(data + 2);
+    type = GET_U_1(data);
+    nbt_len = GET_BE_U_2(data + 2);

     length -= 4;
     caplen -= 4;
 
     startbuf = data;
 
     if (ndo->ndo_vflag < 2) {
     length -= 4;
     caplen -= 4;
 
     startbuf = data;
 
     if (ndo->ndo_vflag < 2) {

-       ND_PRINT((ndo, " NBT Session Packet: "));
+       ND_PRINT(" NBT Session Packet: ");

        switch (type) {
        case 0x00:
        switch (type) {
        case 0x00:

-           ND_PRINT((ndo, "Session Message"));
+           ND_PRINT("Session Message");

            break;
 
        case 0x81:
            break;
 
        case 0x81:

-           ND_PRINT((ndo, "Session Request"));
+           ND_PRINT("Session Request");

            break;
 
        case 0x82:
            break;
 
        case 0x82:

-           ND_PRINT((ndo, "Session Granted"));
+           ND_PRINT("Session Granted");

            break;
 
        case 0x83:
          {
            break;
 
        case 0x83:
          {

-           int ecode;
+           u_int ecode;

 
            if (nbt_len < 4)
                goto trunc;
 
            if (nbt_len < 4)
                goto trunc;


@@ -976,31 +951,31 @@ nbt_tcp_print(netdissect_options *ndo,
                goto trunc;
            if (caplen < 4)
                goto trunc;
                goto trunc;
            if (caplen < 4)
                goto trunc;

-           ecode = data[4];
+           ecode = GET_U_1(data + 4);

 
 

-           ND_PRINT((ndo, "Session Reject, "));
+           ND_PRINT("Session Reject, ");

            switch (ecode) {
            case 0x80:
            switch (ecode) {
            case 0x80:

-               ND_PRINT((ndo, "Not listening on called name"));
+               ND_PRINT("Not listening on called name");

                break;
            case 0x81:
                break;
            case 0x81:

-               ND_PRINT((ndo, "Not listening for calling name"));
+               ND_PRINT("Not listening for calling name");

                break;
            case 0x82:
                break;
            case 0x82:

-               ND_PRINT((ndo, "Called name not present"));
+               ND_PRINT("Called name not present");

                break;
            case 0x83:
                break;
            case 0x83:

-               ND_PRINT((ndo, "Called name present, but insufficient resources"));
+               ND_PRINT("Called name present, but insufficient resources");

                break;
            default:
                break;
            default:

-               ND_PRINT((ndo, "Unspecified error 0x%X", ecode));
+               ND_PRINT("Unspecified error 0x%X", ecode);

                break;
            }
          }
            break;
 
        case 0x85:
                break;
            }
          }
            break;
 
        case 0x85:

-           ND_PRINT((ndo, "Session Keepalive"));
+           ND_PRINT("Session Keepalive");

            break;
 
        default:
            break;
 
        default:


@@ -1008,63 +983,63 @@ nbt_tcp_print(netdissect_options *ndo,
            break;
        }
     } else {
            break;
        }
     } else {

-       ND_PRINT((ndo, "\n>>> NBT Session Packet\n"));
+       ND_PRINT("\n>>> NBT Session Packet\n");

        switch (type) {
        case 0x00:
        switch (type) {
        case 0x00:

-           data = smb_fdata(ndo, data, "[P1]NBT Session Message\nFlags=[B]\nLength=[rd]\n",
+           data = smb_fdata(ndo, data, "[P1]NBT Session Message\nFlags=[B]\nLength=[ru]\n",

                data + 4, 0);
            if (data == NULL)
                break;
            if (nbt_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {
                data + 4, 0);
            if (data == NULL)
                break;
            if (nbt_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {

-               if ((int)nbt_len > caplen) {
-                   if ((int)nbt_len > length)
-                       ND_PRINT((ndo, "WARNING: Packet is continued in later TCP segments\n"));
+               if (nbt_len > caplen) {
+                   if (nbt_len > length)
+                       ND_PRINT("WARNING: Packet is continued in later TCP segments\n");

                    else
                    else

-                       ND_PRINT((ndo, "WARNING: Short packet. Try increasing the snap length by %d\n",
-                           nbt_len - caplen));
+                       ND_PRINT("WARNING: Short packet. Try increasing the snap length by %u\n",
+                           nbt_len - caplen);

                }
                print_smb(ndo, data, maxbuf > data + nbt_len ? data + nbt_len : maxbuf);
            } else
                }
                print_smb(ndo, data, maxbuf > data + nbt_len ? data + nbt_len : maxbuf);
            } else

-               ND_PRINT((ndo, "Session packet:(raw data or continuation?)\n"));
+               ND_PRINT("Session packet:(raw data or continuation?)\n");

            break;
 
        case 0x81:
            data = smb_fdata(ndo, data,
            break;
 
        case 0x81:
            data = smb_fdata(ndo, data,

-               "[P1]NBT Session Request\nFlags=[B]\nLength=[rd]\nDestination=[n1]\nSource=[n1]\n",
+               "[P1]NBT Session Request\nFlags=[B]\nLength=[ru]\nDestination=[n1]\nSource=[n1]\n",

                maxbuf, 0);
            break;
 
        case 0x82:
                maxbuf, 0);
            break;
 
        case 0x82:

-           data = smb_fdata(ndo, data, "[P1]NBT Session Granted\nFlags=[B]\nLength=[rd]\n", maxbuf, 0);
+           data = smb_fdata(ndo, data, "[P1]NBT Session Granted\nFlags=[B]\nLength=[ru]\n", maxbuf, 0);

            break;
 
        case 0x83:
          {
            const u_char *origdata;
            break;
 
        case 0x83:
          {
            const u_char *origdata;

-           int ecode;
+           u_int ecode;

 
            origdata = data;
 
            origdata = data;

-           data = smb_fdata(ndo, data, "[P1]NBT SessionReject\nFlags=[B]\nLength=[rd]\nReason=[B]\n",
+           data = smb_fdata(ndo, data, "[P1]NBT SessionReject\nFlags=[B]\nLength=[ru]\nReason=[B]\n",

                maxbuf, 0);
            if (data == NULL)
                break;
            if (nbt_len >= 1 && caplen >= 1) {
                maxbuf, 0);
            if (data == NULL)
                break;
            if (nbt_len >= 1 && caplen >= 1) {

-               ecode = origdata[4];
+               ecode = GET_U_1(origdata + 4);

                switch (ecode) {
                case 0x80:
                switch (ecode) {
                case 0x80:

-                   ND_PRINT((ndo, "Not listening on called name\n"));
+                   ND_PRINT("Not listening on called name\n");

                    break;
                case 0x81:
                    break;
                case 0x81:

-                   ND_PRINT((ndo, "Not listening for calling name\n"));
+                   ND_PRINT("Not listening for calling name\n");

                    break;
                case 0x82:
                    break;
                case 0x82:

-                   ND_PRINT((ndo, "Called name not present\n"));
+                   ND_PRINT("Called name not present\n");

                    break;
                case 0x83:
                    break;
                case 0x83:

-                   ND_PRINT((ndo, "Called name present, but insufficient resources\n"));
+                   ND_PRINT("Called name present, but insufficient resources\n");

                    break;
                default:
                    break;
                default:

-                   ND_PRINT((ndo, "Unspecified error 0x%X\n", ecode));
+                   ND_PRINT("Unspecified error 0x%X\n", ecode);

                    break;
                }
            }
                    break;
                }
            }


@@ -1072,18 +1047,17 @@ nbt_tcp_print(netdissect_options *ndo,
            break;
 
        case 0x85:
            break;
 
        case 0x85:

-           data = smb_fdata(ndo, data, "[P1]NBT Session Keepalive\nFlags=[B]\nLength=[rd]\n", maxbuf, 0);
+           data = smb_fdata(ndo, data, "[P1]NBT Session Keepalive\nFlags=[B]\nLength=[ru]\n", maxbuf, 0);

            break;
 
        default:
            data = smb_fdata(ndo, data, "NBT - Unknown packet type\nType=[B]\n", maxbuf, 0);
            break;
        }
            break;
 
        default:
            data = smb_fdata(ndo, data, "NBT - Unknown packet type\nType=[B]\n", maxbuf, 0);
            break;
        }

-       ND_PRINT((ndo, "\n"));

     }
     return;
 trunc:
     }
     return;
 trunc:

-    ND_PRINT((ndo, "%s", tstr));
+    nd_print_trunc(ndo);

 }
 
 static const struct tok opcode_str[] = {
 }
 
 static const struct tok opcode_str[] = {


@@ -1102,57 +1076,57 @@ static const struct tok opcode_str[] = {
  */
 void
 nbt_udp137_print(netdissect_options *ndo,
  */
 void
 nbt_udp137_print(netdissect_options *ndo,

-                 const u_char *data, int length)
+                 const u_char *data, u_int length)

 {
     const u_char *maxbuf = data + length;
 {
     const u_char *maxbuf = data + length;

-    int name_trn_id, response, opcode, nm_flags, rcode;
-    int qdcount, ancount, nscount, arcount;
+    u_int name_trn_id, response, opcode, nm_flags, rcode;
+    u_int qdcount, ancount, nscount, arcount;

     const u_char *p;
     const u_char *p;

-    int total, i;
-
-    ND_TCHECK_2(data + 10);
-    name_trn_id = EXTRACT_BE_U_2(data);
-    response = (data[2] >> 7);
-    opcode = (data[2] >> 3) & 0xF;
-    nm_flags = ((data[2] & 0x7) << 4) + (data[3] >> 4);
-    rcode = data[3] & 0xF;
-    qdcount = EXTRACT_BE_U_2(data + 4);
-    ancount = EXTRACT_BE_U_2(data + 6);
-    nscount = EXTRACT_BE_U_2(data + 8);
-    arcount = EXTRACT_BE_U_2(data + 10);
+    u_int total, i;
+
+    ndo->ndo_protocol = "nbt_udp137";
+    name_trn_id = GET_BE_U_2(data);
+    response = (GET_U_1(data + 2) >> 7);
+    opcode = (GET_U_1(data + 2) >> 3) & 0xF;
+    nm_flags = ((GET_U_1(data + 2) & 0x7) << 4) + (GET_U_1(data + 3) >> 4);
+    rcode = GET_U_1(data + 3) & 0xF;
+    qdcount = GET_BE_U_2(data + 4);
+    ancount = GET_BE_U_2(data + 6);
+    nscount = GET_BE_U_2(data + 8);
+    arcount = GET_BE_U_2(data + 10);

     startbuf = data;
 
     if (maxbuf <= data)
        return;
 
     if (ndo->ndo_vflag > 1)
     startbuf = data;
 
     if (maxbuf <= data)
        return;
 
     if (ndo->ndo_vflag > 1)

-       ND_PRINT((ndo, "\n>>> "));
+       ND_PRINT("\n>>> ");

 
 

-    ND_PRINT((ndo, "NBT UDP PACKET(137): %s", tok2str(opcode_str, "OPUNKNOWN", opcode)));
+    ND_PRINT("NBT UDP PACKET(137): %s", tok2str(opcode_str, "OPUNKNOWN", opcode));

     if (response) {
     if (response) {

-        ND_PRINT((ndo, "; %s", rcode ? "NEGATIVE" : "POSITIVE"));
+        ND_PRINT("; %s", rcode ? "NEGATIVE" : "POSITIVE");

     }
     }

-    ND_PRINT((ndo, "; %s; %s", response ? "RESPONSE" : "REQUEST",
-              (nm_flags & 1) ? "BROADCAST" : "UNICAST"));
+    ND_PRINT("; %s; %s", response ? "RESPONSE" : "REQUEST",
+              (nm_flags & 1) ? "BROADCAST" : "UNICAST");

 
     if (ndo->ndo_vflag < 2)
        return;
 
 
     if (ndo->ndo_vflag < 2)
        return;
 

-    ND_PRINT((ndo, "\nTrnID=0x%X\nOpCode=%d\nNmFlags=0x%X\nRcode=%d\nQueryCount=%d\nAnswerCount=%d\nAuthorityCount=%d\nAddressRecCount=%d\n",
+    ND_PRINT("\nTrnID=0x%X\nOpCode=%u\nNmFlags=0x%X\nRcode=%u\nQueryCount=%u\nAnswerCount=%u\nAuthorityCount=%u\nAddressRecCount=%u\n",

        name_trn_id, opcode, nm_flags, rcode, qdcount, ancount, nscount,
        name_trn_id, opcode, nm_flags, rcode, qdcount, ancount, nscount,

-       arcount));
+       arcount);

 
     p = data + 12;
 
     total = ancount + nscount + arcount;
 
     if (qdcount > 100 || total > 100) {
 
     p = data + 12;
 
     total = ancount + nscount + arcount;
 
     if (qdcount > 100 || total > 100) {

-       ND_PRINT((ndo, "Corrupt packet??\n"));
+       ND_PRINT("Corrupt packet??\n");

        return;
     }
 
     if (qdcount) {
        return;
     }
 
     if (qdcount) {

-       ND_PRINT((ndo, "QuestionRecords:\n"));
+       ND_PRINT("QuestionRecords:\n");

        for (i = 0; i < qdcount; i++) {
            p = smb_fdata(ndo, p,
                "|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#",
        for (i = 0; i < qdcount; i++) {
            p = smb_fdata(ndo, p,
                "|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#",


@@ -1163,22 +1137,20 @@ nbt_udp137_print(netdissect_options *ndo,
     }
 
     if (total) {
     }
 
     if (total) {

-       ND_PRINT((ndo, "\nResourceRecords:\n"));
+       ND_PRINT("\nResourceRecords:\n");

        for (i = 0; i < total; i++) {
        for (i = 0; i < total; i++) {

-           int rdlen;
-           int restype;
+           u_int rdlen;
+           u_int restype;

 
            p = smb_fdata(ndo, p, "Name=[n1]\n#", maxbuf, 0);
            if (p == NULL)
                goto out;
 
            p = smb_fdata(ndo, p, "Name=[n1]\n#", maxbuf, 0);
            if (p == NULL)
                goto out;

-           ND_TCHECK_2(p);
-           restype = EXTRACT_BE_U_2(p);
-           p = smb_fdata(ndo, p, "ResType=[rw]\nResClass=[rw]\nTTL=[rD]\n", p + 8, 0);
+           restype = GET_BE_U_2(p);
+           p = smb_fdata(ndo, p, "ResType=[rw]\nResClass=[rw]\nTTL=[rU]\n", p + 8, 0);

            if (p == NULL)
                goto out;
            if (p == NULL)
                goto out;

-           ND_TCHECK_2(p);
-           rdlen = EXTRACT_BE_U_2(p);
-           ND_PRINT((ndo, "ResourceLength=%d\nResourceData=\n", rdlen));
+           rdlen = GET_BE_U_2(p);
+           ND_PRINT("ResourceLength=%u\nResourceData=\n", rdlen);

            p += 2;
            if (rdlen == 6) {
                p = smb_fdata(ndo, p, "AddrType=[rw]\nAddress=[b.b.b.b]\n", p + rdlen, 0);
            p += 2;
            if (rdlen == 6) {
                p = smb_fdata(ndo, p, "AddrType=[rw]\nAddress=[b.b.b.b]\n", p + rdlen, 0);


@@ -1186,39 +1158,43 @@ nbt_udp137_print(netdissect_options *ndo,
                    goto out;
            } else {
                if (restype == 0x21) {
                    goto out;
            } else {
                if (restype == 0x21) {

-                   int numnames;
+                   u_int numnames;

 
 

-                   ND_TCHECK(*p);
-                   numnames = p[0];
+                   numnames = GET_U_1(p);

                    p = smb_fdata(ndo, p, "NumNames=[B]\n", p + 1, 0);
                    if (p == NULL)
                        goto out;
                    p = smb_fdata(ndo, p, "NumNames=[B]\n", p + 1, 0);
                    if (p == NULL)
                        goto out;

-                   while (numnames--) {
+                   while (numnames) {

                        p = smb_fdata(ndo, p, "Name=[n2]\t#", maxbuf, 0);
                        if (p == NULL)
                            goto out;
                        p = smb_fdata(ndo, p, "Name=[n2]\t#", maxbuf, 0);
                        if (p == NULL)
                            goto out;

-                       ND_TCHECK(*p);
-                       if (EXTRACT_U_1(p) & 0x80)
-                           ND_PRINT((ndo, "<GROUP> "));
-                       switch (p[0] & 0x60) {
-                       case 0x00: ND_PRINT((ndo, "B ")); break;
-                       case 0x20: ND_PRINT((ndo, "P ")); break;
-                       case 0x40: ND_PRINT((ndo, "M ")); break;
-                       case 0x60: ND_PRINT((ndo, "_ ")); break;
+                       ND_TCHECK_1(p);
+                       if (p >= maxbuf)
+                           goto out;
+                       if (GET_U_1(p) & 0x80)
+                           ND_PRINT("<GROUP> ");
+                       switch (GET_U_1(p) & 0x60) {
+                       case 0x00: ND_PRINT("B "); break;
+                       case 0x20: ND_PRINT("P "); break;
+                       case 0x40: ND_PRINT("M "); break;
+                       case 0x60: ND_PRINT("_ "); break;

                        }
                        }

-                       if (EXTRACT_U_1(p) & 0x10)
-                           ND_PRINT((ndo, "<DEREGISTERING> "));
-                       if (EXTRACT_U_1(p) & 0x08)
-                           ND_PRINT((ndo, "<CONFLICT> "));
-                       if (EXTRACT_U_1(p) & 0x04)
-                           ND_PRINT((ndo, "<ACTIVE> "));
-                       if (EXTRACT_U_1(p) & 0x02)
-                           ND_PRINT((ndo, "<PERMANENT> "));
-                       ND_PRINT((ndo, "\n"));
+                       if (GET_U_1(p) & 0x10)
+                           ND_PRINT("<DEREGISTERING> ");
+                       if (GET_U_1(p) & 0x08)
+                           ND_PRINT("<CONFLICT> ");
+                       if (GET_U_1(p) & 0x04)
+                           ND_PRINT("<ACTIVE> ");
+                       if (GET_U_1(p) & 0x02)
+                           ND_PRINT("<PERMANENT> ");
+                       ND_PRINT("\n");

                        p += 2;
                        p += 2;

+                       numnames--;

                    }
                } else {
                    }
                } else {

-                   smb_print_data(ndo, p, min(rdlen, length - (p - data)));
+                   if (p >= maxbuf)
+                       goto out;
+                   smb_data_print(ndo, p, ND_MIN(rdlen, length - ND_BYTES_BETWEEN(p, data)));

                    p += rdlen;
                }
            }
                    p += rdlen;
                }
            }


@@ -1229,10 +1205,9 @@ nbt_udp137_print(netdissect_options *ndo,
        smb_fdata(ndo, p, "AdditionalData:\n", maxbuf, 0);
 
 out:
        smb_fdata(ndo, p, "AdditionalData:\n", maxbuf, 0);
 
 out:

-    ND_PRINT((ndo, "\n"));

     return;
 trunc:
     return;
 trunc:

-    ND_PRINT((ndo, "%s", tstr));
+    nd_print_trunc(ndo);

 }
 
 /*
 }
 
 /*


@@ -1240,21 +1215,22 @@ trunc:
  */
 void
 smb_tcp_print(netdissect_options *ndo,
  */
 void
 smb_tcp_print(netdissect_options *ndo,

-              const u_char * data, int length)
+              const u_char * data, u_int length)

 {
 {

-    int caplen;
+    u_int caplen;

     u_int smb_len;
     const u_char *maxbuf;
 
     u_int smb_len;
     const u_char *maxbuf;
 

+    ndo->ndo_protocol = "smb_tcp";

     if (length < 4)
        goto trunc;
     if (ndo->ndo_snapend < data)
        goto trunc;
     if (length < 4)
        goto trunc;
     if (ndo->ndo_snapend < data)
        goto trunc;

-    caplen = ndo->ndo_snapend - data;
+    caplen = ND_BYTES_AVAILABLE_AFTER(data);

     if (caplen < 4)
        goto trunc;
     maxbuf = data + caplen;
     if (caplen < 4)
        goto trunc;
     maxbuf = data + caplen;

-    smb_len = EXTRACT_BE_U_3(data + 1);
+    smb_len = GET_BE_U_3(data + 1);

     length -= 4;
     caplen -= 4;
 
     length -= 4;
     caplen -= 4;
 


@@ -1262,20 +1238,20 @@ smb_tcp_print(netdissect_options *ndo,
     data += 4;
 
     if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {
     data += 4;
 
     if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {

-       if ((int)smb_len > caplen) {
-           if ((int)smb_len > length)
-               ND_PRINT((ndo, " WARNING: Packet is continued in later TCP segments\n"));
+       if (smb_len > caplen) {
+           if (smb_len > length)
+               ND_PRINT(" WARNING: Packet is continued in later TCP segments\n");

            else
            else

-               ND_PRINT((ndo, " WARNING: Short packet. Try increasing the snap length by %d\n",
-                   smb_len - caplen));
+               ND_PRINT(" WARNING: Short packet. Try increasing the snap length by %u\n",
+                   smb_len - caplen);

        } else
        } else

-           ND_PRINT((ndo, " "));
+           ND_PRINT(" ");

        print_smb(ndo, data, maxbuf > data + smb_len ? data + smb_len : maxbuf);
     } else
        print_smb(ndo, data, maxbuf > data + smb_len ? data + smb_len : maxbuf);
     } else

-       ND_PRINT((ndo, " SMB-over-TCP packet:(raw data or continuation?)\n"));
+       ND_PRINT(" SMB-over-TCP packet:(raw data or continuation?)\n");

     return;
 trunc:
     return;
 trunc:

-    ND_PRINT((ndo, "%s", tstr));
+    nd_print_trunc(ndo);

 }
 
 /*
 }
 
 /*


@@ -1283,10 +1259,11 @@ trunc:
  */
 void
 nbt_udp138_print(netdissect_options *ndo,
  */
 void
 nbt_udp138_print(netdissect_options *ndo,

-                 const u_char *data, int length)
+                 const u_char *data, u_int length)

 {
     const u_char *maxbuf = data + length;
 
 {
     const u_char *maxbuf = data + length;
 

+    ndo->ndo_protocol = "nbt_udp138";

     if (maxbuf > ndo->ndo_snapend)
        maxbuf = ndo->ndo_snapend;
     if (maxbuf <= data)
     if (maxbuf > ndo->ndo_snapend)
        maxbuf = ndo->ndo_snapend;
     if (maxbuf <= data)


@@ -1294,12 +1271,12 @@ nbt_udp138_print(netdissect_options *ndo,
     startbuf = data;
 
     if (ndo->ndo_vflag < 2) {
     startbuf = data;
 
     if (ndo->ndo_vflag < 2) {

-       ND_PRINT((ndo, "NBT UDP PACKET(138)"));
+       ND_PRINT("NBT UDP PACKET(138)");

        return;
     }
 
     data = smb_fdata(ndo, data,
        return;
     }
 
     data = smb_fdata(ndo, data,

-       "\n>>> NBT UDP PACKET(138) Res=[rw] ID=[rw] IP=[b.b.b.b] Port=[rd] Length=[rd] Res2=[rw]\nSourceName=[n1]\nDestName=[n1]\n#",
+       "\n>>> NBT UDP PACKET(138) Res=[rw] ID=[rw] IP=[b.b.b.b] Port=[ru] Length=[ru] Res2=[rw]\nSourceName=[n1]\nDestName=[n1]\n#",

        maxbuf, 0);
 
     if (data != NULL) {
        maxbuf, 0);
 
     if (data != NULL) {


@@ -1311,7 +1288,7 @@ nbt_udp138_print(netdissect_options *ndo,
            print_smb(ndo, data, maxbuf);
     }
 out:
            print_smb(ndo, data, maxbuf);
     }
 out:

-    ND_PRINT((ndo, "\n"));
+    return;

 }
 
 
 }
 
 


@@ -1375,19 +1352,19 @@ static struct nbf_strings {
 
 void
 netbeui_print(netdissect_options *ndo,
 
 void
 netbeui_print(netdissect_options *ndo,

-              u_short control, const u_char *data, int length)
+              u_short control, const u_char *data, u_int length)

 {
     const u_char *maxbuf = data + length;
 {
     const u_char *maxbuf = data + length;

-    int len;
-    int command;
+    u_int len;
+    u_int command;

     const u_char *data2;
     int is_truncated = 0;
 
     const u_char *data2;
     int is_truncated = 0;
 

+    ndo->ndo_protocol = "netbeui";

     if (maxbuf > ndo->ndo_snapend)
        maxbuf = ndo->ndo_snapend;
     if (maxbuf > ndo->ndo_snapend)
        maxbuf = ndo->ndo_snapend;

-    ND_TCHECK(data[4]);
-    len = EXTRACT_LE_U_2(data);
-    command = data[4];
+    len = GET_LE_U_2(data);
+    command = GET_U_1(data + 4);

     data2 = data + len;
     if (data2 >= maxbuf) {
        data2 = maxbuf;
     data2 = data + len;
     if (data2 >= maxbuf) {
        data2 = maxbuf;


@@ -1397,11 +1374,11 @@ netbeui_print(netdissect_options *ndo,
     startbuf = data;
 
     if (ndo->ndo_vflag < 2) {
     startbuf = data;
 
     if (ndo->ndo_vflag < 2) {

-       ND_PRINT((ndo, "NBF Packet: "));
+       ND_PRINT("NBF Packet: ");

        data = smb_fdata(ndo, data, "[P5]#", maxbuf, 0);
     } else {
        data = smb_fdata(ndo, data, "[P5]#", maxbuf, 0);
     } else {

-       ND_PRINT((ndo, "\n>>> NBF Packet\nType=0x%X ", control));
-       data = smb_fdata(ndo, data, "Length=[d] Signature=[w] Command=[B]\n#", maxbuf, 0);
+       ND_PRINT("\n>>> NBF Packet\nType=0x%X ", control);
+       data = smb_fdata(ndo, data, "Length=[u] Signature=[w] Command=[B]\n#", maxbuf, 0);

     }
     if (data == NULL)
        goto out;
     }
     if (data == NULL)
        goto out;


@@ -1413,15 +1390,15 @@ netbeui_print(netdissect_options *ndo,
            data = smb_fdata(ndo, data, "Unknown NBF Command\n", data2, 0);
     } else {
        if (ndo->ndo_vflag < 2) {
            data = smb_fdata(ndo, data, "Unknown NBF Command\n", data2, 0);
     } else {
        if (ndo->ndo_vflag < 2) {

-           ND_PRINT((ndo, "%s", nbf_strings[command].name));
+           ND_PRINT("%s", nbf_strings[command].name);

            if (nbf_strings[command].nonverbose != NULL)
                data = smb_fdata(ndo, data, nbf_strings[command].nonverbose, data2, 0);
        } else {
            if (nbf_strings[command].nonverbose != NULL)
                data = smb_fdata(ndo, data, nbf_strings[command].nonverbose, data2, 0);
        } else {

-           ND_PRINT((ndo, "%s:\n", nbf_strings[command].name));
+           ND_PRINT("%s:\n", nbf_strings[command].name);

            if (nbf_strings[command].verbose != NULL)
                data = smb_fdata(ndo, data, nbf_strings[command].verbose, data2, 0);
            else
            if (nbf_strings[command].verbose != NULL)
                data = smb_fdata(ndo, data, nbf_strings[command].verbose, data2, 0);
            else

-               ND_PRINT((ndo, "\n"));
+               ND_PRINT("\n");

        }
     }
 
        }
     }
 


@@ -1448,12 +1425,12 @@ netbeui_print(netdissect_options *ndo,
     if (memcmp(data2, "\377SMB",4) == 0)
        print_smb(ndo, data2, maxbuf);
     else {
     if (memcmp(data2, "\377SMB",4) == 0)
        print_smb(ndo, data2, maxbuf);
     else {

-       int i;
+       u_int i;

        for (i = 0; i < 128; i++) {
            if ((data2 + i + 3) >= maxbuf)
                break;
            if (memcmp(data2 + i, "\377SMB", 4) == 0) {
        for (i = 0; i < 128; i++) {
            if ((data2 + i + 3) >= maxbuf)
                break;
            if (memcmp(data2 + i, "\377SMB", 4) == 0) {

-               ND_PRINT((ndo, "found SMB packet at %d\n", i));
+               ND_PRINT("found SMB packet at %u\n", i);

                print_smb(ndo, data2 + i, maxbuf);
                break;
            }
                print_smb(ndo, data2 + i, maxbuf);
                break;
            }


@@ -1461,10 +1438,7 @@ netbeui_print(netdissect_options *ndo,
     }
 
 out:
     }
 
 out:

-    ND_PRINT((ndo, "\n"));

     return;
     return;

-trunc:
-    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 }
 
 


@@ -1479,9 +1453,10 @@ ipx_netbios_print(netdissect_options *ndo,
      * this is a hack till I work out how to parse the rest of the
      * NetBIOS-over-IPX stuff
      */
      * this is a hack till I work out how to parse the rest of the
      * NetBIOS-over-IPX stuff
      */

-    int i;
+    u_int i;

     const u_char *maxbuf;
 
     const u_char *maxbuf;
 

+    ndo->ndo_protocol = "ipx_netbios";

     maxbuf = data + length;
     /* Don't go past the end of the captured data in the packet. */
     if (maxbuf > ndo->ndo_snapend)
     maxbuf = data + length;
     /* Don't go past the end of the captured data in the packet. */
     if (maxbuf > ndo->ndo_snapend)


@@ -1493,7 +1468,6 @@ ipx_netbios_print(netdissect_options *ndo,
        if (memcmp(data + i, "\377SMB", 4) == 0) {
            smb_fdata(ndo, data, "\n>>> IPX transport ", data + i, 0);
            print_smb(ndo, data + i, maxbuf);
        if (memcmp(data + i, "\377SMB", 4) == 0) {
            smb_fdata(ndo, data, "\n>>> IPX transport ", data + i, 0);
            print_smb(ndo, data + i, maxbuf);

-           ND_PRINT((ndo, "\n"));

            break;
        }
     }
            break;
        }
     }