There's no link-layer header on Linux ARPHRD_ATM packets; there's

[tcpdump] / print-smb.c

diff --git a/print-smb.c b/print-smb.c
index a6fa73cc01ebf4e4903851880098b9d40f3af6ed..37e54ca9f95580341ea2e8a7ff7a8867a59764ce 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -1,4 +1,4 @@
-/* 
+/*

  * Copyright (C) Andrew Tridgell 1995-1999
  *
  * This software may be distributed either under the terms of the
  * Copyright (C) Andrew Tridgell 1995-1999
  *
  * This software may be distributed either under the terms of the


@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.14 2001-06-26 03:33:44 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.18 2001-09-17 21:58:04 fenner Exp $";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -24,7 +24,7 @@ static const char rcsid[] =
 
 static int request = 0;
 
 
 static int request = 0;
 

-const uchar *startbuf = NULL;
+const u_char *startbuf = NULL;

 
 struct smbdescript {
     char *req_f1;
 
 struct smbdescript {
     char *req_f1;


@@ -55,7 +55,7 @@ smbfind(int id, struct smbfns *list)
 {
     int sindex;
 
 {
     int sindex;
 

-    for (sindex = 0; list[sindex].name; sindex++) 
+    for (sindex = 0; list[sindex].name; sindex++)

        if (list[sindex].id == id)
            return(&list[sindex]);
 
        if (list[sindex].id == id)
            return(&list[sindex]);
 


@@ -63,7 +63,7 @@ smbfind(int id, struct smbfns *list)
 }
 
 static void
 }
 
 static void

-trans2_findfirst(const uchar *param, const uchar *data, ...)
+trans2_findfirst(const u_char *param, const u_char *data, ...)

 {
     char *fmt;
     va_list ap;
 {
     char *fmt;
     va_list ap;


@@ -79,7 +79,7 @@ trans2_findfirst(const uchar *param, const uchar *data, ...)
     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";
 

-    fdata(param, fmt, param + pcnt);
+    smb_fdata(param, fmt, param + pcnt);

     if (dcnt) {
        printf("data:\n");
        print_data(data, dcnt);
     if (dcnt) {
        printf("data:\n");
        print_data(data, dcnt);


@@ -87,7 +87,7 @@ trans2_findfirst(const uchar *param, const uchar *data, ...)
 }
 
 static void
 }
 
 static void

-trans2_qfsinfo(const uchar *param, const uchar *data, ...)
+trans2_qfsinfo(const u_char *param, const u_char *data, ...)

 {
     static int level = 0;
     char *fmt="";
 {
     static int level = 0;
     char *fmt="";


@@ -102,7 +102,7 @@ trans2_qfsinfo(const uchar *param, const uchar *data, ...)
     if (request) {
        level = SVAL(param, 0);
        fmt = "InfoLevel=[d]\n";
     if (request) {
        level = SVAL(param, 0);
        fmt = "InfoLevel=[d]\n";

-       fdata(param, fmt, param + pcnt);
+       smb_fdata(param, fmt, param + pcnt);

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


@@ -118,7 +118,7 @@ trans2_qfsinfo(const uchar *param, const uchar *data, ...)
            fmt = "UnknownLevel\n";
            break;
        }
            fmt = "UnknownLevel\n";
            break;
        }

-       fdata(data, fmt, data + dcnt);
+       smb_fdata(data, fmt, data + dcnt);

     }
     if (dcnt) {
        printf("data:\n");
     }
     if (dcnt) {
        printf("data:\n");


@@ -127,43 +127,43 @@ trans2_qfsinfo(const uchar *param, const uchar *data, ...)
 }
 
 struct smbfns trans2_fns[] = {
 }
 
 struct smbfns trans2_fns[] = {

-    { 0, "TRANSACT2_OPEN", 0, 
+    { 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=[D]\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=[d]\nAttrib=[A]\nTime=[T2]\nSize=[D]\nAccess=[w]\nType=[w]\nState=[w]\nAction=[w]\nInode=[W]\nOffErr=[d]\n|EALength=[d]\n",

-         NULL, NULL }}, 
-    { 1, "TRANSACT2_FINDFIRST", 0, 
-       { NULL, NULL, NULL, NULL, trans2_findfirst }}, 
-    { 2, "TRANSACT2_FINDNEXT", 0, DEFDESCRIPT }, 
-    { 3, "TRANSACT2_QFSINFO", 0, 
-       { NULL, NULL, NULL, NULL, trans2_qfsinfo }}, 
-    { 4, "TRANSACT2_SETFSINFO", 0, DEFDESCRIPT }, 
-    { 5, "TRANSACT2_QPATHINFO", 0, DEFDESCRIPT }, 
-    { 6, "TRANSACT2_SETPATHINFO", 0, DEFDESCRIPT }, 
-    { 7, "TRANSACT2_QFILEINFO", 0, DEFDESCRIPT }, 
-    { 8, "TRANSACT2_SETFILEINFO", 0, DEFDESCRIPT }, 
-    { 9, "TRANSACT2_FSCTL", 0, DEFDESCRIPT }, 
-    { 10, "TRANSACT2_IOCTL", 0, DEFDESCRIPT }, 
-    { 11, "TRANSACT2_FINDNOTIFYFIRST", 0, DEFDESCRIPT }, 
-    { 12, "TRANSACT2_FINDNOTIFYNEXT", 0, DEFDESCRIPT }, 
-    { 13, "TRANSACT2_MKDIR", 0, DEFDESCRIPT }, 
+         NULL, NULL }},
+    { 1, "TRANSACT2_FINDFIRST", 0,
+       { NULL, NULL, NULL, NULL, trans2_findfirst }},
+    { 2, "TRANSACT2_FINDNEXT", 0, DEFDESCRIPT },
+    { 3, "TRANSACT2_QFSINFO", 0,
+       { NULL, NULL, NULL, NULL, trans2_qfsinfo }},
+    { 4, "TRANSACT2_SETFSINFO", 0, DEFDESCRIPT },
+    { 5, "TRANSACT2_QPATHINFO", 0, DEFDESCRIPT },
+    { 6, "TRANSACT2_SETPATHINFO", 0, DEFDESCRIPT },
+    { 7, "TRANSACT2_QFILEINFO", 0, DEFDESCRIPT },
+    { 8, "TRANSACT2_SETFILEINFO", 0, DEFDESCRIPT },
+    { 9, "TRANSACT2_FSCTL", 0, DEFDESCRIPT },
+    { 10, "TRANSACT2_IOCTL", 0, DEFDESCRIPT },
+    { 11, "TRANSACT2_FINDNOTIFYFIRST", 0, DEFDESCRIPT },
+    { 12, "TRANSACT2_FINDNOTIFYNEXT", 0, DEFDESCRIPT },
+    { 13, "TRANSACT2_MKDIR", 0, DEFDESCRIPT },

     { -1, NULL, 0, DEFDESCRIPT }
 };
 
 
 static void
     { -1, NULL, 0, DEFDESCRIPT }
 };
 
 
 static void

-print_trans2(const uchar *words, const uchar *dat, ...)
+print_trans2(const u_char *words, const u_char *dat, ...)

 {
     static struct smbfns *fn = &trans2_fns[0];
 {
     static struct smbfns *fn = &trans2_fns[0];

-    uchar *data, *param;
-    uchar *f1 = NULL, *f2 = NULL;
+    u_char *data, *param;
+    u_char *f1 = NULL, *f2 = NULL;

     int pcnt, dcnt;
     va_list ap;
     int pcnt, dcnt;
     va_list ap;

-    uchar *buf, *maxbuf;
+    u_char *buf, *maxbuf;

 
     va_start(ap, dat);
 
     va_start(ap, dat);

-    buf = va_arg(ap, uchar *);
-    maxbuf = va_arg(ap, uchar *);
+    buf = va_arg(ap, u_char *);
+    maxbuf = va_arg(ap, u_char *);

     va_end(ap);
 
     if (request) {
     va_end(ap);
 
     if (request) {


@@ -183,15 +183,15 @@ print_trans2(const uchar *words, const uchar *dat, ...)
 
     if (request) {
        if (CVAL(words, 0) == 8) {
 
     if (request) {
        if (CVAL(words, 0) == 8) {

-           fdata(words + 1,
+           smb_fdata(words + 1,

                "Trans2Secondary\nTotParam=[d]\nTotData=[d]\nParamCnt=[d]\nParamOff=[d]\nParamDisp=[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nHandle=[d]\n",
                maxbuf);
                "Trans2Secondary\nTotParam=[d]\nTotData=[d]\nParamCnt=[d]\nParamOff=[d]\nParamDisp=[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nHandle=[d]\n",
                maxbuf);

-           return;         
+           return;

        } else {
        } else {

-           fdata(words + 1,
+           smb_fdata(words + 1,

                "TotParam=[d]\nTotData=[d]\nMaxParam=[d]\nMaxData=[d]\nMaxSetup=[d]\nFlags=[w]\nTimeOut=[D]\nRes1=[w]\nParamCnt=[d]\nParamOff=[d]\nDataCnt=[d]\nDataOff=[d]\nSetupCnt=[d]\n",
                words + 1 + 14 * 2);
                "TotParam=[d]\nTotData=[d]\nMaxParam=[d]\nMaxData=[d]\nMaxSetup=[d]\nFlags=[w]\nTimeOut=[D]\nRes1=[w]\nParamCnt=[d]\nParamOff=[d]\nDataCnt=[d]\nDataOff=[d]\nSetupCnt=[d]\n",
                words + 1 + 14 * 2);

-           fdata(data + 1, "TransactionName=[S]\n%", maxbuf);
+           smb_fdata(data + 1, "TransactionName=[S]\n%", maxbuf);

        }
        f1 = fn->descript.req_f1;
        f2 = fn->descript.req_f2;
        }
        f1 = fn->descript.req_f1;
        f2 = fn->descript.req_f2;


@@ -200,7 +200,7 @@ print_trans2(const uchar *words, const uchar *dat, ...)
            printf("Trans2Interim\n");
            return;
        } else {
            printf("Trans2Interim\n");
            return;
        } else {

-           fdata(words + 1,
+           smb_fdata(words + 1,

                "TotParam=[d]\nTotData=[d]\nRes1=[w]\nParamCnt=[d]\nParamOff=[d]\nParamDisp[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nSetupCnt=[d]\n",
                words + 1 + 10 * 2);
        }
                "TotParam=[d]\nTotData=[d]\nRes1=[w]\nParamCnt=[d]\nParamOff=[d]\nParamDisp[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nSetupCnt=[d]\n",
                words + 1 + 10 * 2);
        }


@@ -211,109 +211,109 @@ print_trans2(const uchar *words, const uchar *dat, ...)
     if (fn->descript.fn)
        fn->descript.fn(param, data, pcnt, dcnt);
     else {
     if (fn->descript.fn)
        fn->descript.fn(param, data, pcnt, dcnt);
     else {

-       fdata(param, f1 ? f1 : (uchar *)"Paramaters=\n", param + pcnt);
-       fdata(data, f2 ? f2 : (uchar *)"Data=\n", data + dcnt);      
+       smb_fdata(param, f1 ? f1 : (u_char *)"Paramaters=\n", param + pcnt);
+       smb_fdata(data, f2 ? f2 : (u_char *)"Data=\n", data + dcnt);

     }
 }
 
 
 static void
     }
 }
 
 
 static void

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

 {
 {

-    const uchar *maxbuf = data + datalen;
+    const u_char *maxbuf = data + datalen;

     int command = CVAL(data, 0);
 
     int command = CVAL(data, 0);
 

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

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

-       data = fdata(data,
+       data = smb_fdata(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);
        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);
        break;
 
     case 0x1:

-       data = fdata(data,
+       data = smb_fdata(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);
        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);
        break;
 
     case 0x2:

-       data = fdata(data,
+       data = smb_fdata(data,

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

-       data = fdata(data,
+       data = smb_fdata(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);
        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);
        break;
 
     case 0x8:

-       data = fdata(data,
+       data = smb_fdata(data,

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

-       data = fdata(data,
+       data = smb_fdata(data,

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

-       data = fdata(data,
+       data = smb_fdata(data,

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

-       data = fdata(data,
+       data = smb_fdata(data,

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

-       data = fdata(data,
+       data = smb_fdata(data,

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

-       data = fdata(data,
+       data = smb_fdata(data,

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

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

        break;
     }
 }
 
 
 static void
        break;
     }
 }
 
 
 static void

-print_ipc(uchar *param, int paramlen, uchar *data, int datalen)
+print_ipc(u_char *param, int paramlen, u_char *data, int datalen)

 {
     if (paramlen)
 {
     if (paramlen)

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

     if (datalen)
     if (datalen)

-       fdata(data, "IPC ", data + datalen);
+       smb_fdata(data, "IPC ", data + datalen);

 }
 
 
 static void
 }
 
 
 static void

-print_trans(const uchar *words, const uchar *data1, ...)
+print_trans(const u_char *words, const u_char *data1, ...)

 {
 {

-    uchar *f1, *f2, *f3, *f4;
-    uchar *data, *param;
+    u_char *f1, *f2, *f3, *f4;
+    u_char *data, *param;

     int datalen, paramlen;
     va_list ap;
     int datalen, paramlen;
     va_list ap;

-    uchar *buf, *maxbuf;
+    u_char *buf, *maxbuf;

 
     va_start(ap, data1);
 
     va_start(ap, data1);

-    buf = va_arg(ap, uchar *);
-    maxbuf = va_arg(ap, uchar *);
+    buf = va_arg(ap, u_char *);
+    maxbuf = va_arg(ap, u_char *);

     va_end(ap);
 
     if (request) {
     va_end(ap);
 
     if (request) {


@@ -336,8 +336,8 @@ print_trans(const uchar *words, const uchar *data1, ...)
        f4 = "|Data ";
     }
 
        f4 = "|Data ";
     }
 

-    fdata(words + 1, f1, MIN(words + 1 + 2 * CVAL(words, 0), maxbuf));
-    fdata(data1 + 2, f2, maxbuf - (paramlen + datalen));
+    smb_fdata(words + 1, f1, MIN(words + 1 + 2 * CVAL(words, 0), maxbuf));
+    smb_fdata(data1 + 2, f2, maxbuf - (paramlen + datalen));

 
     if (!strcmp(data1 + 2, "\\MAILSLOT\\BROWSE")) {
        print_browse(param, paramlen, data, datalen);
 
     if (!strcmp(data1 + 2, "\\MAILSLOT\\BROWSE")) {
        print_browse(param, paramlen, data, datalen);


@@ -350,22 +350,22 @@ print_trans(const uchar *words, const uchar *data1, ...)
     }
 
     if (paramlen)
     }
 
     if (paramlen)

-       fdata(param, f3, MIN(param + paramlen, maxbuf));
+       smb_fdata(param, f3, MIN(param + paramlen, maxbuf));

     if (datalen)
     if (datalen)

-       fdata(data, f4, MIN(data + datalen, maxbuf));
+       smb_fdata(data, f4, MIN(data + datalen, maxbuf));

 }
 
 
 static void
 }
 
 
 static void

-print_negprot(const uchar *words, const uchar *data, ...)
+print_negprot(const u_char *words, const u_char *data, ...)

 {
 {

-    uchar *f1 = NULL, *f2 = NULL;
+    u_char *f1 = NULL, *f2 = NULL;

     va_list ap;
     va_list ap;

-    uchar *buf, *maxbuf;
+    u_char *buf, *maxbuf;

 
     va_start(ap, data);
 
     va_start(ap, data);

-    buf = va_arg(ap, uchar *);
-    maxbuf = va_arg(ap, uchar *);
+    buf = va_arg(ap, u_char *);
+    maxbuf = va_arg(ap, u_char *);

     va_end(ap);
 
     if (request)
     va_end(ap);
 
     if (request)


@@ -379,29 +379,29 @@ print_negprot(const uchar *words, const uchar *data, ...)
            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=[d]\nSecMode=[w]\nMaxXMit=[d]\nMaxMux=[d]\nMaxVcs=[d]\nBlkMode=[w]\nSessionKey=[W]\nServerTime=[T1]TimeZone=[d]\nRes=[W]\nCryptKey=";
     }
 

-    if (f1) 
-       fdata(words + 1, f1, MIN(words + 1 + CVAL(words, 0) * 2, maxbuf));
+    if (f1)
+       smb_fdata(words + 1, f1, MIN(words + 1 + CVAL(words, 0) * 2, maxbuf));

     else
        print_data(words + 1, MIN(CVAL(words, 0) * 2,
            PTR_DIFF(maxbuf, words + 1)));
 
     else
        print_data(words + 1, MIN(CVAL(words, 0) * 2,
            PTR_DIFF(maxbuf, words + 1)));
 

-    if (f2) 
-       fdata(data + 2, f2, MIN(data + 2 + SVAL(data, 0), maxbuf));
+    if (f2)
+       smb_fdata(data + 2, f2, MIN(data + 2 + SVAL(data, 0), maxbuf));

     else
        print_data(data + 2, MIN(SVAL(data, 0), PTR_DIFF(maxbuf, data + 2)));
 }
 
 static void
     else
        print_data(data + 2, MIN(SVAL(data, 0), PTR_DIFF(maxbuf, data + 2)));
 }
 
 static void

-print_sesssetup(const uchar *words, const uchar *data, ...)
+print_sesssetup(const u_char *words, const u_char *data, ...)

 {
     int wcnt = CVAL(words, 0);
 {
     int wcnt = CVAL(words, 0);

-    uchar *f1 = NULL, *f2 = NULL;
+    u_char *f1 = NULL, *f2 = NULL;

     va_list ap;
     va_list ap;

-    uchar *buf, *maxbuf;
+    u_char *buf, *maxbuf;

 
     va_start(ap, data);
 
     va_start(ap, data);

-    buf = va_arg(ap, uchar *);
-    maxbuf = va_arg(ap, uchar *);
+    buf = va_arg(ap, u_char *);
+    maxbuf = va_arg(ap, u_char *);

     va_end(ap);
 
     if (request) {
     va_end(ap);
 
     if (request) {


@@ -418,16 +418,16 @@ print_sesssetup(const uchar *words, const uchar *data, ...)
        }
     }
 
        }
     }
 

-    if (f1) 
-       fdata(words + 1, f1, MIN(words + 1 + CVAL(words, 0) * 2, maxbuf));
+    if (f1)
+       smb_fdata(words + 1, f1, MIN(words + 1 + CVAL(words, 0) * 2, maxbuf));

     else
        print_data(words + 1, MIN(CVAL(words, 0) * 2,
            PTR_DIFF(maxbuf, words + 1)));
 
     else
        print_data(words + 1, MIN(CVAL(words, 0) * 2,
            PTR_DIFF(maxbuf, words + 1)));
 

-    if (f2) 
-       fdata(data + 2, f2, MIN(data + 2 + SVAL(data, 0), maxbuf));
+    if (f2)
+       smb_fdata(data + 2, f2, MIN(data + 2 + SVAL(data, 0), maxbuf));

     else
     else

-       print_data(data + 2, MIN(SVAL(data, 0), PTR_DIFF(maxbuf, data+2))); 
+       print_data(data + 2, MIN(SVAL(data, 0), PTR_DIFF(maxbuf, data+2)));

 }
 
 
 }
 
 


@@ -495,10 +495,10 @@ static struct smbfns smb_fns[] = {
        { "Handle=[d]\nTime=[T2]", NULL, NULL, NULL, NULL } },
 
     { SMBmkdir, "SMBmkdir", 0,
        { "Handle=[d]\nTime=[T2]", NULL, NULL, NULL, NULL } },
 
     { SMBmkdir, "SMBmkdir", 0,

-       { NULL, "Path=[Z]\n", NULL, NULL, NULL } }, 
+       { NULL, "Path=[Z]\n", NULL, NULL, NULL } },

 
     { SMBrmdir, "SMBrmdir", 0,
 
     { SMBrmdir, "SMBrmdir", 0,

-       { NULL, "Path=[Z]\n", NULL, NULL, NULL } }, 
+       { NULL, "Path=[Z]\n", NULL, NULL, NULL } },

 
     { SMBdskattr, "SMBdskattr", 0,
        { NULL, NULL,
 
     { SMBdskattr, "SMBdskattr", 0,
        { NULL, NULL,


@@ -655,7 +655,7 @@ static struct smbfns smb_fns[] = {
 
     { SMBsendstrt, "SMBsendstrt", 0,
        { NULL, "Source=[Z]\nDest=[Z]\n", "GroupID=[d]\n", NULL, NULL } },
 
     { SMBsendstrt, "SMBsendstrt", 0,
        { NULL, "Source=[Z]\nDest=[Z]\n", "GroupID=[d]\n", NULL, NULL } },

-      
+

     { SMBsendend, "SMBsendend", 0,
        { "GroupID=[d]\n", NULL, NULL, NULL, NULL } },
 
     { SMBsendend, "SMBsendend", 0,
        { "GroupID=[d]\n", NULL, NULL, NULL, NULL } },
 


@@ -669,7 +669,7 @@ static struct smbfns smb_fns[] = {
     { SMBcancelf, "SMBcancelf", 0, DEFDESCRIPT },
     { SMBgetmac, "SMBgetmac", 0, DEFDESCRIPT },
 
     { SMBcancelf, "SMBcancelf", 0, DEFDESCRIPT },
     { SMBgetmac, "SMBgetmac", 0, DEFDESCRIPT },
 

-    { SMBnegprot, "SMBnegprot", 0, 
+    { SMBnegprot, "SMBnegprot", 0,

        { NULL, NULL, NULL, NULL, print_negprot } },
 
     { SMBsesssetupX, "SMBsesssetupX", FLG_CHAIN,
        { NULL, NULL, NULL, NULL, print_negprot } },
 
     { SMBsesssetupX, "SMBsesssetupX", FLG_CHAIN,


@@ -705,10 +705,10 @@ static struct smbfns smb_fns[] = {
  * print a SMB message
  */
 static void
  * print a SMB message
  */
 static void

-print_smb(const uchar *buf, const uchar *maxbuf)
+print_smb(const u_char *buf, const u_char *maxbuf)

 {
     int command;
 {
     int command;

-    const uchar *words, *data;
+    const u_char *words, *data;

     struct smbfns *fn;
     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";
     struct smbfns *fn;
     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";


@@ -728,7 +728,7 @@ print_smb(const uchar *buf, const uchar *maxbuf)
        return;
 
     /* print out the header */
        return;
 
     /* print out the header */

-    fdata(buf, fmt_smbheader, buf + 33);
+    smb_fdata(buf, fmt_smbheader, buf + 33);

 
     if (CVAL(buf, 5)) {
        int class = CVAL(buf, 5);
 
     if (CVAL(buf, 5)) {
        int class = CVAL(buf, 5);


@@ -756,7 +756,7 @@ print_smb(const uchar *buf, const uchar *maxbuf)
        else {
            if (f1) {
                printf("smbvwv[]=\n");
        else {
            if (f1) {
                printf("smbvwv[]=\n");

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

            } else if (wct) {
                int i;
                int v;
            } else if (wct) {
                int i;
                int v;


@@ -769,7 +769,7 @@ print_smb(const uchar *buf, const uchar *maxbuf)
 
            if (f2) {
                printf("smbbuf[]=\n");
 
            if (f2) {
                printf("smbbuf[]=\n");

-               fdata(data + 2, f2, maxbuf);
+               smb_fdata(data + 2, f2, maxbuf);

            } else {
                int bcc = SVAL(data, 0);
                printf("smb_bcc=%d\n", bcc);
            } else {
                int bcc = SVAL(data, 0);
                printf("smb_bcc=%d\n", bcc);


@@ -794,7 +794,7 @@ print_smb(const uchar *buf, const uchar *maxbuf)
            words = data = NULL;
     }
 
            words = data = NULL;
     }
 

-    printf("\n");  
+    printf("\n");

 }
 
 
 }
 
 


@@ -802,9 +802,9 @@ print_smb(const uchar *buf, const uchar *maxbuf)
  * 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 uchar *data, int length)
+nbt_tcp_print(const u_char *data, int length)

 {
 {

-    const uchar *maxbuf = data + length;
+    const u_char *maxbuf = data + length;

     int flags = CVAL(data, 0);
     int nbt_len = RSVAL(data, 2);
 
     int flags = CVAL(data, 0);
     int nbt_len = RSVAL(data, 2);
 


@@ -823,10 +823,10 @@ nbt_tcp_print(const uchar *data, int length)
     printf("\n");
 
     switch (flags) {
     printf("\n");
 
     switch (flags) {

-    case 1:    
+    case 1:

        printf("flags=0x%x\n", flags);
        printf("flags=0x%x\n", flags);

-    case 0:    
-       data = fdata(data, "NBT Session Packet\nFlags=[rw]\nLength=[rd]\n",
+    case 0:
+       data = smb_fdata(data, "NBT Session Packet\nFlags=[rw]\nLength=[rd]\n",

            data + 4);
        if (data == NULL)
            break;
            data + 4);
        if (data == NULL)
            break;


@@ -840,48 +840,48 @@ nbt_tcp_print(const uchar *data, int length)
        break;
 
        case 0x81:
        break;
 
        case 0x81:

-           data = fdata(data,
+           data = smb_fdata(data,

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

-           data = fdata(data, "NBT Session Granted\nFlags=[rW]\n", maxbuf);
+           data = smb_fdata(data, "NBT Session Granted\nFlags=[rW]\n", maxbuf);

            break;
 
        case 0x83:
          {
            int ecode = CVAL(data,4);
 
            break;
 
        case 0x83:
          {
            int ecode = CVAL(data,4);
 

-           data = fdata(data, "NBT SessionReject\nFlags=[rW]\nReason=[B]\n",
+           data = smb_fdata(data, "NBT SessionReject\nFlags=[rW]\nReason=[B]\n",

                maxbuf);
            switch (ecode) {
                maxbuf);
            switch (ecode) {

-           case 0x80: 
-               printf("Not listening on called name\n"); 
+           case 0x80:
+               printf("Not listening on called name\n");

                break;
                break;

-           case 0x81: 
-               printf("Not listening for calling name\n"); 
+           case 0x81:
+               printf("Not listening for calling name\n");

                break;
                break;

-           case 0x82: 
-               printf("Called name not present\n"); 
+           case 0x82:
+               printf("Called name not present\n");

                break;
                break;

-           case 0x83: 
-               printf("Called name present, but insufficient resources\n"); 
+           case 0x83:
+               printf("Called name present, but insufficient resources\n");

                break;
            default:
                break;
            default:

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

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

-           data = fdata(data, "NBT Session Keepalive\nFlags=[rW]\n", maxbuf);
+           data = smb_fdata(data, "NBT Session Keepalive\nFlags=[rW]\n", maxbuf);

            break;
 
        default:
            printf("flags=0x%x\n", flags);
            break;
 
        default:
            printf("flags=0x%x\n", flags);

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

     }
     printf("\n");
     fflush(stdout);
     }
     printf("\n");
     fflush(stdout);


@@ -892,139 +892,147 @@ nbt_tcp_print(const uchar *data, int length)
  * 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 uchar *data, int length)
+nbt_udp137_print(const u_char *data, int length)

 {
 {

-  const uchar *maxbuf = data + length;
-  int name_trn_id = RSVAL(data,0);
-  int response = (CVAL(data,2)>>7);
-  int opcode = (CVAL(data,2) >> 3) & 0xF;
-  int nm_flags = ((CVAL(data,2) & 0x7) << 4) + (CVAL(data,3)>>4);
-  int rcode = CVAL(data,3) & 0xF;
-  int qdcount = RSVAL(data,4);
-  int ancount = RSVAL(data,6);
-  int nscount = RSVAL(data,8);
-  int arcount = RSVAL(data,10);
-  char *opcodestr;  
-  const char *p;
-
-  startbuf = data;
-
-  if (maxbuf <= data) return;
-
-  if (vflag > 1)
-    printf("\n>>> ");
-
-  printf("NBT UDP PACKET(137): ");
-
-  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;
-  default: opcodestr = "OPUNKNOWN"; break;
-  }
-  printf("%s", opcodestr);
-  if (response) {
-    if (rcode)
-      printf("; NEGATIVE");
+    const u_char *maxbuf = data + length;
+    int name_trn_id = RSVAL(data, 0);
+    int response = (CVAL(data, 2) >> 7);
+    int opcode = (CVAL(data, 2) >> 3) & 0xF;
+    int nm_flags = ((CVAL(data, 2) & 0x7) << 4) + (CVAL(data, 3) >> 4);
+    int rcode = CVAL(data, 3) & 0xF;
+    int qdcount = RSVAL(data, 4);
+    int ancount = RSVAL(data, 6);
+    int nscount = RSVAL(data, 8);
+    int arcount = RSVAL(data, 10);
+    char *opcodestr;
+    const char *p;
+    int total, i;
+
+    startbuf = data;
+
+    if (maxbuf <= data)
+       return;
+
+    if (vflag > 1)
+       printf("\n>>> ");
+
+    printf("NBT UDP PACKET(137): ");
+
+    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);
+    if (response) {
+       if (rcode)
+           printf("; NEGATIVE");
+       else
+           printf("; POSITIVE");
+    }
+
+    if (response)
+       printf("; RESPONSE");

     else
     else

-      printf("; POSITIVE");
-  }
-    
-  if (response) 
-    printf("; RESPONSE");
-  else
-    printf("; REQUEST");
-
-  if (nm_flags&1)
-    printf("; BROADCAST");
-  else
-    printf("; UNICAST");
-  
-  if (vflag < 2)
-    return;
-
-  printf("\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,arcount);
-
-  p = data + 12;
-
-  {
-    int total = ancount+nscount+arcount;
-    int i;
+       printf("; REQUEST");
+
+    if (nm_flags & 1)
+       printf("; BROADCAST");
+    else
+       printf("; UNICAST");
+
+    if (vflag < 2)
+       return;
+
+    printf("\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,
+       arcount);
+
+    p = data + 12;

 
 

-    if (qdcount>100 || total>100) {
-      printf("Corrupt packet??\n");
-      return;
+    total = ancount + nscount + arcount;
+
+    if (qdcount > 100 || total > 100) {
+       printf("Corrupt packet??\n");
+       return;

     }
 
     if (qdcount) {
     }
 
     if (qdcount) {

-      printf("QuestionRecords:\n");
-      for (i=0;i<qdcount;i++)
-       p = fdata(p,"|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#",maxbuf);
+       printf("QuestionRecords:\n");
+       for (i = 0; i < qdcount; i++)
+           p = smb_fdata(p,
+               "|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#",
+               maxbuf);

        if (p == NULL)
        if (p == NULL)

-         goto out;
+           goto out;

     }
 
     if (total) {
     }
 
     if (total) {

-      printf("\nResourceRecords:\n");
-      for (i=0;i<total;i++) {    
-       int rdlen;
-       int restype;
-       p = fdata(p,"Name=[n1]\n#",maxbuf);
-       if (p == NULL)
-         goto out;
-       restype = RSVAL(p,0);
-       p = fdata(p,"ResType=[rw]\nResClass=[rw]\nTTL=[rD]\n",p+8);
-       if (p == NULL)
-         goto out;
-       rdlen = RSVAL(p,0);
-       printf("ResourceLength=%d\nResourceData=\n",rdlen);
-       p += 2;
-       if (rdlen == 6) {
-         p = fdata(p,"AddrType=[rw]\nAddress=[b.b.b.b]\n",p+rdlen);
-         if (p == NULL)
-           goto out;
-       } else {
-         if (restype == 0x21) {
-           int numnames = CVAL(p,0);
-           p = fdata(p,"NumNames=[B]\n",p+1);
+       printf("\nResourceRecords:\n");
+       for (i = 0; i < total; i++) {
+           int rdlen;
+           int restype;
+
+           p = smb_fdata(p, "Name=[n1]\n#", maxbuf);
+           if (p == NULL)
+               goto out;
+           restype = RSVAL(p, 0);
+           p = smb_fdata(p, "ResType=[rw]\nResClass=[rw]\nTTL=[rD]\n", p + 8);

            if (p == NULL)
            if (p == NULL)

-             goto out;
-           while (numnames--) {
-             p = fdata(p,"Name=[n2]\t#",maxbuf);
-             if (p[0] & 0x80) printf("<GROUP> ");
-             switch (p[0] & 0x60) {
-             case 0x00: printf("B "); break;
-             case 0x20: printf("P "); break;
-             case 0x40: printf("M "); break;
-             case 0x60: printf("_ "); break;
-             }
-             if (p[0] & 0x10) printf("<DEREGISTERING> ");
-             if (p[0] & 0x08) printf("<CONFLICT> ");
-             if (p[0] & 0x04) printf("<ACTIVE> ");
-             if (p[0] & 0x02) printf("<PERMANENT> ");
-             printf("\n");
-             p += 2;
+               goto out;
+           rdlen = RSVAL(p, 0);
+           printf("ResourceLength=%d\nResourceData=\n", rdlen);
+           p += 2;
+           if (rdlen == 6) {
+               p = smb_fdata(p, "AddrType=[rw]\nAddress=[b.b.b.b]\n", p + rdlen);
+               if (p == NULL)
+                   goto out;
+           } else {
+               if (restype == 0x21) {
+                   int numnames = CVAL(p, 0);
+                   p = smb_fdata(p, "NumNames=[B]\n", p + 1);
+                   if (p == NULL)
+                       goto out;
+                   while (numnames--) {
+                       p = smb_fdata(p, "Name=[n2]\t#", maxbuf);
+                       if (p[0] & 0x80)
+                           printf("<GROUP> ");
+                       switch (p[0] & 0x60) {
+                       case 0x00: printf("B "); break;
+                       case 0x20: printf("P "); break;
+                       case 0x40: printf("M "); break;
+                       case 0x60: printf("_ "); break;
+                       }
+                       if (p[0] & 0x10)
+                           printf("<DEREGISTERING> ");
+                       if (p[0] & 0x08)
+                           printf("<CONFLICT> ");
+                       if (p[0] & 0x04)
+                           printf("<ACTIVE> ");
+                       if (p[0] & 0x02)
+                           printf("<PERMANENT> ");
+                       printf("\n");
+                       p += 2;
+                   }
+               } else {
+                   print_data(p, min(rdlen, length - ((const u_char *)p - data)));
+                   p += rdlen;
+               }

            }
            }

-         } else {
-           print_data(p, min(rdlen, length - ((const uchar *)p - data)));
-           p += rdlen;
-         }

        }
        }

-      }

     }
     }

-  }

 
 

-  if ((uchar*)p < maxbuf) {
-    fdata(p,"AdditionalData:\n",maxbuf);    
-  }      
-  
+    if ((u_char*)p < maxbuf)
+       smb_fdata(p, "AdditionalData:\n", maxbuf);
+

 out:
 out:

-  printf("\n");
-  fflush(stdout);
+    printf("\n");
+    fflush(stdout);

 }
 
 
 }
 
 


@@ -1032,149 +1040,168 @@ out:
 /*
  * print a NBT packet received across udp on port 138
  */
 /*
  * print a NBT packet received across udp on port 138
  */

-void nbt_udp138_print(const uchar *data, int length)
+void
+nbt_udp138_print(const u_char *data, int length)

 {
 {

-  const uchar *maxbuf = data + length;
+    const u_char *maxbuf = data + length;

 
 

-  if (maxbuf > snapend) maxbuf = snapend;
-  if (maxbuf <= data) return;
-  startbuf = data;
+    if (maxbuf > snapend)
+       maxbuf = snapend;
+    if (maxbuf <= data)
+       return;
+    startbuf = data;

 
 

-  if (vflag < 2) {
-    printf("NBT UDP PACKET(138)");
-    return;
-  }
+    if (vflag < 2) {
+       printf("NBT UDP PACKET(138)");
+       return;
+    }

 
 

-  data = fdata(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);
+    data = smb_fdata(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);

 
 

-  if (data != NULL)
-    print_smb(data,maxbuf);
-  
-  printf("\n");
-  fflush(stdout);
-}
+    if (data != NULL)
+       print_smb(data, maxbuf);

 
 

+    printf("\n");
+    fflush(stdout);
+}

 
 
 /*
 
 
 /*

-   print netbeui frames 
+   print netbeui frames

 */
 */

-void netbeui_print(u_short control, const uchar *data, int length)
+void
+netbeui_print(u_short control, const u_char *data, int length)

 {
 {

-  const uchar *maxbuf = data + length;
-  int len;
-  int command;
-  const uchar *data2;
-  int is_truncated = 0;
-
-  if (maxbuf > snapend)
-    maxbuf = snapend;
-  if (&data[7] >= maxbuf)
-    goto out;
-  len = SVAL(data,0);
-  command = CVAL(data,4);
-  data2 = data + len;
-  if (data2 >= maxbuf) {
-    data2 = maxbuf;
-    is_truncated = 1;
-  }
-
-  startbuf = data;
-
-  if (vflag < 2) {
-    printf("NetBeui Packet");
-    return;
-  }
-
-  printf("\n>>> NetBeui Packet\nType=0x%X ", control);
-  data = fdata(data,"Length=[d] Signature=[w] Command=[B]\n#",maxbuf);
-  if (data == NULL)
-    goto out;
-
-  switch (command) {
-  case 0xA: 
-    data = fdata(data,"NameQuery:[P1]\nSessionNumber=[B]\nNameType=[B][P2]\nResponseCorrelator=[w]\nDestination=[n2]\nSource=[n2]\n",data2);
-    break;
-
-  case 0x8:
-    data = fdata(data,"NetbiosDataGram:[P7]\nDestination=[n2]\nSource=[n2]\n",data2);
-    break;
-
-  case 0xE:
-    data = fdata(data,"NameRecognise:\n[P1]\nData2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nDestination=[n2]\nSource=[n2]\n",data2);
-    break;
-
-  case 0x19:
-    data = fdata(data,"SessionInitialise:\nData1=[B]\nData2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",data2);
-    break;
-
-  case 0x17:
-    data = fdata(data,"SessionConfirm:\nData1=[B]\nData2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",data2);
-    break;
-
-  case 0x16:
-    data = fdata(data,"NetbiosDataOnlyLast:\nFlags=[{|NO_ACK|PIGGYBACK_ACK_ALLOWED|PIGGYBACK_ACK_INCLUDED|}]\nResyncIndicator=[w][P2]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",data2);
-    break;
-
-  case 0x14:
-    data = fdata(data,"NetbiosDataAck:\n[P3]TransmitCorrelator=[w][P2]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",data2);
-    break;
-
-  case 0x18:
-    data = fdata(data,"SessionEnd:\n[P1]Data2=[w][P4]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",data2);
-    break;
-
-  case 0x1f:
-    data = fdata(data,"SessionAlive\n",data2);
-    break;
-
-  default:
-    data = fdata(data,"Unknown Netbios Command ",data2);
-    break;
-  }
-  if (data == NULL)
-    goto out;
-
-  if (is_truncated) {
-    /* data2 was past the end of the buffer */
-    goto out;
-  }
-
-  /* If there isn't enough data for "\377SMB", don't look for it. */
-  if (&data2[3] >= maxbuf)
-    goto out;
-
-  if (memcmp(data2,"\377SMB",4)==0) {
-    print_smb(data2,maxbuf);
-  } 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);
+    const u_char *maxbuf = data + length;
+    int len;
+    int command;
+    const u_char *data2;
+    int is_truncated = 0;
+
+    if (maxbuf > snapend)
+       maxbuf = snapend;
+    if (&data[7] >= maxbuf)
+       goto out;
+    len = SVAL(data,0);
+    command = CVAL(data,4);
+    data2 = data + len;
+    if (data2 >= maxbuf) {
+       data2 = maxbuf;
+       is_truncated = 1;
+    }
+
+    startbuf = data;
+
+    if (vflag < 2) {
+       printf("NetBeui Packet");
+       return;
+    }
+
+    printf("\n>>> NetBeui Packet\nType=0x%X ", control);
+    data = smb_fdata(data, "Length=[d] Signature=[w] Command=[B]\n#", maxbuf);
+    if (data == NULL)
+       goto out;
+
+    switch (command) {
+    case 0xA:
+       data = smb_fdata(data, "NameQuery:[P1]\nSessionNumber=[B]\nNameType=[B][P2]\nResponseCorrelator=[w]\nDestination=[n2]\nSource=[n2]\n", data2);
+       break;
+
+    case 0x8:
+       data = smb_fdata(data,
+           "NetbiosDataGram:[P7]\nDestination=[n2]\nSource=[n2]\n", data2);
+       break;
+
+    case 0xE:
+       data = smb_fdata(data,
+           "NameRecognise:\n[P1]\nData2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nDestination=[n2]\nSource=[n2]\n",
+           data2);
+       break;
+
+    case 0x19:
+       data = smb_fdata(data,
+           "SessionInitialise:\nData1=[B]\nData2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",
+           data2);
+       break;
+
+    case 0x17:
+       data = smb_fdata(data,
+           "SessionConfirm:\nData1=[B]\nData2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",
+           data2);
+       break;
+
+    case 0x16:
+       data = smb_fdata(data,
+           "NetbiosDataOnlyLast:\nFlags=[{|NO_ACK|PIGGYBACK_ACK_ALLOWED|PIGGYBACK_ACK_INCLUDED|}]\nResyncIndicator=[w][P2]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",
+           data2);
+       break;
+
+    case 0x14:
+       data = smb_fdata(data,
+           "NetbiosDataAck:\n[P3]TransmitCorrelator=[w][P2]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",
+           data2);
+       break;
+
+    case 0x18:
+       data = smb_fdata(data,
+           "SessionEnd:\n[P1]Data2=[w][P4]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n",
+           data2);
+       break;
+
+    case 0x1f:
+       data = smb_fdata(data, "SessionAlive\n", data2);
+       break;
+
+    default:
+       data = smb_fdata(data, "Unknown Netbios Command ", data2);

        break;
        break;

-      }

     }
     }

-  }
+    if (data == NULL)
+       goto out;
+
+    if (is_truncated) {
+       /* data2 was past the end of the buffer */
+       goto out;
+    }
+
+    /* If there isn't enough data for "\377SMB", don't look for it. */
+    if (&data2[3] >= maxbuf)
+       goto out;
+
+    if (memcmp(data2, "\377SMB",4) == 0)
+       print_smb(data2, maxbuf);
+    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);
+               break;
+           }
+       }
+    }

 
 out:
 
 out:

-  printf("\n");
+    printf("\n");

 }
 
 
 /*
 }
 
 
 /*

- * print IPX-Netbios frames 
+ * print IPX-Netbios frames

  */
  */

-void ipx_netbios_print(const uchar *data, u_int length)
+void
+ipx_netbios_print(const u_char *data, u_int length)

 {
     /*
      * this is a hack till I work out how to parse the rest of the
      * NetBIOS-over-IPX stuff
      */
     int i;
 {
     /*
      * this is a hack till I work out how to parse the rest of the
      * NetBIOS-over-IPX stuff
      */
     int i;

-    const uchar *maxbuf;
+    const u_char *maxbuf;

 
     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. */


@@ -1185,7 +1212,7 @@ void ipx_netbios_print(const uchar *data, u_int length)
        if (&data[i + 4] > maxbuf)
            break;
        if (memcmp(&data[i], "\377SMB", 4) == 0) {
        if (&data[i + 4] > maxbuf)
            break;
        if (memcmp(&data[i], "\377SMB", 4) == 0) {

-           fdata(data, "\n>>> IPX transport ", &data[i]);
+           smb_fdata(data, "\n>>> IPX transport ", &data[i]);

            if (data != NULL)
                print_smb(&data[i], maxbuf);
            printf("\n");
            if (data != NULL)
                print_smb(&data[i], maxbuf);
            printf("\n");


@@ -1194,5 +1221,5 @@ void ipx_netbios_print(const uchar *data, u_int length)
        }
     }
     if (i == 128)
        }
     }
     if (i == 128)

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

 }
 }