(for 4.9.3) CVE-2018-14880/OSPFv3: Fix a bounds check

[tcpdump] / print-smb.c

diff --git a/print-smb.c b/print-smb.c
index cc7bd6fdc9746ca41e8921f85f0749c5271eb71d..944b8d28abfc0c4dc723f477c9e794fcb9f79ac0 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -6,24 +6,22 @@
  * or later
  */
 
  * or later
  */
 

+/* \summary: SMB/CIFS printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.47 2007-12-09 00:30:47 guy Exp $";
-#endif
-
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include <stdio.h>

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

-#include "interface.h"
+#include "netdissect.h"

 #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;
 


@@ -34,7 +32,7 @@ struct smbdescript {
     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)(const u_char *, const u_char *, const u_char *, const u_char *);
+    void (*fn)(netdissect_options *, const u_char *, const u_char *, const u_char *, const u_char *);

 };
 
 struct smbdescriptint {
 };
 
 struct smbdescriptint {


@@ -42,7 +40,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)(const u_char *, const u_char *, int, int);
+    void (*fn)(netdissect_options *, const u_char *, const u_char *, int, int);

 };
 
 struct smbfns
 };
 
 struct smbfns


@@ -90,7 +88,8 @@ smbfindint(int id, const struct smbfnsint *list)
 }
 
 static void
 }
 
 static void

-trans2_findfirst(const u_char *param, const u_char *data, int pcnt, int dcnt)
+trans2_findfirst(netdissect_options *ndo,
+                 const u_char *param, const u_char *data, int pcnt, int dcnt)

 {
     const char *fmt;
 
 {
     const char *fmt;
 


@@ -99,24 +98,25 @@ trans2_findfirst(const u_char *param, const u_char *data, int pcnt, int dcnt)
     else
        fmt = "Handle=[w]\nCount=[d]\nEOS=[w]\nEoffset=[d]\nLastNameOfs=[w]\n";
 
     else
        fmt = "Handle=[w]\nCount=[d]\nEOS=[w]\nEoffset=[d]\nLastNameOfs=[w]\n";
 

-    smb_fdata(param, fmt, param + pcnt, unicodestr);
+    smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);

     if (dcnt) {
     if (dcnt) {

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

     }
 }
 
 static void
     }
 }
 
 static void

-trans2_qfsinfo(const u_char *param, const u_char *data, int pcnt, int dcnt)
+trans2_qfsinfo(netdissect_options *ndo,
+               const u_char *param, const u_char *data, int pcnt, int dcnt)

 {
     static int level = 0;
     const char *fmt="";
 
     if (request) {
 {
     static int level = 0;
     const char *fmt="";
 
     if (request) {

-       TCHECK2(*param, 2);
+       ND_TCHECK2(*param, 2);

        level = EXTRACT_LE_16BITS(param);
        fmt = "InfoLevel=[d]\n";
        level = EXTRACT_LE_16BITS(param);
        fmt = "InfoLevel=[d]\n";

-       smb_fdata(param, fmt, param + pcnt, unicodestr);
+       smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);

     } else {
        switch (level) {
        case 1:
     } else {
        switch (level) {
        case 1:


@@ -132,16 +132,15 @@ trans2_qfsinfo(const u_char *param, const u_char *data, int pcnt, int dcnt)
            fmt = "UnknownLevel\n";
            break;
        }
            fmt = "UnknownLevel\n";
            break;
        }

-       smb_fdata(data, fmt, data + dcnt, unicodestr);
+       smb_fdata(ndo, data, fmt, data + dcnt, unicodestr);

     }
     if (dcnt) {
     }
     if (dcnt) {

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

     }
     return;
 trunc:
     }
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 static const struct smbfnsint trans2_fns[] = {
 }
 
 static const struct smbfnsint trans2_fns[] = {


@@ -170,7 +169,8 @@ static const struct smbfnsint trans2_fns[] = {
 
 
 static void
 
 
 static void

-print_trans2(const u_char *words, const u_char *dat, const u_char *buf, const u_char *maxbuf)
+print_trans2(netdissect_options *ndo,
+             const u_char *words, const u_char *dat, const u_char *buf, const u_char *maxbuf)

 {
     u_int bcc;
     static const struct smbfnsint *fn = &trans2_fns[0];
 {
     u_int bcc;
     static const struct smbfnsint *fn = &trans2_fns[0];


@@ -179,9 +179,9 @@ print_trans2(const u_char *words, const u_char *dat, const u_char *buf, const u_
     const char *f1 = NULL, *f2 = NULL;
     int pcnt, dcnt;
 
     const char *f1 = NULL, *f2 = NULL;
     int pcnt, dcnt;
 

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

     if (request) {
     if (request) {

-       TCHECK2(w[14 * 2], 2);
+       ND_TCHECK2(w[14 * 2], 2);

        pcnt = EXTRACT_LE_16BITS(w + 9 * 2);
        param = buf + EXTRACT_LE_16BITS(w + 10 * 2);
        dcnt = EXTRACT_LE_16BITS(w + 11 * 2);
        pcnt = EXTRACT_LE_16BITS(w + 9 * 2);
        param = buf + EXTRACT_LE_16BITS(w + 10 * 2);
        dcnt = EXTRACT_LE_16BITS(w + 11 * 2);


@@ -189,151 +189,151 @@ print_trans2(const u_char *words, const u_char *dat, const u_char *buf, const u_
        fn = smbfindint(EXTRACT_LE_16BITS(w + 14 * 2), trans2_fns);
     } else {
        if (words[0] == 0) {
        fn = smbfindint(EXTRACT_LE_16BITS(w + 14 * 2), trans2_fns);
     } else {
        if (words[0] == 0) {

-           printf("%s\n", fn->name);
-           printf("Trans2Interim\n");
+           ND_PRINT((ndo, "%s\n", fn->name));
+           ND_PRINT((ndo, "Trans2Interim\n"));

            return;
        }
            return;
        }

-       TCHECK2(w[7 * 2], 2);
+       ND_TCHECK2(w[7 * 2], 2);

        pcnt = EXTRACT_LE_16BITS(w + 3 * 2);
        param = buf + EXTRACT_LE_16BITS(w + 4 * 2);
        dcnt = EXTRACT_LE_16BITS(w + 6 * 2);
        data = buf + EXTRACT_LE_16BITS(w + 7 * 2);
     }
 
        pcnt = EXTRACT_LE_16BITS(w + 3 * 2);
        param = buf + EXTRACT_LE_16BITS(w + 4 * 2);
        dcnt = EXTRACT_LE_16BITS(w + 6 * 2);
        data = buf + EXTRACT_LE_16BITS(w + 7 * 2);
     }
 

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

 
     if (request) {
        if (words[0] == 8) {
 
     if (request) {
        if (words[0] == 8) {

-           smb_fdata(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",
                maxbuf, unicodestr);
            return;
        } else {
                "Trans2Secondary\nTotParam=[d]\nTotData=[d]\nParamCnt=[d]\nParamOff=[d]\nParamDisp=[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nHandle=[d]\n",
                maxbuf, unicodestr);
            return;
        } else {

-           smb_fdata(words + 1,
+           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",
                words + 1 + 14 * 2, unicodestr);
        }
        f1 = fn->descript.req_f1;
        f2 = fn->descript.req_f2;
     } else {
                "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",
                words + 1 + 14 * 2, unicodestr);
        }
        f1 = fn->descript.req_f1;
        f2 = fn->descript.req_f2;
     } else {

-       smb_fdata(words + 1,
+       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",
            words + 1 + 10 * 2, unicodestr);
        f1 = fn->descript.rep_f1;
        f2 = fn->descript.rep_f2;
     }
 
            "TotParam=[d]\nTotData=[d]\nRes1=[w]\nParamCnt=[d]\nParamOff=[d]\nParamDisp[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nSetupCnt=[b][P1]\n",
            words + 1 + 10 * 2, unicodestr);
        f1 = fn->descript.rep_f1;
        f2 = fn->descript.rep_f2;
     }
 

-    TCHECK2(*dat, 2);
+    ND_TCHECK2(*dat, 2);

     bcc = EXTRACT_LE_16BITS(dat);
     bcc = EXTRACT_LE_16BITS(dat);

-    printf("smb_bcc=%u\n", bcc);
+    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));

     if (fn->descript.fn)
     if (fn->descript.fn)

-       (*fn->descript.fn)(param, data, pcnt, dcnt);
+       (*fn->descript.fn)(ndo, param, data, pcnt, dcnt);

     else {
     else {

-       smb_fdata(param, f1 ? f1 : "Parameters=\n", param + pcnt, unicodestr);
-       smb_fdata(data, f2 ? f2 : "Data=\n", data + dcnt, unicodestr);
+       smb_fdata(ndo, param, f1 ? f1 : "Parameters=\n", param + pcnt, unicodestr);
+       smb_fdata(ndo, data, f2 ? f2 : "Data=\n", data + dcnt, unicodestr);

     }
     return;
 trunc:
     }
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 }
 

-

 static void
 static void

-print_browse(const u_char *param, int paramlen, const u_char *data, int datalen)
+print_browse(netdissect_options *ndo,
+             const u_char *param, int paramlen, const u_char *data, int datalen)

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

-    TCHECK(data[0]);
+    ND_TCHECK(data[0]);

     command = data[0];
 
     command = data[0];
 

-    smb_fdata(param, "BROWSE PACKET\n|Param ", param+paramlen, unicodestr);
+    smb_fdata(ndo, param, "BROWSE PACKET\n|Param ", param+paramlen, unicodestr);

 
     switch (command) {
     case 0xF:
 
     switch (command) {
     case 0xF:

-       data = smb_fdata(data,
+       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",
            maxbuf, unicodestr);
        break;
 
     case 0x1:
            "BROWSE PACKET:\nType=[B] (LocalMasterAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[d]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nElectionVersion=[w]\nBrowserConstant=[w]\n",
            maxbuf, unicodestr);
        break;
 
     case 0x1:

-       data = smb_fdata(data,
+       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",
            maxbuf, unicodestr);
        break;
 
     case 0x2:
            "BROWSE PACKET:\nType=[B] (HostAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[d]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nElectionVersion=[w]\nBrowserConstant=[w]\n",
            maxbuf, unicodestr);
        break;
 
     case 0x2:

-       data = smb_fdata(data,
+       data = smb_fdata(ndo, data,

            "BROWSE PACKET:\nType=[B] (AnnouncementRequest)\nFlags=[B]\nReplySystemName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xc:
            "BROWSE PACKET:\nType=[B] (AnnouncementRequest)\nFlags=[B]\nReplySystemName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xc:

-       data = smb_fdata(data,
+       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",
            maxbuf, unicodestr);
        break;
 
     case 0x8:
            "BROWSE PACKET:\nType=[B] (WorkgroupAnnouncement)\nUpdateCount=[w]\nRes1=[B]\nAnnounceInterval=[d]\nName=[n2]\nMajorVersion=[B]\nMinorVersion=[B]\nServerType=[W]\nCommentPointer=[W]\nServerName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0x8:

-       data = smb_fdata(data,
+       data = smb_fdata(ndo, data,

            "BROWSE PACKET:\nType=[B] (ElectionFrame)\nElectionVersion=[B]\nOSSummary=[W]\nUptime=[(W, W)]\nServerName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xb:
            "BROWSE PACKET:\nType=[B] (ElectionFrame)\nElectionVersion=[B]\nOSSummary=[W]\nUptime=[(W, W)]\nServerName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xb:

-       data = smb_fdata(data,
+       data = smb_fdata(ndo, data,

            "BROWSE PACKET:\nType=[B] (BecomeBackupBrowser)\nName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0x9:
            "BROWSE PACKET:\nType=[B] (BecomeBackupBrowser)\nName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0x9:

-       data = smb_fdata(data,
+       data = smb_fdata(ndo, data,

            "BROWSE PACKET:\nType=[B] (GetBackupList)\nListCount?=[B]\nToken=[W]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xa:
            "BROWSE PACKET:\nType=[B] (GetBackupList)\nListCount?=[B]\nToken=[W]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xa:

-       data = smb_fdata(data,
+       data = smb_fdata(ndo, data,

            "BROWSE PACKET:\nType=[B] (BackupListResponse)\nServerCount?=[B]\nToken=[W]\n*Name=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xd:
            "BROWSE PACKET:\nType=[B] (BackupListResponse)\nServerCount?=[B]\nToken=[W]\n*Name=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xd:

-       data = smb_fdata(data,
+       data = smb_fdata(ndo, data,

            "BROWSE PACKET:\nType=[B] (MasterAnnouncement)\nMasterName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xe:
            "BROWSE PACKET:\nType=[B] (MasterAnnouncement)\nMasterName=[S]\n",
            maxbuf, unicodestr);
        break;
 
     case 0xe:

-       data = smb_fdata(data,
+       data = smb_fdata(ndo, data,

            "BROWSE PACKET:\nType=[B] (ResetBrowser)\nOptions=[B]\n", maxbuf, unicodestr);
        break;
 
     default:
            "BROWSE PACKET:\nType=[B] (ResetBrowser)\nOptions=[B]\n", maxbuf, unicodestr);
        break;
 
     default:

-       data = smb_fdata(data, "Unknown Browser Frame ", maxbuf, unicodestr);
+       data = smb_fdata(ndo, data, "Unknown Browser Frame ", maxbuf, unicodestr);

        break;
     }
     return;
 trunc:
        break;
     }
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 static void
 }
 
 
 static void

-print_ipc(const u_char *param, int paramlen, const u_char *data, int datalen)
+print_ipc(netdissect_options *ndo,
+          const u_char *param, int paramlen, const u_char *data, int datalen)

 {
     if (paramlen)
 {
     if (paramlen)

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

            unicodestr);
     if (datalen)
            unicodestr);
     if (datalen)

-       smb_fdata(data, "IPC ", data + datalen, unicodestr);
+       smb_fdata(ndo, data, "IPC ", data + datalen, unicodestr);

 }
 
 
 static void
 }
 
 
 static void

-print_trans(const u_char *words, const u_char *data1, const u_char *buf, const u_char *maxbuf)
+print_trans(netdissect_options *ndo,
+            const u_char *words, const u_char *data1, const u_char *buf, const u_char *maxbuf)

 {
     u_int bcc;
     const char *f1, *f2, *f3, *f4;
 {
     u_int bcc;
     const char *f1, *f2, *f3, *f4;


@@ -342,7 +342,7 @@ print_trans(const u_char *words, const u_char *data1, const u_char *buf, const u
     int datalen, paramlen;
 
     if (request) {
     int datalen, paramlen;
 
     if (request) {

-       TCHECK2(w[12 * 2], 2);
+       ND_TCHECK2(w[12 * 2], 2);

        paramlen = EXTRACT_LE_16BITS(w + 9 * 2);
        param = buf + EXTRACT_LE_16BITS(w + 10 * 2);
        datalen = EXTRACT_LE_16BITS(w + 11 * 2);
        paramlen = EXTRACT_LE_16BITS(w + 9 * 2);
        param = buf + EXTRACT_LE_16BITS(w + 10 * 2);
        datalen = EXTRACT_LE_16BITS(w + 11 * 2);


@@ -352,7 +352,7 @@ print_trans(const u_char *words, const u_char *data1, const u_char *buf, const u
        f3 = "|Param ";
        f4 = "|Data ";
     } else {
        f3 = "|Param ";
        f4 = "|Data ";
     } else {

-       TCHECK2(w[7 * 2], 2);
+       ND_TCHECK2(w[7 * 2], 2);

        paramlen = EXTRACT_LE_16BITS(w + 3 * 2);
        param = buf + EXTRACT_LE_16BITS(w + 4 * 2);
        datalen = EXTRACT_LE_16BITS(w + 6 * 2);
        paramlen = EXTRACT_LE_16BITS(w + 3 * 2);
        param = buf + EXTRACT_LE_16BITS(w + 4 * 2);
        datalen = EXTRACT_LE_16BITS(w + 6 * 2);


@@ -363,44 +363,49 @@ print_trans(const u_char *words, const u_char *data1, const u_char *buf, const u
        f4 = "|Data ";
     }
 
        f4 = "|Data ";
     }
 

-    smb_fdata(words + 1, f1, SMBMIN(words + 1 + 2 * words[0], maxbuf),
+    smb_fdata(ndo, words + 1, f1, min(words + 1 + 2 * words[0], maxbuf),

         unicodestr);
 
         unicodestr);
 

-    TCHECK2(*data1, 2);
+    ND_TCHECK2(*data1, 2);

     bcc = EXTRACT_LE_16BITS(data1);
     bcc = EXTRACT_LE_16BITS(data1);

-    printf("smb_bcc=%u\n", bcc);
+    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));

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

-       smb_fdata(data1 + 2, f2, maxbuf - (paramlen + datalen), unicodestr);
-
-       if (strcmp((const char *)(data1 + 2), "\\MAILSLOT\\BROWSE") == 0) {
-           print_browse(param, paramlen, data, datalen);
+       smb_fdata(ndo, data1 + 2, f2, maxbuf - (paramlen + datalen), unicodestr);
+#define MAILSLOT_BROWSE_STR "\\MAILSLOT\\BROWSE"
+       ND_TCHECK2(*(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;
        }
            return;
        }

+#undef MAILSLOT_BROWSE_STR

 
 

-       if (strcmp((const char *)(data1 + 2), "\\PIPE\\LANMAN") == 0) {
-           print_ipc(param, paramlen, data, datalen);
+#define PIPE_LANMAN_STR "\\PIPE\\LANMAN"
+       ND_TCHECK2(*(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;
        }
            return;
        }

+#undef PIPE_LANMAN_STR

 
        if (paramlen)
 
        if (paramlen)

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

        if (datalen)
        if (datalen)

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

     }
     return;
 trunc:
     }
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 static void
 }
 
 
 static void

-print_negprot(const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf)
+print_negprot(netdissect_options *ndo,
+              const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf)

 {
     u_int wct, bcc;
     const char *f1 = NULL, *f2 = NULL;
 
 {
     u_int wct, bcc;
     const char *f1 = NULL, *f2 = NULL;
 

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

     wct = words[0];
     if (request)
        f2 = "*|Dialect=[Y]\n";
     wct = words[0];
     if (request)
        f2 = "*|Dialect=[Y]\n";


@@ -414,34 +419,34 @@ print_negprot(const u_char *words, const u_char *data, const u_char *buf _U_, co
     }
 
     if (f1)
     }
 
     if (f1)

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

            unicodestr);
     else
            unicodestr);
     else

-       print_data(words + 1, SMBMIN(wct * 2, PTR_DIFF(maxbuf, words + 1)));
+       smb_print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));

 
 

-    TCHECK2(*data, 2);
+    ND_TCHECK2(*data, 2);

     bcc = EXTRACT_LE_16BITS(data);
     bcc = EXTRACT_LE_16BITS(data);

-    printf("smb_bcc=%u\n", bcc);
+    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));

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

-           smb_fdata(data + 2, f2, SMBMIN(data + 2 + EXTRACT_LE_16BITS(data),
+           smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data),

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

-           print_data(data + 2, SMBMIN(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));
+           smb_print_data(ndo, data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));

     }
     return;
 trunc:
     }
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 static void
 }
 
 static void

-print_sesssetup(const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf)
+print_sesssetup(netdissect_options *ndo,
+                const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf)

 {
     u_int wct, bcc;
     const char *f1 = NULL, *f2 = NULL;
 
 {
     u_int wct, bcc;
     const char *f1 = NULL, *f2 = NULL;
 

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

     wct = words[0];
     if (request) {
        if (wct == 10)
     wct = words[0];
     if (request) {
        if (wct == 10)


@@ -458,39 +463,39 @@ print_sesssetup(const u_char *words, const u_char *data, const u_char *buf _U_,
     }
 
     if (f1)
     }
 
     if (f1)

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

            unicodestr);
     else
            unicodestr);
     else

-       print_data(words + 1, SMBMIN(wct * 2, PTR_DIFF(maxbuf, words + 1)));
+       smb_print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));

 
 

-    TCHECK2(*data, 2);
+    ND_TCHECK2(*data, 2);

     bcc = EXTRACT_LE_16BITS(data);
     bcc = EXTRACT_LE_16BITS(data);

-    printf("smb_bcc=%u\n", bcc);
+    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));

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

-           smb_fdata(data + 2, f2, SMBMIN(data + 2 + EXTRACT_LE_16BITS(data),
+           smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data),

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

-           print_data(data + 2, SMBMIN(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));
+           smb_print_data(ndo, data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));

     }
     return;
 trunc:
     }
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 static void
 }
 
 static void

-print_lockingandx(const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf)
+print_lockingandx(netdissect_options *ndo,
+                  const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf)

 {
     u_int wct, bcc;
     const u_char *maxwords;
     const char *f1 = NULL, *f2 = NULL;
 
 {
     u_int wct, bcc;
     const u_char *maxwords;
     const char *f1 = NULL, *f2 = NULL;
 

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

     wct = words[0];
     if (request) {
        f1 = "Com2=[w]\nOff2=[d]\nHandle=[d]\nLockType=[w]\nTimeOut=[D]\nUnlockCount=[d]\nLockCount=[d]\n";
     wct = words[0];
     if (request) {
        f1 = "Com2=[w]\nOff2=[d]\nHandle=[d]\nLockType=[w]\nTimeOut=[D]\nUnlockCount=[d]\nLockCount=[d]\n";

-       TCHECK(words[7]);
+       ND_TCHECK(words[7]);

        if (words[7] & 0x10)
            f2 = "*Process=[d]\n[P2]Offset=[M]\nLength=[M]\n";
        else
        if (words[7] & 0x10)
            f2 = "*Process=[d]\n[P2]Offset=[M]\nLength=[M]\n";
        else


@@ -499,24 +504,23 @@ print_lockingandx(const u_char *words, const u_char *data, const u_char *buf _U_
        f1 = "Com2=[w]\nOff2=[d]\n";
     }
 
        f1 = "Com2=[w]\nOff2=[d]\n";
     }
 

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

     if (wct)
     if (wct)

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

 
 

-    TCHECK2(*data, 2);
+    ND_TCHECK2(*data, 2);

     bcc = EXTRACT_LE_16BITS(data);
     bcc = EXTRACT_LE_16BITS(data);

-    printf("smb_bcc=%u\n", bcc);
+    ND_PRINT((ndo, "smb_bcc=%u\n", bcc));

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

-           smb_fdata(data + 2, f2, SMBMIN(data + 2 + EXTRACT_LE_16BITS(data),
+           smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data),

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

-           print_data(data + 2, SMBMIN(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));
+           smb_print_data(ndo, data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));

     }
     return;
 trunc:
     }
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 }
 
 


@@ -792,47 +796,50 @@ static const struct smbfns smb_fns[] = {
  * print a SMB message
  */
 static void
  * print a SMB message
  */
 static void

-print_smb(const u_char *buf, const u_char *maxbuf)
+print_smb(netdissect_options *ndo,
+          const u_char *buf, const u_char *maxbuf)

 {
 {

-    u_int16_t flags2;
+    uint16_t flags2;

     int nterrcodes;
     int command;
     int nterrcodes;
     int command;

-    u_int32_t nterror;
+    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;
 
     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;
 

-    TCHECK(buf[9]);
+    ND_TCHECK(buf[9]);

     request = (buf[9] & 0x80) ? 0 : 1;
     request = (buf[9] & 0x80) ? 0 : 1;

-    flags2 = EXTRACT_LE_16BITS(&buf[10]);
-    unicodestr = flags2 & 0x8000;
-    nterrcodes = flags2 & 0x4000;

     startbuf = buf;
 
     command = buf[4];
 
     fn = smbfind(command, smb_fns);
 
     startbuf = buf;
 
     command = buf[4];
 
     fn = smbfind(command, smb_fns);
 

-    if (vflag > 1)
-       printf("\n");
+    if (ndo->ndo_vflag > 1)
+       ND_PRINT((ndo, "\n"));

 
 

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

 
 

-    if (vflag < 2)
+    if (ndo->ndo_vflag < 2)

        return;
 
        return;
 

+    ND_TCHECK_16BITS(&buf[10]);
+    flags2 = EXTRACT_LE_16BITS(&buf[10]);
+    unicodestr = flags2 & 0x8000;
+    nterrcodes = flags2 & 0x4000;
+

     /* print out the header */
     /* print out the header */

-    smb_fdata(buf, fmt_smbheader, buf + 33, unicodestr);
+    smb_fdata(ndo, buf, fmt_smbheader, buf + 33, unicodestr);

 
     if (nterrcodes) {
        nterror = EXTRACT_LE_32BITS(&buf[5]);
        if (nterror)
 
     if (nterrcodes) {
        nterror = EXTRACT_LE_32BITS(&buf[5]);
        if (nterror)

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

     } else {
        if (buf[5])
     } else {
        if (buf[5])

-           printf("SMBError = %s\n", smb_errstr(buf[5], EXTRACT_LE_16BITS(&buf[7])));
+           ND_PRINT((ndo, "SMBError = %s\n", smb_errstr(buf[5], EXTRACT_LE_16BITS(&buf[7]))));

     }
 
     smboffset = 32;
     }
 
     smboffset = 32;


@@ -844,10 +851,10 @@ print_smb(const u_char *buf, const u_char *maxbuf)
        int newsmboffset;
 
        words = buf + smboffset;
        int newsmboffset;
 
        words = buf + smboffset;

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

        wct = words[0];
        data = words + 1 + wct * 2;
        wct = words[0];
        data = words + 1 + wct * 2;

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

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


@@ -858,33 +865,33 @@ print_smb(const u_char *buf, const u_char *maxbuf)
        }
 
        if (fn->descript.fn)
        }
 
        if (fn->descript.fn)

-           (*fn->descript.fn)(words, data, buf, maxbuf);
+           (*fn->descript.fn)(ndo, words, data, buf, maxbuf);

        else {
            if (wct) {
                if (f1)
        else {
            if (wct) {
                if (f1)

-                   smb_fdata(words + 1, f1, words + 1 + wct * 2, unicodestr);
+                   smb_fdata(ndo, words + 1, f1, words + 1 + wct * 2, unicodestr);

                else {
                    int i;
                    int v;
 
                    for (i = 0; &words[1 + 2 * i] < maxwords; i++) {
                else {
                    int i;
                    int v;
 
                    for (i = 0; &words[1 + 2 * i] < maxwords; i++) {

-                       TCHECK2(words[1 + 2 * i], 2);
+                       ND_TCHECK2(words[1 + 2 * i], 2);

                        v = EXTRACT_LE_16BITS(words + 1 + 2 * i);
                        v = EXTRACT_LE_16BITS(words + 1 + 2 * i);

-                       printf("smb_vwv[%d]=%d (0x%X)\n", i, v, v);
+                       ND_PRINT((ndo, "smb_vwv[%d]=%d (0x%X)\n", i, v, v));

                    }
                }
            }
 
                    }
                }
            }
 

-           TCHECK2(*data, 2);
+           ND_TCHECK2(*data, 2);

            bcc = EXTRACT_LE_16BITS(data);
            bcc = EXTRACT_LE_16BITS(data);

-           printf("smb_bcc=%u\n", bcc);
+           ND_PRINT((ndo, "smb_bcc=%u\n", bcc));

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

-                   smb_fdata(data + 2, f2, data + 2 + bcc, unicodestr);
+                   smb_fdata(ndo, data + 2, f2, data + 2 + bcc, unicodestr);

            } else {
                if (bcc > 0) {
            } else {
                if (bcc > 0) {

-                   printf("smb_buf[]=\n");
-                   print_data(data + 2, SMBMIN(bcc, PTR_DIFF(maxbuf, data + 2)));
+                   ND_PRINT((ndo, "smb_buf[]=\n"));
+                   smb_print_data(ndo, data + 2, min(bcc, PTR_DIFF(maxbuf, data + 2)));

                }
            }
        }
                }
            }
        }


@@ -893,29 +900,28 @@ print_smb(const u_char *buf, const u_char *maxbuf)
            break;
        if (wct == 0)
            break;
            break;
        if (wct == 0)
            break;

-       TCHECK(words[1]);
+       ND_TCHECK(words[1]);

        command = words[1];
        if (command == 0xFF)
            break;
        command = words[1];
        if (command == 0xFF)
            break;

-       TCHECK2(words[3], 2);
-       newsmboffset = EXTRACT_LE_16BITS(words + 3); 
+       ND_TCHECK2(words[3], 2);
+       newsmboffset = EXTRACT_LE_16BITS(words + 3);

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

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

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

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

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

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

     return;
 trunc:
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 }
 
 


@@ -923,7 +929,8 @@ trunc:
  * print a NBT packet received across tcp on port 139
  */
 void
  * print a NBT packet received across tcp on port 139
  */
 void

-nbt_tcp_print(const u_char *data, int length)
+nbt_tcp_print(netdissect_options *ndo,
+              const u_char *data, int length)

 {
     int caplen;
     int type;
 {
     int caplen;
     int type;


@@ -932,32 +939,34 @@ nbt_tcp_print(const u_char *data, int length)
 
     if (length < 4)
        goto trunc;
 
     if (length < 4)
        goto trunc;

-    if (snapend < data)
+    if (ndo->ndo_snapend < data)

        goto trunc;
        goto trunc;

-    caplen = snapend - data;
+    caplen = ndo->ndo_snapend - data;

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

+    ND_TCHECK_8BITS(data);

     type = data[0];
     type = data[0];

+    ND_TCHECK_16BITS(data + 2);

     nbt_len = EXTRACT_16BITS(data + 2);
     length -= 4;
     caplen -= 4;
 
     startbuf = data;
 
     nbt_len = EXTRACT_16BITS(data + 2);
     length -= 4;
     caplen -= 4;
 
     startbuf = data;
 

-    if (vflag < 2) {
-       printf(" NBT Session Packet: ");
+    if (ndo->ndo_vflag < 2) {
+       ND_PRINT((ndo, " NBT Session Packet: "));

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

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

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

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

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

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

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


@@ -972,64 +981,64 @@ nbt_tcp_print(const u_char *data, int length)
                goto trunc;
            ecode = data[4];
 
                goto trunc;
            ecode = data[4];
 

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

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

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

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

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

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

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

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

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

                break;
            default:
                break;
            default:

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

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

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

            break;
 
        default:
            break;
 
        default:

-           data = smb_fdata(data, "Unknown packet type [rB]", maxbuf, 0);
+           data = smb_fdata(ndo, data, "Unknown packet type [rB]", maxbuf, 0);

            break;
        }
     } else {
            break;
        }
     } else {

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

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

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

                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)
                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)

-                       printf("WARNING: Packet is continued in later TCP segments\n");
+                       ND_PRINT((ndo, "WARNING: Packet is continued in later TCP segments\n"));

                    else
                    else

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

                }
                }

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

            } else
            } else

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

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

-           data = smb_fdata(data,
+           data = smb_fdata(ndo, data,

                "[P1]NBT Session Request\nFlags=[B]\nLength=[rd]\nDestination=[n1]\nSource=[n1]\n",
                maxbuf, 0);
            break;
 
        case 0x82:
                "[P1]NBT Session Request\nFlags=[B]\nLength=[rd]\nDestination=[n1]\nSource=[n1]\n",
                maxbuf, 0);
            break;
 
        case 0x82:

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

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


@@ -1038,7 +1047,7 @@ nbt_tcp_print(const u_char *data, int length)
            int ecode;
 
            origdata = data;
            int ecode;
 
            origdata = data;

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

                maxbuf, 0);
            if (data == NULL)
                break;
                maxbuf, 0);
            if (data == NULL)
                break;


@@ -1046,19 +1055,19 @@ nbt_tcp_print(const u_char *data, int length)
                ecode = origdata[4];
                switch (ecode) {
                case 0x80:
                ecode = origdata[4];
                switch (ecode) {
                case 0x80:

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

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

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

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

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

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

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

                    break;
                default:
                    break;
                default:

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

                    break;
                }
            }
                    break;
                }
            }


@@ -1066,37 +1075,45 @@ nbt_tcp_print(const u_char *data, int length)
            break;
 
        case 0x85:
            break;
 
        case 0x85:

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

            break;
 
        default:
            break;
 
        default:

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

            break;
        }
            break;
        }

-       printf("\n");
-       fflush(stdout);
+       ND_PRINT((ndo, "\n"));

     }
     return;
 trunc:
     }
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 }
 

+static const struct tok opcode_str[] = {
+       { 0,  "QUERY"                   },
+       { 5,  "REGISTRATION"            },
+       { 6,  "RELEASE"                 },
+       { 7,  "WACK"                    },
+       { 8,  "REFRESH(8)"              },
+       { 9,  "REFRESH"                 },
+       { 15, "MULTIHOMED REGISTRATION" },
+       { 0, NULL }
+};

 
 /*
  * print a NBT packet received across udp on port 137
  */
 void
 
 /*
  * print a NBT packet received across udp on port 137
  */
 void

-nbt_udp137_print(const u_char *data, int length)
+nbt_udp137_print(netdissect_options *ndo,
+                 const u_char *data, int length)

 {
     const u_char *maxbuf = data + length;
     int name_trn_id, response, opcode, nm_flags, rcode;
     int qdcount, ancount, nscount, arcount;
 {
     const u_char *maxbuf = data + length;
     int name_trn_id, response, opcode, nm_flags, rcode;
     int qdcount, ancount, nscount, arcount;

-    const char *opcodestr;

     const u_char *p;
     int total, i;
 
     const u_char *p;
     int total, i;
 

-    TCHECK2(data[10], 2);
+    ND_TCHECK2(data[10], 2);

     name_trn_id = EXTRACT_16BITS(data);
     response = (data[2] >> 7);
     opcode = (data[2] >> 3) & 0xF;
     name_trn_id = EXTRACT_16BITS(data);
     response = (data[2] >> 7);
     opcode = (data[2] >> 3) & 0xF;


@@ -1111,59 +1128,36 @@ nbt_udp137_print(const u_char *data, int length)
     if (maxbuf <= data)
        return;
 
     if (maxbuf <= data)
        return;
 

-    if (vflag > 1)
-       printf("\n>>> ");
-
-    printf("NBT UDP PACKET(137): ");
+    if (ndo->ndo_vflag > 1)
+       ND_PRINT((ndo, "\n>>> "));

 
 

-    switch (opcode) {
-    case 0: opcodestr = "QUERY"; break;
-    case 5: opcodestr = "REGISTRATION"; break;
-    case 6: opcodestr = "RELEASE"; break;
-    case 7: opcodestr = "WACK"; break;
-    case 8: opcodestr = "REFRESH(8)"; break;
-    case 9: opcodestr = "REFRESH"; break;
-    case 15: opcodestr = "MULTIHOMED REGISTRATION"; break;
-    default: opcodestr = "OPUNKNOWN"; break;
-    }
-    printf("%s", opcodestr);
+    ND_PRINT((ndo, "NBT UDP PACKET(137): %s", tok2str(opcode_str, "OPUNKNOWN", opcode)));

     if (response) {
     if (response) {

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

     }
     }

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

 
 

-    if (response)
-       printf("; RESPONSE");
-    else
-       printf("; REQUEST");
-
-    if (nm_flags & 1)
-       printf("; BROADCAST");
-    else
-       printf("; UNICAST");
-
-    if (vflag < 2)
+    if (ndo->ndo_vflag < 2)

        return;
 
        return;
 

-    printf("\nTrnID=0x%X\nOpCode=%d\nNmFlags=0x%X\nRcode=%d\nQueryCount=%d\nAnswerCount=%d\nAuthorityCount=%d\nAddressRecCount=%d\n",
+    ND_PRINT((ndo, "\nTrnID=0x%X\nOpCode=%d\nNmFlags=0x%X\nRcode=%d\nQueryCount=%d\nAnswerCount=%d\nAuthorityCount=%d\nAddressRecCount=%d\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) {

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

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

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

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

-           p = smb_fdata(p,
+           p = smb_fdata(ndo, p,

                "|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#",
                maxbuf, 0);
            if (p == NULL)
                "|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#",
                maxbuf, 0);
            if (p == NULL)


@@ -1172,60 +1166,62 @@ nbt_udp137_print(const u_char *data, int length)
     }
 
     if (total) {
     }
 
     if (total) {

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

        for (i = 0; i < total; i++) {
            int rdlen;
            int restype;
 
        for (i = 0; i < total; i++) {
            int rdlen;
            int restype;
 

-           p = smb_fdata(p, "Name=[n1]\n#", maxbuf, 0);
+           p = smb_fdata(ndo, p, "Name=[n1]\n#", maxbuf, 0);

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

+           ND_TCHECK_16BITS(p);

            restype = EXTRACT_16BITS(p);
            restype = EXTRACT_16BITS(p);

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

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

+           ND_TCHECK_16BITS(p);

            rdlen = EXTRACT_16BITS(p);
            rdlen = EXTRACT_16BITS(p);

-           printf("ResourceLength=%d\nResourceData=\n", rdlen);
+           ND_PRINT((ndo, "ResourceLength=%d\nResourceData=\n", rdlen));

            p += 2;
            if (rdlen == 6) {
            p += 2;
            if (rdlen == 6) {

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

                if (p == NULL)
                    goto out;
            } else {
                if (restype == 0x21) {
                    int numnames;
 
                if (p == NULL)
                    goto out;
            } else {
                if (restype == 0x21) {
                    int numnames;
 

-                   TCHECK(*p);
+                   ND_TCHECK(*p);

                    numnames = p[0];
                    numnames = p[0];

-                   p = smb_fdata(p, "NumNames=[B]\n", p + 1, 0);
+                   p = smb_fdata(ndo, p, "NumNames=[B]\n", p + 1, 0);

                    if (p == NULL)
                        goto out;
                    while (numnames--) {
                    if (p == NULL)
                        goto out;
                    while (numnames--) {

-                       p = smb_fdata(p, "Name=[n2]\t#", maxbuf, 0);
+                       p = smb_fdata(ndo, p, "Name=[n2]\t#", maxbuf, 0);

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

-                       TCHECK(*p);
+                       ND_TCHECK(*p);

                        if (p[0] & 0x80)
                        if (p[0] & 0x80)

-                           printf("<GROUP> ");
+                           ND_PRINT((ndo, "<GROUP> "));

                        switch (p[0] & 0x60) {
                        switch (p[0] & 0x60) {

-                       case 0x00: printf("B "); break;
-                       case 0x20: printf("P "); break;
-                       case 0x40: printf("M "); break;
-                       case 0x60: printf("_ "); break;
+                       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;

                        }
                        if (p[0] & 0x10)
                        }
                        if (p[0] & 0x10)

-                           printf("<DEREGISTERING> ");
+                           ND_PRINT((ndo, "<DEREGISTERING> "));

                        if (p[0] & 0x08)
                        if (p[0] & 0x08)

-                           printf("<CONFLICT> ");
+                           ND_PRINT((ndo, "<CONFLICT> "));

                        if (p[0] & 0x04)
                        if (p[0] & 0x04)

-                           printf("<ACTIVE> ");
+                           ND_PRINT((ndo, "<ACTIVE> "));

                        if (p[0] & 0x02)
                        if (p[0] & 0x02)

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

                        p += 2;
                    }
                } else {
                        p += 2;
                    }
                } else {

-                   print_data(p, min(rdlen, length - (p - data)));
+                   smb_print_data(ndo, p, min(rdlen, length - (p - data)));

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


@@ -1233,22 +1229,21 @@ nbt_udp137_print(const u_char *data, int length)
     }
 
     if (p < maxbuf)
     }
 
     if (p < maxbuf)

-       smb_fdata(p, "AdditionalData:\n", maxbuf, 0);
+       smb_fdata(ndo, p, "AdditionalData:\n", maxbuf, 0);

 
 out:
 
 out:

-    printf("\n");
-    fflush(stdout);
+    ND_PRINT((ndo, "\n"));

     return;
 trunc:
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 /*
  * Print an SMB-over-TCP packet received across tcp on port 445
  */
 void
 }
 
 /*
  * Print an SMB-over-TCP packet received across tcp on port 445
  */
 void

-smb_tcp_print (const u_char * data, int length)
+smb_tcp_print(netdissect_options *ndo,
+              const u_char * data, int length)

 {
     int caplen;
     u_int smb_len;
 {
     int caplen;
     u_int smb_len;


@@ -1256,9 +1251,9 @@ smb_tcp_print (const u_char * data, int length)
 
     if (length < 4)
        goto trunc;
 
     if (length < 4)
        goto trunc;

-    if (snapend < data)
+    if (ndo->ndo_snapend < data)

        goto trunc;
        goto trunc;

-    caplen = snapend - data;
+    caplen = ndo->ndo_snapend - data;

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


@@ -1272,40 +1267,41 @@ smb_tcp_print (const u_char * data, int length)
     if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {
        if ((int)smb_len > caplen) {
            if ((int)smb_len > length)
     if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {
        if ((int)smb_len > caplen) {
            if ((int)smb_len > length)

-               printf("WARNING: Packet is continued in later TCP segments\n");
+               ND_PRINT((ndo, " WARNING: Packet is continued in later TCP segments\n"));

            else
            else

-               printf("WARNING: Short packet. Try increasing the snap length by %d\n",
-                   smb_len - caplen);
-       }
-       print_smb(data, maxbuf > data + smb_len ? data + smb_len : maxbuf);
+               ND_PRINT((ndo, " WARNING: Short packet. Try increasing the snap length by %d\n",
+                   smb_len - caplen));
+       } else
+           ND_PRINT((ndo, " "));
+       print_smb(ndo, data, maxbuf > data + smb_len ? data + smb_len : maxbuf);

     } else
     } else

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

     return;
 trunc:
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 /*
  * print a NBT packet received across udp on port 138
  */
 void
 }
 
 /*
  * print a NBT packet received across udp on port 138
  */
 void

-nbt_udp138_print(const u_char *data, int length)
+nbt_udp138_print(netdissect_options *ndo,
+                 const u_char *data, int length)

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

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

     if (maxbuf <= data)
        return;
     startbuf = data;
 
     if (maxbuf <= data)
        return;
     startbuf = data;
 

-    if (vflag < 2) {
-       printf("NBT UDP PACKET(138)");
+    if (ndo->ndo_vflag < 2) {
+       ND_PRINT((ndo, "NBT UDP PACKET(138)"));

        return;
     }
 
        return;
     }
 

-    data = smb_fdata(data,
+    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#",
        maxbuf, 0);
 
        "\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#",
        maxbuf, 0);
 


@@ -1315,18 +1311,17 @@ nbt_udp138_print(const u_char *data, int length)
            goto out;
 
        if (memcmp(data, "\377SMB",4) == 0)
            goto out;
 
        if (memcmp(data, "\377SMB",4) == 0)

-           print_smb(data, maxbuf);
+           print_smb(ndo, data, maxbuf);

     }
 out:
     }
 out:

-    printf("\n");
-    fflush(stdout);
+    ND_PRINT((ndo, "\n"));

 }
 
 
 /*
    print netbeui frames
 */
 }
 
 
 /*
    print netbeui frames
 */

-struct nbf_strings {
+static struct nbf_strings {

        const char      *name;
        const char      *nonverbose;
        const char      *verbose;
        const char      *name;
        const char      *nonverbose;
        const char      *verbose;


@@ -1382,7 +1377,8 @@ struct nbf_strings {
 };
 
 void
 };
 
 void

-netbeui_print(u_short control, const u_char *data, int length)
+netbeui_print(netdissect_options *ndo,
+              u_short control, const u_char *data, int length)

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


@@ -1390,9 +1386,9 @@ netbeui_print(u_short control, const u_char *data, int length)
     const u_char *data2;
     int is_truncated = 0;
 
     const u_char *data2;
     int is_truncated = 0;
 

-    if (maxbuf > snapend)
-       maxbuf = snapend;
-    TCHECK(data[4]);
+    if (maxbuf > ndo->ndo_snapend)
+       maxbuf = ndo->ndo_snapend;
+    ND_TCHECK(data[4]);

     len = EXTRACT_LE_16BITS(data);
     command = data[4];
     data2 = data + len;
     len = EXTRACT_LE_16BITS(data);
     command = data[4];
     data2 = data + len;


@@ -1403,36 +1399,36 @@ netbeui_print(u_short control, const u_char *data, int length)
 
     startbuf = data;
 
 
     startbuf = data;
 

-    if (vflag < 2) {
-       printf("NBF Packet: ");
-       data = smb_fdata(data, "[P5]#", maxbuf, 0);
+    if (ndo->ndo_vflag < 2) {
+       ND_PRINT((ndo, "NBF Packet: "));
+       data = smb_fdata(ndo, data, "[P5]#", maxbuf, 0);

     } else {
     } else {

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

     }
     if (data == NULL)
        goto out;
 
     if (command > 0x1f || nbf_strings[command].name == NULL) {
     }
     if (data == NULL)
        goto out;
 
     if (command > 0x1f || nbf_strings[command].name == NULL) {

-       if (vflag < 2)
-           data = smb_fdata(data, "Unknown NBF Command#", data2, 0);
+       if (ndo->ndo_vflag < 2)
+           data = smb_fdata(ndo, data, "Unknown NBF Command#", data2, 0);

        else
        else

-           data = smb_fdata(data, "Unknown NBF Command\n", data2, 0);
+           data = smb_fdata(ndo, data, "Unknown NBF Command\n", data2, 0);

     } else {
     } else {

-       if (vflag < 2) {
-           printf("%s", nbf_strings[command].name);
+       if (ndo->ndo_vflag < 2) {
+           ND_PRINT((ndo, "%s", nbf_strings[command].name));

            if (nbf_strings[command].nonverbose != NULL)
            if (nbf_strings[command].nonverbose != NULL)

-               data = smb_fdata(data, nbf_strings[command].nonverbose, data2, 0);
+               data = smb_fdata(ndo, data, nbf_strings[command].nonverbose, data2, 0);

        } else {
        } else {

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

            if (nbf_strings[command].verbose != NULL)
            if (nbf_strings[command].verbose != NULL)

-               data = smb_fdata(data, nbf_strings[command].verbose, data2, 0);
+               data = smb_fdata(ndo, data, nbf_strings[command].verbose, data2, 0);

            else
            else

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

        }
     }
 
        }
     }
 

-    if (vflag < 2)
+    if (ndo->ndo_vflag < 2)

        return;
 
     if (data == NULL)
        return;
 
     if (data == NULL)


@@ -1453,26 +1449,25 @@ netbeui_print(u_short control, const u_char *data, int length)
        goto out;
 
     if (memcmp(data2, "\377SMB",4) == 0)
        goto out;
 
     if (memcmp(data2, "\377SMB",4) == 0)

-       print_smb(data2, maxbuf);
+       print_smb(ndo, data2, maxbuf);

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

-               printf("found SMB packet at %d\n", i);
-               print_smb(&data2[i], maxbuf);
+               ND_PRINT((ndo, "found SMB packet at %d\n", i));
+               print_smb(ndo, &data2[i], maxbuf);

                break;
            }
        }
     }
 
 out:
                break;
            }
        }
     }
 
 out:

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

     return;
 trunc:
     return;
 trunc:

-    printf("[|SMB]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 
 }
 
 


@@ -1480,7 +1475,8 @@ trunc:
  * print IPX-Netbios frames
  */
 void
  * print IPX-Netbios frames
  */
 void

-ipx_netbios_print(const u_char *data, u_int length)
+ipx_netbios_print(netdissect_options *ndo,
+                  const u_char *data, u_int length)

 {
     /*
      * this is a hack till I work out how to parse the rest of the
 {
     /*
      * this is a hack till I work out how to parse the rest of the


@@ -1491,20 +1487,19 @@ ipx_netbios_print(const u_char *data, u_int length)
 
     maxbuf = data + length;
     /* Don't go past the end of the captured data in the packet. */
 
     maxbuf = data + length;
     /* Don't go past the end of the captured data in the packet. */

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

     startbuf = data;
     for (i = 0; i < 128; i++) {
        if (&data[i + 4] > maxbuf)
            break;
        if (memcmp(&data[i], "\377SMB", 4) == 0) {
     startbuf = data;
     for (i = 0; i < 128; i++) {
        if (&data[i + 4] > maxbuf)
            break;
        if (memcmp(&data[i], "\377SMB", 4) == 0) {

-           smb_fdata(data, "\n>>> IPX transport ", &data[i], 0);
-           print_smb(&data[i], maxbuf);
-           printf("\n");
-           fflush(stdout);
+           smb_fdata(ndo, data, "\n>>> IPX transport ", &data[i], 0);
+           print_smb(ndo, &data[i], maxbuf);
+           ND_PRINT((ndo, "\n"));

            break;
        }
     }
     if (i == 128)
            break;
        }
     }
     if (i == 128)

-       smb_fdata(data, "\n>>> Unknown IPX ", maxbuf, 0);
+       smb_fdata(ndo, data, "\n>>> Unknown IPX ", maxbuf, 0);

 }
 }