-/*
+/*
* Copyright (C) Andrew Tridgell 1995-1999
*
* This software may be distributed either under the terms of the
* or later
*/
+#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.12 2001-06-25 03:07:30 itojun Exp $";
-#endif
+#include <tcpdump-stdinc.h>
-#include <stdio.h>
#include <string.h>
-#include <sys/types.h>
#include "interface.h"
+#include "extract.h"
#include "smb.h"
+static const char tstr[] = "[|SMB]";
+
static int request = 0;
+static int unicodestr = 0;
-const uchar *startbuf = NULL;
+const u_char *startbuf = NULL;
struct smbdescript {
- char *req_f1;
- char *req_f2;
- char *rep_f1;
- char *rep_f2;
- /*
- * sometimes (u_char *, u_char *, u_char *, u_char *) and
- * sometimes (u_char *, u_char *, int, int)
- */
- void (*fn)(const u_char *, const u_char *, ...);
+ const char *req_f1;
+ const char *req_f2;
+ const char *rep_f1;
+ const char *rep_f2;
+ void (*fn)(netdissect_options *, const u_char *, const u_char *, const u_char *, const u_char *);
+};
+
+struct smbdescriptint {
+ const char *req_f1;
+ const char *req_f2;
+ const char *rep_f1;
+ const char *rep_f2;
+ void (*fn)(netdissect_options *, const u_char *, const u_char *, int, int);
};
struct smbfns
{
int id;
- char *name;
+ const char *name;
int flags;
struct smbdescript descript;
};
-#define DEFDESCRIPT {NULL,NULL,NULL,NULL,NULL}
+struct smbfnsint
+{
+ int id;
+ const char *name;
+ int flags;
+ struct smbdescriptint descript;
+};
-#define FLG_CHAIN (1<<0)
+#define DEFDESCRIPT { NULL, NULL, NULL, NULL, NULL }
-static struct smbfns *
-smbfind(int id, struct smbfns *list)
+#define FLG_CHAIN (1 << 0)
+
+static const struct smbfns *
+smbfind(int id, const struct smbfns *list)
{
int sindex;
- for (sindex = 0; list[sindex].name; sindex++)
+ for (sindex = 0; list[sindex].name; sindex++)
if (list[sindex].id == id)
return(&list[sindex]);
return(&list[0]);
}
-static void
-trans2_findfirst(const uchar *param, const uchar *data, ...)
+static const struct smbfnsint *
+smbfindint(int id, const struct smbfnsint *list)
{
- char *fmt;
- va_list ap;
- int pcnt, dcnt;
+ int sindex;
- va_start(ap, data);
- pcnt = va_arg(ap, int);
- dcnt = va_arg(ap, int);
- va_end(ap);
+ for (sindex = 0; list[sindex].name; sindex++)
+ if (list[sindex].id == id)
+ return(&list[sindex]);
+
+ return(&list[0]);
+}
+
+static void
+trans2_findfirst(netdissect_options *ndo,
+ const u_char *param, const u_char *data, int pcnt, int dcnt)
+{
+ const char *fmt;
if (request)
- fmt = "Attribute=[A]\nSearchCount=[d]\nFlags=[w]\nLevel=[dP5]\nFile=[S]\n";
+ fmt = "Attribute=[A]\nSearchCount=[d]\nFlags=[w]\nLevel=[dP4]\nFile=[S]\n";
else
fmt = "Handle=[w]\nCount=[d]\nEOS=[w]\nEoffset=[d]\nLastNameOfs=[w]\n";
- fdata(param, fmt, param + pcnt);
+ smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);
if (dcnt) {
- printf("data:\n");
- print_data(data, dcnt);
+ ND_PRINT((ndo, "data:\n"));
+ print_data(ndo, data, dcnt);
}
}
static void
-trans2_qfsinfo(const uchar *param, const uchar *data, ...)
+trans2_qfsinfo(netdissect_options *ndo,
+ const u_char *param, const u_char *data, int pcnt, int dcnt)
{
static int level = 0;
- char *fmt="";
- va_list ap;
- int pcnt, dcnt;
-
- va_start(ap, data);
- pcnt = va_arg(ap, int);
- dcnt = va_arg(ap, int);
- va_end(ap);
+ const char *fmt="";
if (request) {
- level = SVAL(param, 0);
+ ND_TCHECK2(*param, 2);
+ level = EXTRACT_LE_16BITS(param);
fmt = "InfoLevel=[d]\n";
- fdata(param, fmt, param + pcnt);
+ smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);
} else {
switch (level) {
case 1:
fmt = "idFileSystem=[W]\nSectorUnit=[D]\nUnit=[D]\nAvail=[D]\nSectorSize=[d]\n";
break;
case 2:
- fmt = "CreationTime=[T2]VolNameLength=[B]\nVolumeLabel=[s12]\n";
+ fmt = "CreationTime=[T2]VolNameLength=[lb]\nVolumeLabel=[c]\n";
break;
case 0x105:
- fmt = "Capabilities=[W]\nMaxFileLen=[D]\nVolNameLen=[D]\nVolume=[S]\n";
+ fmt = "Capabilities=[W]\nMaxFileLen=[D]\nVolNameLen=[lD]\nVolume=[C]\n";
break;
default:
fmt = "UnknownLevel\n";
break;
}
- fdata(data, fmt, data + dcnt);
+ smb_fdata(ndo, data, fmt, data + dcnt, unicodestr);
}
if (dcnt) {
- printf("data:\n");
- print_data(data, dcnt);
+ ND_PRINT((ndo, "data:\n"));
+ print_data(ndo, data, dcnt);
}
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
}
-struct smbfns trans2_fns[] = {
- { 0, "TRANSACT2_OPEN", 0,
+static const struct smbfnsint trans2_fns[] = {
+ { 0, "TRANSACT2_OPEN", 0,
{ "Flags2=[w]\nMode=[w]\nSearchAttrib=[A]\nAttrib=[A]\nTime=[T2]\nOFun=[w]\nSize=[D]\nRes=([w, w, w, w, w])\nPath=[S]",
- 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",
- 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
-print_trans2(const uchar *words, const uchar *dat, ...)
+print_trans2(netdissect_options *ndo,
+ const u_char *words, const u_char *dat, const u_char *buf, const u_char *maxbuf)
{
- static struct smbfns *fn = &trans2_fns[0];
- uchar *data, *param;
- uchar *f1 = NULL, *f2 = NULL;
+ u_int bcc;
+ static const struct smbfnsint *fn = &trans2_fns[0];
+ const u_char *data, *param;
+ const u_char *w = words + 1;
+ const char *f1 = NULL, *f2 = NULL;
int pcnt, dcnt;
- va_list ap;
- uchar *buf, *maxbuf;
-
- va_start(ap, dat);
- buf = va_arg(ap, uchar *);
- maxbuf = va_arg(ap, uchar *);
- va_end(ap);
+ ND_TCHECK(words[0]);
if (request) {
- fn = smbfind(SVAL(words + 1, 14 * 2), trans2_fns);
- data = buf+SVAL(words + 1, 12 * 2);
- param = buf+SVAL(words + 1, 10 * 2);
- pcnt = SVAL(words + 1, 9 * 2);
- dcnt = SVAL(words + 1, 11 * 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);
+ data = buf + EXTRACT_LE_16BITS(w + 12 * 2);
+ fn = smbfindint(EXTRACT_LE_16BITS(w + 14 * 2), trans2_fns);
} else {
- data = buf+SVAL(words + 1, 7 * 2);
- param = buf+SVAL(words + 1, 4 * 2);
- pcnt = SVAL(words + 1, 3 * 2);
- dcnt = SVAL(words + 1, 6 * 2);
+ if (words[0] == 0) {
+ ND_PRINT((ndo, "%s\n", fn->name));
+ ND_PRINT((ndo, "Trans2Interim\n"));
+ return;
+ }
+ 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);
}
- 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 (CVAL(words, 0) == 8) {
- fdata(words + 1,
+ if (words[0] == 8) {
+ 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);
- return;
+ maxbuf, unicodestr);
+ return;
} else {
- 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);
- fdata(data + 1, "TransactionName=[S]\n%", maxbuf);
+ 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 {
- if (CVAL(words, 0) == 0) {
- printf("Trans2Interim\n");
- return;
- } else {
- 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);
- }
+ 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;
}
+ ND_TCHECK2(*dat, 2);
+ bcc = EXTRACT_LE_16BITS(dat);
+ ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
if (fn->descript.fn)
- fn->descript.fn(param, data, pcnt, dcnt);
+ (*fn->descript.fn)(ndo, 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(ndo, param, f1 ? f1 : "Parameters=\n", param + pcnt, unicodestr);
+ smb_fdata(ndo, data, f2 ? f2 : "Data=\n", data + dcnt, unicodestr);
}
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
}
-
static void
-print_browse(uchar *param, int paramlen, const uchar *data, int datalen)
+print_browse(netdissect_options *ndo,
+ const u_char *param, int paramlen, const u_char *data, int datalen)
{
- const uchar *maxbuf = data + datalen;
- int command = CVAL(data, 0);
+ const u_char *maxbuf = data + datalen;
+ int command;
+
+ ND_TCHECK(data[0]);
+ command = data[0];
- fdata(param, "BROWSE PACKET\n|Param ", param+paramlen);
+ smb_fdata(ndo, param, "BROWSE PACKET\n|Param ", param+paramlen, unicodestr);
switch (command) {
case 0xF:
- data = 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);
+ maxbuf, unicodestr);
break;
case 0x1:
- data = 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);
+ maxbuf, unicodestr);
break;
case 0x2:
- data = fdata(data,
+ data = smb_fdata(ndo, data,
"BROWSE PACKET:\nType=[B] (AnnouncementRequest)\nFlags=[B]\nReplySystemName=[S]\n",
- maxbuf);
+ maxbuf, unicodestr);
break;
case 0xc:
- data = 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);
+ maxbuf, unicodestr);
break;
case 0x8:
- data = fdata(data,
+ data = smb_fdata(ndo, data,
"BROWSE PACKET:\nType=[B] (ElectionFrame)\nElectionVersion=[B]\nOSSummary=[W]\nUptime=[(W, W)]\nServerName=[S]\n",
- maxbuf);
+ maxbuf, unicodestr);
break;
case 0xb:
- data = fdata(data,
+ data = smb_fdata(ndo, data,
"BROWSE PACKET:\nType=[B] (BecomeBackupBrowser)\nName=[S]\n",
- maxbuf);
+ maxbuf, unicodestr);
break;
case 0x9:
- data = fdata(data,
- "BROWSE PACKET:\nType=[B] (GetBackupList)\nListCount?=[B]\nToken?=[B]\n",
- maxbuf);
+ data = smb_fdata(ndo, data,
+ "BROWSE PACKET:\nType=[B] (GetBackupList)\nListCount?=[B]\nToken=[W]\n",
+ maxbuf, unicodestr);
break;
case 0xa:
- data = fdata(data,
- "BROWSE PACKET:\nType=[B] (BackupListResponse)\nServerCount?=[B]\nToken?=[B]*Name=[S]\n",
- maxbuf);
+ data = smb_fdata(ndo, data,
+ "BROWSE PACKET:\nType=[B] (BackupListResponse)\nServerCount?=[B]\nToken=[W]\n*Name=[S]\n",
+ maxbuf, unicodestr);
break;
case 0xd:
- data = fdata(data,
+ data = smb_fdata(ndo, data,
"BROWSE PACKET:\nType=[B] (MasterAnnouncement)\nMasterName=[S]\n",
- maxbuf);
+ maxbuf, unicodestr);
break;
case 0xe:
- data = fdata(data,
- "BROWSE PACKET:\nType=[B] (ResetBrowser)\nOptions=[B]\n", maxbuf);
+ data = smb_fdata(ndo, data,
+ "BROWSE PACKET:\nType=[B] (ResetBrowser)\nOptions=[B]\n", maxbuf, unicodestr);
break;
default:
- data = fdata(data, "Unknown Browser Frame ", maxbuf);
+ data = smb_fdata(ndo, data, "Unknown Browser Frame ", maxbuf, unicodestr);
break;
}
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
}
static void
-print_ipc(uchar *param, int paramlen, uchar *data, int datalen)
+print_ipc(netdissect_options *ndo,
+ const u_char *param, int paramlen, const u_char *data, int datalen)
{
if (paramlen)
- 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)
- fdata(data, "IPC ", data + datalen);
+ smb_fdata(ndo, data, "IPC ", data + datalen, unicodestr);
}
static void
-print_trans(const uchar *words, const uchar *data1, ...)
+print_trans(netdissect_options *ndo,
+ const u_char *words, const u_char *data1, const u_char *buf, const u_char *maxbuf)
{
- uchar *f1,*f2,*f3,*f4;
- uchar *data,*param;
- int datalen,paramlen;
- va_list ap;
- uchar *buf, *maxbuf;
-
- va_start(ap, data1);
- buf = va_arg(ap, uchar *);
- maxbuf = va_arg(ap, uchar *);
- va_end(ap);
-
- if (request) {
- paramlen = SVAL(words+1,9*2);
- param = buf + SVAL(words+1,10*2);
- datalen = SVAL(words+1,11*2);
- data = buf + SVAL(words+1,12*2);
- f1 = "TotParamCnt=[d] \nTotDataCnt=[d] \nMaxParmCnt=[d] \nMaxDataCnt=[d]\nMaxSCnt=[d] \nTransFlags=[w] \nRes1=[w] \nRes2=[w] \nRes3=[w]\nParamCnt=[d] \nParamOff=[d] \nDataCnt=[d] \nDataOff=[d] \nSUCnt=[d]\n";
- f2 = "|Name=[S]\n";
- f3 = "|Param ";
- f4 = "|Data ";
- } else {
- paramlen = SVAL(words+1,3*2);
- param = buf + SVAL(words+1,4*2);
- datalen = SVAL(words+1,6*2);
- data = buf + SVAL(words+1,7*2);
- f1 = "TotParamCnt=[d] \nTotDataCnt=[d] \nRes1=[d]\nParamCnt=[d] \nParamOff=[d] \nRes2=[d] \nDataCnt=[d] \nDataOff=[d] \nRes3=[d]\nLsetup=[d]\n";
- f2 = "|Unknown ";
- f3 = "|Param ";
- f4 = "|Data ";
- }
-
- fdata(words+1,f1,MIN(words+1+2*CVAL(words,0),maxbuf));
- fdata(data1+2,f2,maxbuf - (paramlen + datalen));
-
- if (!strcmp(data1+2,"\\MAILSLOT\\BROWSE")) {
- print_browse(param,paramlen,data,datalen);
- return;
- }
+ u_int bcc;
+ const char *f1, *f2, *f3, *f4;
+ const u_char *data, *param;
+ const u_char *w = words + 1;
+ int datalen, paramlen;
- if (!strcmp(data1+2,"\\PIPE\\LANMAN")) {
- print_ipc(param,paramlen,data,datalen);
- return;
- }
+ if (request) {
+ 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);
+ data = buf + EXTRACT_LE_16BITS(w + 12 * 2);
+ f1 = "TotParamCnt=[d] \nTotDataCnt=[d] \nMaxParmCnt=[d] \nMaxDataCnt=[d]\nMaxSCnt=[d] \nTransFlags=[w] \nRes1=[w] \nRes2=[w] \nRes3=[w]\nParamCnt=[d] \nParamOff=[d] \nDataCnt=[d] \nDataOff=[d] \nSUCnt=[d]\n";
+ f2 = "|Name=[S]\n";
+ f3 = "|Param ";
+ f4 = "|Data ";
+ } else {
+ 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);
+ data = buf + EXTRACT_LE_16BITS(w + 7 * 2);
+ f1 = "TotParamCnt=[d] \nTotDataCnt=[d] \nRes1=[d]\nParamCnt=[d] \nParamOff=[d] \nRes2=[d] \nDataCnt=[d] \nDataOff=[d] \nRes3=[d]\nLsetup=[d]\n";
+ f2 = "|Unknown ";
+ f3 = "|Param ";
+ f4 = "|Data ";
+ }
- if (paramlen) fdata(param,f3,MIN(param+paramlen,maxbuf));
- if (datalen) fdata(data,f4,MIN(data+datalen,maxbuf));
-}
+ smb_fdata(ndo, words + 1, f1, min(words + 1 + 2 * words[0], maxbuf),
+ unicodestr);
+ ND_TCHECK2(*data1, 2);
+ bcc = EXTRACT_LE_16BITS(data1);
+ ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+ if (bcc > 0) {
+ smb_fdata(ndo, data1 + 2, f2, maxbuf - (paramlen + datalen), unicodestr);
+ if (strcmp((const char *)(data1 + 2), "\\MAILSLOT\\BROWSE") == 0) {
+ print_browse(ndo, param, paramlen, data, datalen);
+ return;
+ }
-static void
-print_negprot(const uchar *words, const uchar *data, ...)
-{
- uchar *f1=NULL,*f2=NULL;
- va_list ap;
- uchar *buf, *maxbuf;
-
- va_start(ap, data);
- buf = va_arg(ap, uchar *);
- maxbuf = va_arg(ap, uchar *);
- va_end(ap);
-
- if (request) {
- f2 = "*|Dialect=[Z]\n";
- } else {
- if (CVAL(words,0) == 1) {
- f1 = "Core Protocol\nDialectIndex=[d]";
- } else if (CVAL(words,0) == 17) {
- f1 = "NT1 Protocol\nDialectIndex=[d]\nSecMode=[B]\nMaxMux=[d]\nNumVcs=[d]\nMaxBuffer=[D]\nRawSize=[D]\nSessionKey=[W]\nCapabilities=[W]\nServerTime=[T3]TimeZone=[d]\nCryptKey=";
- } else if (CVAL(words,0) == 13) {
- f1 = "Coreplus/Lanman1/Lanman2 Protocol\nDialectIndex=[d]\nSecMode=[w]\nMaxXMit=[d]\nMaxMux=[d]\nMaxVcs=[d]\nBlkMode=[w]\nSessionKey=[W]\nServerTime=[T1]TimeZone=[d]\nRes=[W]\nCryptKey=";
+ if (strcmp((const char *)(data1 + 2), "\\PIPE\\LANMAN") == 0) {
+ print_ipc(ndo, param, paramlen, data, datalen);
+ return;
+ }
+
+ if (paramlen)
+ smb_fdata(ndo, param, f3, min(param + paramlen, maxbuf), unicodestr);
+ if (datalen)
+ smb_fdata(ndo, data, f4, min(data + datalen, maxbuf), unicodestr);
}
- }
-
- if (f1)
- 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)));
-
- if (f2)
- 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)));
-
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
}
+
static void
-print_sesssetup(const uchar *words, const uchar *data, ...)
+print_negprot(netdissect_options *ndo,
+ const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf)
{
- int wcnt = CVAL(words,0);
- uchar *f1=NULL,*f2=NULL;
- va_list ap;
- uchar *buf, *maxbuf;
-
- va_start(ap, data);
- buf = va_arg(ap, uchar *);
- maxbuf = va_arg(ap, uchar *);
- va_end(ap);
-
- if (request) {
- if (wcnt==10) {
- f1 = "Com2=[w]\nOff2=[d]\nBufSize=[d]\nMpxMax=[d]\nVcNum=[d]\nSessionKey=[W]\nPassLen=[d]\nCryptLen=[d]\nCryptOff=[d]\nPass&Name=\n";
- } else {
- f1 = "Com2=[B]\nRes1=[B]\nOff2=[d]\nMaxBuffer=[d]\nMaxMpx=[d]\nVcNumber=[d]\nSessionKey=[W]\nCaseInsensitivePasswordLength=[d]\nCaseSensitivePasswordLength=[d]\nRes=[W]\nCapabilities=[W]\nPass1&Pass2&Account&Domain&OS&LanMan=\n";
+ u_int wct, bcc;
+ const char *f1 = NULL, *f2 = NULL;
+
+ ND_TCHECK(words[0]);
+ wct = words[0];
+ if (request)
+ f2 = "*|Dialect=[Y]\n";
+ else {
+ if (wct == 1)
+ f1 = "Core Protocol\nDialectIndex=[d]";
+ else if (wct == 17)
+ f1 = "NT1 Protocol\nDialectIndex=[d]\nSecMode=[B]\nMaxMux=[d]\nNumVcs=[d]\nMaxBuffer=[D]\nRawSize=[D]\nSessionKey=[W]\nCapabilities=[W]\nServerTime=[T3]TimeZone=[d]\nCryptKey=";
+ else if (wct == 13)
+ f1 = "Coreplus/Lanman1/Lanman2 Protocol\nDialectIndex=[d]\nSecMode=[w]\nMaxXMit=[d]\nMaxMux=[d]\nMaxVcs=[d]\nBlkMode=[w]\nSessionKey=[W]\nServerTime=[T1]TimeZone=[d]\nRes=[W]\nCryptKey=";
}
- } else {
- if (CVAL(words,0) == 3) {
- f1 = "Com2=[w]\nOff2=[d]\nAction=[w]\n";
- } else if (CVAL(words,0) == 13) {
- f1 = "Com2=[B]\nRes=[B]\nOff2=[d]\nAction=[w]\n";
- f2 = "NativeOS=[S]\nNativeLanMan=[S]\nPrimaryDomain=[S]\n";
+
+ if (f1)
+ smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf),
+ unicodestr);
+ else
+ print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));
+
+ ND_TCHECK2(*data, 2);
+ bcc = EXTRACT_LE_16BITS(data);
+ ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+ if (bcc > 0) {
+ if (f2)
+ smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data),
+ maxbuf), unicodestr);
+ else
+ print_data(ndo, data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));
}
- }
-
- if (f1)
- 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)));
-
- if (f2)
- 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)));
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
}
-
-static struct smbfns smb_fns[] =
+static void
+print_sesssetup(netdissect_options *ndo,
+ const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf)
{
-{-1,"SMBunknown",0,DEFDESCRIPT},
-
-{SMBtcon,"SMBtcon",0,
- {NULL,"Path=[Z]\nPassword=[Z]\nDevice=[Z]\n",
- "MaxXmit=[d]\nTreeId=[d]\n",NULL,
- NULL}},
-
-
-{SMBtdis,"SMBtdis",0,DEFDESCRIPT},
-{SMBexit,"SMBexit",0,DEFDESCRIPT},
-{SMBioctl,"SMBioctl",0,DEFDESCRIPT},
-
-{SMBecho,"SMBecho",0,
- {"ReverbCount=[d]\n",NULL,
- "SequenceNum=[d]\n",NULL,
- NULL}},
+ u_int wct, bcc;
+ const char *f1 = NULL, *f2 = NULL;
-{SMBulogoffX, "SMBulogoffX",FLG_CHAIN,DEFDESCRIPT},
+ ND_TCHECK(words[0]);
+ wct = words[0];
+ if (request) {
+ if (wct == 10)
+ f1 = "Com2=[w]\nOff2=[d]\nBufSize=[d]\nMpxMax=[d]\nVcNum=[d]\nSessionKey=[W]\nPassLen=[d]\nCryptLen=[d]\nCryptOff=[d]\nPass&Name=\n";
+ else
+ f1 = "Com2=[B]\nRes1=[B]\nOff2=[d]\nMaxBuffer=[d]\nMaxMpx=[d]\nVcNumber=[d]\nSessionKey=[W]\nCaseInsensitivePasswordLength=[d]\nCaseSensitivePasswordLength=[d]\nRes=[W]\nCapabilities=[W]\nPass1&Pass2&Account&Domain&OS&LanMan=\n";
+ } else {
+ if (wct == 3) {
+ f1 = "Com2=[w]\nOff2=[d]\nAction=[w]\n";
+ } else if (wct == 13) {
+ f1 = "Com2=[B]\nRes=[B]\nOff2=[d]\nAction=[w]\n";
+ f2 = "NativeOS=[S]\nNativeLanMan=[S]\nPrimaryDomain=[S]\n";
+ }
+ }
-{SMBgetatr,"SMBgetatr",0,
- {NULL,"Path=[Z]\n",
- "Attribute=[A]\nTime=[T2]Size=[D]\nRes=([w,w,w,w,w])\n",NULL,
- NULL}},
+ if (f1)
+ smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf),
+ unicodestr);
+ else
+ print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));
+
+ ND_TCHECK2(*data, 2);
+ bcc = EXTRACT_LE_16BITS(data);
+ ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+ if (bcc > 0) {
+ if (f2)
+ smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data),
+ maxbuf), unicodestr);
+ else
+ print_data(ndo, data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));
+ }
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
+}
-{SMBsetatr,"SMBsetatr",0,
- {"Attribute=[A]\nTime=[T2]Res=([w,w,w,w,w])\n","Path=[Z]\n",
- NULL,NULL,NULL}},
+static void
+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;
-{SMBchkpth,"SMBchkpth",0,
- {NULL,"Path=[Z]\n",NULL,NULL,NULL}},
+ 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";
+ ND_TCHECK(words[7]);
+ if (words[7] & 0x10)
+ f2 = "*Process=[d]\n[P2]Offset=[M]\nLength=[M]\n";
+ else
+ f2 = "*Process=[d]\nOffset=[D]\nLength=[D]\n";
+ } else {
+ f1 = "Com2=[w]\nOff2=[d]\n";
+ }
-{SMBsearch,"SMBsearch",0,
-{"Count=[d]\nAttrib=[A]\n","Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\n",
-"Count=[d]\n","BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",NULL}},
+ maxwords = min(words + 1 + wct * 2, maxbuf);
+ if (wct)
+ smb_fdata(ndo, words + 1, f1, maxwords, unicodestr);
+
+ ND_TCHECK2(*data, 2);
+ bcc = EXTRACT_LE_16BITS(data);
+ ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
+ if (bcc > 0) {
+ if (f2)
+ smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data),
+ maxbuf), unicodestr);
+ else
+ print_data(ndo, data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2)));
+ }
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
+}
-{SMBopen,"SMBopen",0,
- {"Mode=[w]\nAttribute=[A]\n","Path=[Z]\n",
- "Handle=[d]\nOAttrib=[A]\nTime=[T2]Size=[D]\nAccess=[w]\n",NULL,
- NULL}},
+static const struct smbfns smb_fns[] = {
+ { -1, "SMBunknown", 0, DEFDESCRIPT },
-{SMBcreate,"SMBcreate",0,
- {"Attrib=[A]\nTime=[T2]","Path=[Z]\n",
- "Handle=[d]\n",NULL,
- NULL}},
+ { SMBtcon, "SMBtcon", 0,
+ { NULL, "Path=[Z]\nPassword=[Z]\nDevice=[Z]\n",
+ "MaxXmit=[d]\nTreeId=[d]\n", NULL,
+ NULL } },
-{SMBmknew,"SMBmknew",0,
- {"Attrib=[A]\nTime=[T2]","Path=[Z]\n",
- "Handle=[d]\n",NULL,
- NULL}},
+ { SMBtdis, "SMBtdis", 0, DEFDESCRIPT },
+ { SMBexit, "SMBexit", 0, DEFDESCRIPT },
+ { SMBioctl, "SMBioctl", 0, DEFDESCRIPT },
-{SMBunlink,"SMBunlink",0,
- {"Attrib=[A]\n","Path=[Z]\n",NULL,NULL,NULL}},
+ { SMBecho, "SMBecho", 0,
+ { "ReverbCount=[d]\n", NULL,
+ "SequenceNum=[d]\n", NULL,
+ NULL } },
-{SMBread,"SMBread",0,
- {"Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n",NULL,
- "Count=[d]\nRes=([w,w,w,w])\n",NULL,NULL}},
+ { SMBulogoffX, "SMBulogoffX", FLG_CHAIN, DEFDESCRIPT },
-{SMBwrite,"SMBwrite",0,
- {"Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n",NULL,
- "Count=[d]\n",NULL,NULL}},
+ { SMBgetatr, "SMBgetatr", 0,
+ { NULL, "Path=[Z]\n",
+ "Attribute=[A]\nTime=[T2]Size=[D]\nRes=([w,w,w,w,w])\n", NULL,
+ NULL } },
-{SMBclose,"SMBclose",0,
- {"Handle=[d]\nTime=[T2]",NULL,NULL,NULL,NULL}},
+ { SMBsetatr, "SMBsetatr", 0,
+ { "Attribute=[A]\nTime=[T2]Res=([w,w,w,w,w])\n", "Path=[Z]\n",
+ NULL, NULL, NULL } },
-{SMBmkdir,"SMBmkdir",0,
- {NULL,"Path=[Z]\n",NULL,NULL,NULL}},
+ { SMBchkpth, "SMBchkpth", 0,
+ { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
-{SMBrmdir,"SMBrmdir",0,
- {NULL,"Path=[Z]\n",NULL,NULL,NULL}},
+ { SMBsearch, "SMBsearch", 0,
+ { "Count=[d]\nAttrib=[A]\n",
+ "Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\n",
+ "Count=[d]\n",
+ "BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",
+ NULL } },
-{SMBdskattr,"SMBdskattr",0,
-{NULL,NULL,
-"TotalUnits=[d]\nBlocksPerUnit=[d]\nBlockSize=[d]\nFreeUnits=[d]\nMedia=[w]\n",
-NULL,NULL}},
+ { SMBopen, "SMBopen", 0,
+ { "Mode=[w]\nAttribute=[A]\n", "Path=[Z]\n",
+ "Handle=[d]\nOAttrib=[A]\nTime=[T2]Size=[D]\nAccess=[w]\n",
+ NULL, NULL } },
-{SMBmv,"SMBmv",0,
- {"Attrib=[A]\n","OldPath=[Z]\nNewPath=[Z]\n",NULL,NULL,NULL}},
+ { SMBcreate, "SMBcreate", 0,
+ { "Attrib=[A]\nTime=[T2]", "Path=[Z]\n", "Handle=[d]\n", NULL, NULL } },
-/* this is a Pathworks specific call, allowing the
- changing of the root path */
-{pSETDIR,"SMBsetdir",0,
- {NULL,"Path=[Z]\n",NULL,NULL,NULL}},
+ { SMBmknew, "SMBmknew", 0,
+ { "Attrib=[A]\nTime=[T2]", "Path=[Z]\n", "Handle=[d]\n", NULL, NULL } },
-{SMBlseek,"SMBlseek",0,
- {"Handle=[d]\nMode=[w]\nOffset=[D]\n","Offset=[D]\n",NULL,NULL}},
+ { SMBunlink, "SMBunlink", 0,
+ { "Attrib=[A]\n", "Path=[Z]\n", NULL, NULL, NULL } },
-{SMBflush,"SMBflush",0,
- {"Handle=[d]\n",NULL,NULL,NULL,NULL}},
+ { SMBread, "SMBread", 0,
+ { "Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n", NULL,
+ "Count=[d]\nRes=([w,w,w,w])\n", NULL, NULL } },
-{SMBsplopen,"SMBsplopen",0,
- {"SetupLen=[d]\nMode=[w]\n","Ident=[Z]\n","Handle=[d]\n",NULL,NULL}},
+ { SMBwrite, "SMBwrite", 0,
+ { "Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n", NULL,
+ "Count=[d]\n", NULL, NULL } },
-{SMBsplclose,"SMBsplclose",0,
- {"Handle=[d]\n",NULL,NULL,NULL,NULL}},
+ { SMBclose, "SMBclose", 0,
+ { "Handle=[d]\nTime=[T2]", NULL, NULL, NULL, NULL } },
-{SMBsplretq,"SMBsplretq",0,
- {"MaxCount=[d]\nStartIndex=[d]\n",NULL,
- "Count=[d]\nIndex=[d]\n",
- "*Time=[T2]Status=[B]\nJobID=[d]\nSize=[D]\nRes=[B]Name=[s16]\n",
- NULL}},
+ { SMBmkdir, "SMBmkdir", 0,
+ { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
-{SMBsplwr,"SMBsplwr",0,
- {"Handle=[d]\n",NULL,NULL,NULL,NULL}},
+ { SMBrmdir, "SMBrmdir", 0,
+ { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
-{SMBlock,"SMBlock",0,
- {"Handle=[d]\nCount=[D]\nOffset=[D]\n",NULL,NULL,NULL,NULL}},
+ { SMBdskattr, "SMBdskattr", 0,
+ { NULL, NULL,
+ "TotalUnits=[d]\nBlocksPerUnit=[d]\nBlockSize=[d]\nFreeUnits=[d]\nMedia=[w]\n",
+ NULL, NULL } },
-{SMBunlock,"SMBunlock",0,
- {"Handle=[d]\nCount=[D]\nOffset=[D]\n",NULL,NULL,NULL,NULL}},
+ { SMBmv, "SMBmv", 0,
+ { "Attrib=[A]\n", "OldPath=[Z]\nNewPath=[Z]\n", NULL, NULL, NULL } },
-/* CORE+ PROTOCOL FOLLOWS */
+ /*
+ * this is a Pathworks specific call, allowing the
+ * changing of the root path
+ */
+ { pSETDIR, "SMBsetdir", 0, { NULL, "Path=[Z]\n", NULL, NULL, NULL } },
-{SMBreadbraw,"SMBreadbraw",0,
-{"Handle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nRes=[d]\n",
- NULL,NULL,NULL,NULL}},
+ { SMBlseek, "SMBlseek", 0,
+ { "Handle=[d]\nMode=[w]\nOffset=[D]\n", "Offset=[D]\n", NULL, NULL, NULL } },
-{SMBwritebraw,"SMBwritebraw",0,
-{"Handle=[d]\nTotalCount=[d]\nRes=[w]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nRes2=[W]\n|DataSize=[d]\nDataOff=[d]\n",
-NULL,"WriteRawAck",NULL,NULL}},
+ { SMBflush, "SMBflush", 0, { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
-{SMBwritec,"SMBwritec",0,
- {NULL,NULL,"Count=[d]\n",NULL,NULL}},
+ { SMBsplopen, "SMBsplopen", 0,
+ { "SetupLen=[d]\nMode=[w]\n", "Ident=[Z]\n", "Handle=[d]\n",
+ NULL, NULL } },
-{SMBwriteclose,"SMBwriteclose",0,
- {"Handle=[d]\nCount=[d]\nOffset=[D]\nTime=[T2]Res=([w,w,w,w,w,w])",NULL,
- "Count=[d]\n",NULL,NULL}},
+ { SMBsplclose, "SMBsplclose", 0,
+ { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
-{SMBlockread,"SMBlockread",0,
- {"Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n",NULL,
- "Count=[d]\nRes=([w,w,w,w])\n",NULL,NULL}},
+ { SMBsplretq, "SMBsplretq", 0,
+ { "MaxCount=[d]\nStartIndex=[d]\n", NULL,
+ "Count=[d]\nIndex=[d]\n",
+ "*Time=[T2]Status=[B]\nJobID=[d]\nSize=[D]\nRes=[B]Name=[s16]\n",
+ NULL } },
+
+ { SMBsplwr, "SMBsplwr", 0,
+ { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
+
+ { SMBlock, "SMBlock", 0,
+ { "Handle=[d]\nCount=[D]\nOffset=[D]\n", NULL, NULL, NULL, NULL } },
+
+ { SMBunlock, "SMBunlock", 0,
+ { "Handle=[d]\nCount=[D]\nOffset=[D]\n", NULL, NULL, NULL, NULL } },
+
+ /* CORE+ PROTOCOL FOLLOWS */
+
+ { SMBreadbraw, "SMBreadbraw", 0,
+ { "Handle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nRes=[d]\n",
+ NULL, NULL, NULL, NULL } },
+
+ { SMBwritebraw, "SMBwritebraw", 0,
+ { "Handle=[d]\nTotalCount=[d]\nRes=[w]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nRes2=[W]\n|DataSize=[d]\nDataOff=[d]\n",
+ NULL, "WriteRawAck", NULL, NULL } },
-{SMBwriteunlock,"SMBwriteunlock",0,
- {"Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n",NULL,
- "Count=[d]\n",NULL,NULL}},
+ { SMBwritec, "SMBwritec", 0,
+ { NULL, NULL, "Count=[d]\n", NULL, NULL } },
-{SMBreadBmpx,"SMBreadBmpx",0,
-{"Handle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nRes=[w]\n",
-NULL,
-"Offset=[D]\nTotCount=[d]\nRemaining=[d]\nRes=([w,w])\nDataSize=[d]\nDataOff=[d]\n",
-NULL,NULL}},
+ { SMBwriteclose, "SMBwriteclose", 0,
+ { "Handle=[d]\nCount=[d]\nOffset=[D]\nTime=[T2]Res=([w,w,w,w,w,w])",
+ NULL, "Count=[d]\n", NULL, NULL } },
-{SMBwriteBmpx,"SMBwriteBmpx",0,
-{"Handle=[d]\nTotCount=[d]\nRes=[w]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nRes2=[W]\nDataSize=[d]\nDataOff=[d]\n",NULL,
-"Remaining=[d]\n",NULL,NULL}},
+ { SMBlockread, "SMBlockread", 0,
+ { "Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n", NULL,
+ "Count=[d]\nRes=([w,w,w,w])\n", NULL, NULL } },
-{SMBwriteBs,"SMBwriteBs",0,
- {"Handle=[d]\nTotCount=[d]\nOffset=[D]\nRes=[W]\nDataSize=[d]\nDataOff=[d]\n",NULL,
- "Count=[d]\n",NULL,NULL}},
+ { SMBwriteunlock, "SMBwriteunlock", 0,
+ { "Handle=[d]\nByteCount=[d]\nOffset=[D]\nCountLeft=[d]\n", NULL,
+ "Count=[d]\n", NULL, NULL } },
-{SMBsetattrE,"SMBsetattrE",0,
- {"Handle=[d]\nCreationTime=[T2]AccessTime=[T2]ModifyTime=[T2]",NULL,
- NULL,NULL,NULL}},
+ { SMBreadBmpx, "SMBreadBmpx", 0,
+ { "Handle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nRes=[w]\n",
+ NULL,
+ "Offset=[D]\nTotCount=[d]\nRemaining=[d]\nRes=([w,w])\nDataSize=[d]\nDataOff=[d]\n",
+ NULL, NULL } },
-{SMBgetattrE,"SMBgetattrE",0,
-{"Handle=[d]\n",NULL,
- "CreationTime=[T2]AccessTime=[T2]ModifyTime=[T2]Size=[D]\nAllocSize=[D]\nAttribute=[A]\n",NULL,NULL}},
+ { SMBwriteBmpx, "SMBwriteBmpx", 0,
+ { "Handle=[d]\nTotCount=[d]\nRes=[w]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nRes2=[W]\nDataSize=[d]\nDataOff=[d]\n", NULL,
+ "Remaining=[d]\n", NULL, NULL } },
-{SMBtranss,"SMBtranss",0,DEFDESCRIPT},
-{SMBioctls,"SMBioctls",0,DEFDESCRIPT},
+ { SMBwriteBs, "SMBwriteBs", 0,
+ { "Handle=[d]\nTotCount=[d]\nOffset=[D]\nRes=[W]\nDataSize=[d]\nDataOff=[d]\n",
+ NULL, "Count=[d]\n", NULL, NULL } },
-{SMBcopy,"SMBcopy",0,
- {"TreeID2=[d]\nOFun=[w]\nFlags=[w]\n","Path=[S]\nNewPath=[S]\n",
- "CopyCount=[d]\n","|ErrStr=[S]\n",NULL}},
+ { SMBsetattrE, "SMBsetattrE", 0,
+ { "Handle=[d]\nCreationTime=[T2]AccessTime=[T2]ModifyTime=[T2]", NULL,
+ NULL, NULL, NULL } },
-{SMBmove,"SMBmove",0,
- {"TreeID2=[d]\nOFun=[w]\nFlags=[w]\n","Path=[S]\nNewPath=[S]\n",
- "MoveCount=[d]\n","|ErrStr=[S]\n",NULL}},
+ { SMBgetattrE, "SMBgetattrE", 0,
+ { "Handle=[d]\n", NULL,
+ "CreationTime=[T2]AccessTime=[T2]ModifyTime=[T2]Size=[D]\nAllocSize=[D]\nAttribute=[A]\n",
+ NULL, NULL } },
-{SMBopenX,"SMBopenX",FLG_CHAIN,
-{"Com2=[w]\nOff2=[d]\nFlags=[w]\nMode=[w]\nSearchAttrib=[A]\nAttrib=[A]\nTime=[T2]OFun=[w]\nSize=[D]\nTimeOut=[D]\nRes=[W]\n","Path=[S]\n",
-"Com2=[w]\nOff2=[d]\nHandle=[d]\nAttrib=[A]\nTime=[T2]Size=[D]\nAccess=[w]\nType=[w]\nState=[w]\nAction=[w]\nFileID=[W]\nRes=[w]\n",NULL,NULL}},
+ { SMBtranss, "SMBtranss", 0, DEFDESCRIPT },
+ { SMBioctls, "SMBioctls", 0, DEFDESCRIPT },
-{SMBreadX,"SMBreadX",FLG_CHAIN,
-{"Com2=[w]\nOff2=[d]\nHandle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nCountLeft=[d]\n",NULL,
-"Com2=[w]\nOff2=[d]\nRemaining=[d]\nRes=[W]\nDataSize=[d]\nDataOff=[d]\nRes=([w,w,w,w])\n",NULL,NULL}},
+ { SMBcopy, "SMBcopy", 0,
+ { "TreeID2=[d]\nOFun=[w]\nFlags=[w]\n", "Path=[S]\nNewPath=[S]\n",
+ "CopyCount=[d]\n", "|ErrStr=[S]\n", NULL } },
-{SMBwriteX,"SMBwriteX",FLG_CHAIN,
-{"Com2=[w]\nOff2=[d]\nHandle=[d]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nCountLeft=[d]\nRes=[w]\nDataSize=[d]\nDataOff=[d]\n",NULL,
-"Com2=[w]\nOff2=[d]\nCount=[d]\nRemaining=[d]\nRes=[W]\n",NULL,NULL}},
+ { SMBmove, "SMBmove", 0,
+ { "TreeID2=[d]\nOFun=[w]\nFlags=[w]\n", "Path=[S]\nNewPath=[S]\n",
+ "MoveCount=[d]\n", "|ErrStr=[S]\n", NULL } },
-{SMBlockingX,"SMBlockingX",FLG_CHAIN,
-{"Com2=[w]\nOff2=[d]\nHandle=[d]\nLockType=[w]\nTimeOut=[D]\nUnlockCount=[d]\nLockCount=[d]\n",
-"*Process=[d]\nOffset=[D]\nLength=[D]\n",
-"Com2=[w]\nOff2=[d]\n"}},
+ { SMBopenX, "SMBopenX", FLG_CHAIN,
+ { "Com2=[w]\nOff2=[d]\nFlags=[w]\nMode=[w]\nSearchAttrib=[A]\nAttrib=[A]\nTime=[T2]OFun=[w]\nSize=[D]\nTimeOut=[D]\nRes=[W]\n",
+ "Path=[S]\n",
+ "Com2=[w]\nOff2=[d]\nHandle=[d]\nAttrib=[A]\nTime=[T2]Size=[D]\nAccess=[w]\nType=[w]\nState=[w]\nAction=[w]\nFileID=[W]\nRes=[w]\n",
+ NULL, NULL } },
-{SMBffirst,"SMBffirst",0,
-{"Count=[d]\nAttrib=[A]\n","Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
-"Count=[d]\n","BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",NULL}},
+ { SMBreadX, "SMBreadX", FLG_CHAIN,
+ { "Com2=[w]\nOff2=[d]\nHandle=[d]\nOffset=[D]\nMaxCount=[d]\nMinCount=[d]\nTimeOut=[D]\nCountLeft=[d]\n",
+ NULL,
+ "Com2=[w]\nOff2=[d]\nRemaining=[d]\nRes=[W]\nDataSize=[d]\nDataOff=[d]\nRes=([w,w,w,w])\n",
+ NULL, NULL } },
-{SMBfunique,"SMBfunique",0,
-{"Count=[d]\nAttrib=[A]\n","Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
-"Count=[d]\n","BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",NULL}},
+ { SMBwriteX, "SMBwriteX", FLG_CHAIN,
+ { "Com2=[w]\nOff2=[d]\nHandle=[d]\nOffset=[D]\nTimeOut=[D]\nWMode=[w]\nCountLeft=[d]\nRes=[w]\nDataSize=[d]\nDataOff=[d]\n",
+ NULL,
+ "Com2=[w]\nOff2=[d]\nCount=[d]\nRemaining=[d]\nRes=[W]\n",
+ NULL, NULL } },
-{SMBfclose,"SMBfclose",0,
-{"Count=[d]\nAttrib=[A]\n","Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
-"Count=[d]\n","BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",NULL}},
+ { SMBffirst, "SMBffirst", 0,
+ { "Count=[d]\nAttrib=[A]\n",
+ "Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
+ "Count=[d]\n",
+ "BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",
+ NULL } },
-{SMBfindnclose, "SMBfindnclose", 0,
- {"Handle=[d]\n",NULL,NULL,NULL,NULL}},
+ { SMBfunique, "SMBfunique", 0,
+ { "Count=[d]\nAttrib=[A]\n",
+ "Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
+ "Count=[d]\n",
+ "BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",
+ NULL } },
-{SMBfindclose, "SMBfindclose", 0,
- {"Handle=[d]\n",NULL,NULL,NULL,NULL}},
+ { SMBfclose, "SMBfclose", 0,
+ { "Count=[d]\nAttrib=[A]\n",
+ "Path=[Z]\nBlkType=[B]\nBlkLen=[d]\n|Res1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\n",
+ "Count=[d]\n",
+ "BlkType=[B]\nBlkLen=[d]\n*\nRes1=[B]\nMask=[s11]\nSrv1=[B]\nDirIndex=[d]\nSrv2=[w]\nRes2=[W]\nAttrib=[a]\nTime=[T1]Size=[D]\nName=[s13]\n",
+ NULL } },
-{SMBsends,"SMBsends",0,
- {NULL,"Source=[Z]\nDest=[Z]\n",NULL,NULL,NULL}},
+ { SMBfindnclose, "SMBfindnclose", 0,
+ { "Handle=[d]\n", NULL, NULL, 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}},
+ { SMBfindclose, "SMBfindclose", 0,
+ { "Handle=[d]\n", NULL, NULL, NULL, NULL } },
-{SMBsendtxt,"SMBsendtxt",0,
- {"GroupID=[d]\n",NULL,NULL,NULL,NULL}},
+ { SMBsends, "SMBsends", 0,
+ { NULL, "Source=[Z]\nDest=[Z]\n", NULL, NULL, NULL } },
+
+ { SMBsendstrt, "SMBsendstrt", 0,
+ { NULL, "Source=[Z]\nDest=[Z]\n", "GroupID=[d]\n", NULL, NULL } },
-{SMBsendb,"SMBsendb",0,
- {NULL,"Source=[Z]\nDest=[Z]\n",NULL,NULL,NULL}},
+ { SMBsendend, "SMBsendend", 0,
+ { "GroupID=[d]\n", NULL, NULL, NULL, NULL } },
-{SMBfwdname,"SMBfwdname",0,DEFDESCRIPT},
-{SMBcancelf,"SMBcancelf",0,DEFDESCRIPT},
-{SMBgetmac,"SMBgetmac",0,DEFDESCRIPT},
+ { SMBsendtxt, "SMBsendtxt", 0,
+ { "GroupID=[d]\n", NULL, NULL, NULL, NULL } },
-{SMBnegprot,"SMBnegprot",0,
- {NULL,NULL,NULL,NULL,print_negprot}},
+ { SMBsendb, "SMBsendb", 0,
+ { NULL, "Source=[Z]\nDest=[Z]\n", NULL, NULL, NULL } },
+
+ { SMBfwdname, "SMBfwdname", 0, DEFDESCRIPT },
+ { SMBcancelf, "SMBcancelf", 0, DEFDESCRIPT },
+ { SMBgetmac, "SMBgetmac", 0, DEFDESCRIPT },
+
+ { SMBnegprot, "SMBnegprot", 0,
+ { NULL, NULL, NULL, NULL, print_negprot } },
+
+ { SMBsesssetupX, "SMBsesssetupX", FLG_CHAIN,
+ { NULL, NULL, NULL, NULL, print_sesssetup } },
-{SMBsesssetupX,"SMBsesssetupX",FLG_CHAIN,
- {NULL,NULL,NULL,NULL,print_sesssetup}},
+ { SMBtconX, "SMBtconX", FLG_CHAIN,
+ { "Com2=[w]\nOff2=[d]\nFlags=[w]\nPassLen=[d]\nPasswd&Path&Device=\n",
+ NULL, "Com2=[w]\nOff2=[d]\n", "ServiceType=[R]\n", NULL } },
-{SMBtconX,"SMBtconX",FLG_CHAIN,
-{"Com2=[w]\nOff2=[d]\nFlags=[w]\nPassLen=[d]\nPasswd&Path&Device=\n",NULL,
- "Com2=[w]\nOff2=[d]\n","ServiceType=[S]\n",NULL}},
+ { SMBlockingX, "SMBlockingX", FLG_CHAIN,
+ { NULL, NULL, NULL, NULL, print_lockingandx } },
-{SMBtrans2, "SMBtrans2",0,{NULL,NULL,NULL,NULL,print_trans2}},
+ { SMBtrans2, "SMBtrans2", 0, { NULL, NULL, NULL, NULL, print_trans2 } },
-{SMBtranss2, "SMBtranss2", 0,DEFDESCRIPT},
-{SMBctemp,"SMBctemp",0,DEFDESCRIPT},
-{SMBreadBs,"SMBreadBs",0,DEFDESCRIPT},
-{SMBtrans,"SMBtrans",0,{NULL,NULL,NULL,NULL,print_trans}},
+ { SMBtranss2, "SMBtranss2", 0, DEFDESCRIPT },
+ { SMBctemp, "SMBctemp", 0, DEFDESCRIPT },
+ { SMBreadBs, "SMBreadBs", 0, DEFDESCRIPT },
+ { SMBtrans, "SMBtrans", 0, { NULL, NULL, NULL, NULL, print_trans } },
-{SMBnttrans,"SMBnttrans", 0, DEFDESCRIPT},
-{SMBnttranss,"SMBnttranss", 0, DEFDESCRIPT},
+ { SMBnttrans, "SMBnttrans", 0, DEFDESCRIPT },
+ { SMBnttranss, "SMBnttranss", 0, DEFDESCRIPT },
-{SMBntcreateX,"SMBntcreateX", FLG_CHAIN,
-{"Com2=[w]\nOff2=[d]\nRes=[b]\nNameLen=[d]\nFlags=[W]\nRootDirectoryFid=[D]\nAccessMask=[W]\nAllocationSize=[L]\nExtFileAttributes=[W]\nShareAccess=[W]\nCreateDisposition=[W]\nCreateOptions=[W]\nImpersonationLevel=[W]\nSecurityFlags=[b]\n","Path=[S]\n",
- "Com2=[w]\nOff2=[d]\nOplockLevel=[b]\nFid=[d]\nCreateAction=[W]\nCreateTime=[T3]LastAccessTime=[T3]LastWriteTime=[T3]ChangeTime=[T3]ExtFileAttributes=[W]\nAllocationSize=[L]\nEndOfFile=[L]\nFileType=[w]\nDeviceState=[w]\nDirectory=[b]\n", NULL}},
+ { SMBntcreateX, "SMBntcreateX", FLG_CHAIN,
+ { "Com2=[w]\nOff2=[d]\nRes=[b]\nNameLen=[ld]\nFlags=[W]\nRootDirectoryFid=[D]\nAccessMask=[W]\nAllocationSize=[L]\nExtFileAttributes=[W]\nShareAccess=[W]\nCreateDisposition=[W]\nCreateOptions=[W]\nImpersonationLevel=[W]\nSecurityFlags=[b]\n",
+ "Path=[C]\n",
+ "Com2=[w]\nOff2=[d]\nOplockLevel=[b]\nFid=[d]\nCreateAction=[W]\nCreateTime=[T3]LastAccessTime=[T3]LastWriteTime=[T3]ChangeTime=[T3]ExtFileAttributes=[W]\nAllocationSize=[L]\nEndOfFile=[L]\nFileType=[w]\nDeviceState=[w]\nDirectory=[b]\n",
+ NULL, NULL } },
-{SMBntcancel,"SMBntcancel", 0, DEFDESCRIPT},
+ { SMBntcancel, "SMBntcancel", 0, DEFDESCRIPT },
-{-1,NULL,0,DEFDESCRIPT}};
+ { -1, NULL, 0, DEFDESCRIPT }
+};
/*
* print a SMB message
*/
static void
-print_smb(const uchar *buf, const uchar *maxbuf)
+print_smb(netdissect_options *ndo,
+ const u_char *buf, const u_char *maxbuf)
{
+ uint16_t flags2;
+ int nterrcodes;
int command;
- const uchar *words, *data;
- struct smbfns *fn;
- char *fmt_smbheader =
+ uint32_t nterror;
+ const u_char *words, *maxwords, *data;
+ const struct smbfns *fn;
+ const char *fmt_smbheader =
"[P4]SMB Command = [B]\nError class = [BP1]\nError code = [d]\nFlags1 = [B]\nFlags2 = [B][P13]\nTree ID = [d]\nProc ID = [d]\nUID = [d]\nMID = [d]\nWord Count = [b]\n";
+ int smboffset;
- request = (CVAL(buf, 9) & 0x80) ? 0 : 1;
+ ND_TCHECK(buf[9]);
+ request = (buf[9] & 0x80) ? 0 : 1;
+ flags2 = EXTRACT_LE_16BITS(&buf[10]);
+ unicodestr = flags2 & 0x8000;
+ nterrcodes = flags2 & 0x4000;
+ startbuf = buf;
- command = CVAL(buf, 4);
+ 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;
/* print out the header */
- fdata(buf, fmt_smbheader, buf + 33);
+ smb_fdata(ndo, buf, fmt_smbheader, buf + 33, unicodestr);
- if (CVAL(buf, 5)) {
- int class = CVAL(buf, 5);
- int num = SVAL(buf, 7);
- printf("SMBError = %s\n", smb_errstr(class, num));
+ if (nterrcodes) {
+ nterror = EXTRACT_LE_32BITS(&buf[5]);
+ if (nterror)
+ ND_PRINT((ndo, "NTError = %s\n", nt_errstr(nterror)));
+ } else {
+ if (buf[5])
+ ND_PRINT((ndo, "SMBError = %s\n", smb_errstr(buf[5], EXTRACT_LE_16BITS(&buf[7]))));
}
- words = buf + 32;
- data = words + 1 + CVAL(words,0)*2;
+ smboffset = 32;
+
+ for (;;) {
+ const char *f1, *f2;
+ int wct;
+ u_int bcc;
+ int newsmboffset;
- while (words && data) {
- char *f1, *f2;
- int wct = CVAL(words, 0);
+ words = buf + smboffset;
+ ND_TCHECK(words[0]);
+ wct = words[0];
+ data = words + 1 + wct * 2;
+ maxwords = min(data, maxbuf);
if (request) {
f1 = fn->descript.req_f1;
}
if (fn->descript.fn)
- fn->descript.fn(words, data, buf, maxbuf);
+ (*fn->descript.fn)(ndo, words, data, buf, maxbuf);
else {
- if (f1) {
- printf("smbvwv[]=\n");
- fdata(words + 1, f1, words + 1 + wct * 2);
- } else if (wct) {
- int i;
- int v;
- printf("smbvwv[]=\n");
- for (i = 0; i < wct; i++) {
- v = SVAL(words + 1, 2 * i);
- printf("smb_vwv[%d]=%d (0x%X)\n", i, v, v);
+ if (wct) {
+ if (f1)
+ 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++) {
+ ND_TCHECK2(words[1 + 2 * i], 2);
+ v = EXTRACT_LE_16BITS(words + 1 + 2 * i);
+ ND_PRINT((ndo, "smb_vwv[%d]=%d (0x%X)\n", i, v, v));
+ }
}
}
+ ND_TCHECK2(*data, 2);
+ bcc = EXTRACT_LE_16BITS(data);
+ ND_PRINT((ndo, "smb_bcc=%u\n", bcc));
if (f2) {
- printf("smbbuf[]=\n");
- fdata(data + 2, f2, maxbuf);
+ if (bcc > 0)
+ smb_fdata(ndo, data + 2, f2, data + 2 + bcc, unicodestr);
} else {
- int bcc = SVAL(data, 0);
- printf("smb_bcc=%d\n", bcc);
if (bcc > 0) {
- printf("smb_buf[]=\n");
- print_data(data + 2, MIN(bcc, PTR_DIFF(maxbuf, data + 2)));
+ ND_PRINT((ndo, "smb_buf[]=\n"));
+ print_data(ndo, data + 2, min(bcc, PTR_DIFF(maxbuf, data + 2)));
}
}
}
- if ((fn->flags & FLG_CHAIN) != 0&& CVAL(words, 0) &&
- SVAL(words, 1) != 0xFF) {
- command = SVAL(words, 1);
- words = buf + SVAL(words, 3);
- data = words + 1 + CVAL(words, 0) * 2;
+ if ((fn->flags & FLG_CHAIN) == 0)
+ break;
+ if (wct == 0)
+ break;
+ ND_TCHECK(words[1]);
+ command = words[1];
+ if (command == 0xFF)
+ break;
+ 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");
- } else
- words = data = NULL;
+ ND_PRINT((ndo, "\nSMB PACKET: %s (%s) (CHAINED)\n",
+ fn->name, request ? "REQUEST" : "REPLY"));
+ if (newsmboffset <= smboffset) {
+ ND_PRINT((ndo, "Bad andX offset: %u <= %u\n", newsmboffset, smboffset));
+ break;
+ }
+ smboffset = newsmboffset;
}
- printf("\n");
+ ND_PRINT((ndo, "\n"));
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
}
* print a NBT packet received across tcp on port 139
*/
void
-nbt_tcp_print(const uchar *data, int length)
+nbt_tcp_print(netdissect_options *ndo,
+ const u_char *data, int length)
{
- const uchar *maxbuf = data + length;
- int flags = CVAL(data, 0);
- int nbt_len = RSVAL(data, 2);
+ int caplen;
+ int type;
+ u_int nbt_len;
+ const u_char *maxbuf;
+
+ if (length < 4)
+ goto trunc;
+ if (ndo->ndo_snapend < data)
+ goto trunc;
+ caplen = ndo->ndo_snapend - data;
+ if (caplen < 4)
+ goto trunc;
+ maxbuf = data + caplen;
+ type = data[0];
+ nbt_len = EXTRACT_16BITS(data + 2);
+ length -= 4;
+ caplen -= 4;
startbuf = data;
- if (maxbuf <= data)
- return;
- if (vflag > 1)
- printf ("\n>>> ");
-
- printf("NBT Packet");
-
- if (vflag < 2)
- return;
-
- printf("\n");
-
- switch (flags) {
- case 1:
- printf("flags=0x%x\n", flags);
- case 0:
- data = fdata(data, "NBT Session Packet\nFlags=[rw]\nLength=[rd]\n",
- data + 4);
- if (data == NULL)
+ if (ndo->ndo_vflag < 2) {
+ ND_PRINT((ndo, " NBT Session Packet: "));
+ switch (type) {
+ case 0x00:
+ ND_PRINT((ndo, "Session Message"));
break;
- if (memcmp(data,"\377SMB",4) == 0) {
- if (nbt_len > PTR_DIFF(maxbuf, data))
- printf("WARNING: Short packet. Try increasing the snap length (%ld)\n",
- PTR_DIFF(maxbuf, data));
- print_smb(data, maxbuf > data + nbt_len ? data + nbt_len : maxbuf);
- } else
- printf("Session packet:(raw data?)\n");
- break;
case 0x81:
- data = fdata(data,
- "NBT Session Request\nFlags=[rW]\nDestination=[n1]\nSource=[n1]\n",
- maxbuf);
+ ND_PRINT((ndo, "Session Request"));
break;
case 0x82:
- data = fdata(data, "NBT Session Granted\nFlags=[rW]\n", maxbuf);
+ ND_PRINT((ndo, "Session Granted"));
break;
case 0x83:
{
- int ecode = CVAL(data,4);
+ int ecode;
- data = fdata(data, "NBT SessionReject\nFlags=[rW]\nReason=[B]\n",
- maxbuf);
+ if (nbt_len < 4)
+ goto trunc;
+ if (length < 4)
+ goto trunc;
+ if (caplen < 4)
+ goto trunc;
+ ecode = data[4];
+
+ ND_PRINT((ndo, "Session Reject, "));
switch (ecode) {
- case 0x80:
- printf("Not listening on called name\n");
+ case 0x80:
+ ND_PRINT((ndo, "Not listening on called name"));
break;
- case 0x81:
- printf("Not listening for calling name\n");
+ case 0x81:
+ ND_PRINT((ndo, "Not listening for calling name"));
break;
- case 0x82:
- printf("Called name not present\n");
+ case 0x82:
+ ND_PRINT((ndo, "Called name not present"));
break;
- case 0x83:
- printf("Called name present, but insufficient resources\n");
+ case 0x83:
+ ND_PRINT((ndo, "Called name present, but insufficient resources"));
break;
default:
- printf("Unspecified error 0x%X\n", ecode);
- break;
+ ND_PRINT((ndo, "Unspecified error 0x%X", ecode));
+ break;
+ }
+ }
+ break;
+
+ case 0x85:
+ ND_PRINT((ndo, "Session Keepalive"));
+ break;
+
+ default:
+ data = smb_fdata(ndo, data, "Unknown packet type [rB]", maxbuf, 0);
+ break;
+ }
+ } else {
+ ND_PRINT((ndo, "\n>>> NBT Session Packet\n"));
+ switch (type) {
+ case 0x00:
+ 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)
+ ND_PRINT((ndo, "WARNING: Packet is continued in later TCP segments\n"));
+ else
+ ND_PRINT((ndo, "WARNING: Short packet. Try increasing the snap length by %d\n",
+ nbt_len - caplen));
+ }
+ print_smb(ndo, data, maxbuf > data + nbt_len ? data + nbt_len : maxbuf);
+ } else
+ ND_PRINT((ndo, "Session packet:(raw data or continuation?)\n"));
+ break;
+
+ case 0x81:
+ data = smb_fdata(ndo, data,
+ "[P1]NBT Session Request\nFlags=[B]\nLength=[rd]\nDestination=[n1]\nSource=[n1]\n",
+ maxbuf, 0);
+ break;
+
+ case 0x82:
+ data = smb_fdata(ndo, data, "[P1]NBT Session Granted\nFlags=[B]\nLength=[rd]\n", maxbuf, 0);
+ break;
+
+ case 0x83:
+ {
+ const u_char *origdata;
+ int ecode;
+
+ origdata = data;
+ data = smb_fdata(ndo, data, "[P1]NBT SessionReject\nFlags=[B]\nLength=[rd]\nReason=[B]\n",
+ maxbuf, 0);
+ if (data == NULL)
+ break;
+ if (nbt_len >= 1 && caplen >= 1) {
+ ecode = origdata[4];
+ switch (ecode) {
+ case 0x80:
+ ND_PRINT((ndo, "Not listening on called name\n"));
+ break;
+ case 0x81:
+ ND_PRINT((ndo, "Not listening for calling name\n"));
+ break;
+ case 0x82:
+ ND_PRINT((ndo, "Called name not present\n"));
+ break;
+ case 0x83:
+ ND_PRINT((ndo, "Called name present, but insufficient resources\n"));
+ break;
+ default:
+ ND_PRINT((ndo, "Unspecified error 0x%X\n", ecode));
+ break;
+ }
}
}
break;
case 0x85:
- data = fdata(data, "NBT Session Keepalive\nFlags=[rW]\n", maxbuf);
+ data = smb_fdata(ndo, data, "[P1]NBT Session Keepalive\nFlags=[B]\nLength=[rd]\n", maxbuf, 0);
break;
default:
- printf("flags=0x%x\n", flags);
- data = fdata(data, "NBT - Unknown packet type\nType=[rW]\n", maxbuf);
+ data = smb_fdata(ndo, data, "NBT - Unknown packet type\nType=[B]\n", maxbuf, 0);
+ break;
+ }
+ ND_PRINT((ndo, "\n"));
}
- printf("\n");
- fflush(stdout);
+ return;
+trunc:
+ 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
-nbt_udp137_print(const uchar *data, int length)
+nbt_udp137_print(netdissect_options *ndo,
+ 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");
- else
- printf("; POSITIVE");
- }
-
- if (response)
- printf("; RESPONSE");
- else
- printf("; REQUEST");
-
- if (nm_flags&1)
- printf("; BROADCAST");
- else
- printf("; UNICAST");
-
- if (vflag < 2)
- return;
+ const u_char *maxbuf = data + length;
+ int name_trn_id, response, opcode, nm_flags, rcode;
+ int qdcount, ancount, nscount, arcount;
+ const u_char *p;
+ int total, i;
+
+ ND_TCHECK2(data[10], 2);
+ name_trn_id = EXTRACT_16BITS(data);
+ response = (data[2] >> 7);
+ opcode = (data[2] >> 3) & 0xF;
+ nm_flags = ((data[2] & 0x7) << 4) + (data[3] >> 4);
+ rcode = data[3] & 0xF;
+ qdcount = EXTRACT_16BITS(data + 4);
+ ancount = EXTRACT_16BITS(data + 6);
+ nscount = EXTRACT_16BITS(data + 8);
+ arcount = EXTRACT_16BITS(data + 10);
+ startbuf = data;
- 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);
+ if (maxbuf <= data)
+ return;
- p = data + 12;
+ if (ndo->ndo_vflag > 1)
+ ND_PRINT((ndo, "\n>>> "));
- {
- int total = ancount+nscount+arcount;
- int i;
+ ND_PRINT((ndo, "NBT UDP PACKET(137): %s", tok2str(opcode_str, "OPUNKNOWN", opcode)));
+ if (response) {
+ ND_PRINT((ndo, "; %s", rcode ? "NEGATIVE" : "POSITIVE"));
+ }
+ ND_PRINT((ndo, "; %s; %s", response ? "RESPONSE" : "REQUEST",
+ (nm_flags & 1) ? "BROADCAST" : "UNICAST"));
+
+ if (ndo->ndo_vflag < 2)
+ return;
+
+ ND_PRINT((ndo, "\nTrnID=0x%X\nOpCode=%d\nNmFlags=0x%X\nRcode=%d\nQueryCount=%d\nAnswerCount=%d\nAuthorityCount=%d\nAddressRecCount=%d\n",
+ 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) {
+ ND_PRINT((ndo, "Corrupt packet??\n"));
+ return;
}
if (qdcount) {
- printf("QuestionRecords:\n");
- for (i=0;i<qdcount;i++)
- p = fdata(p,"|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#",maxbuf);
- if (p == NULL)
- goto out;
+ ND_PRINT((ndo, "QuestionRecords:\n"));
+ for (i = 0; i < qdcount; i++) {
+ p = smb_fdata(ndo, p,
+ "|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#",
+ maxbuf, 0);
+ if (p == NULL)
+ goto out;
+ }
}
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);
+ ND_PRINT((ndo, "\nResourceRecords:\n"));
+ for (i = 0; i < total; i++) {
+ int rdlen;
+ int restype;
+
+ p = smb_fdata(ndo, p, "Name=[n1]\n#", maxbuf, 0);
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;
+ restype = EXTRACT_16BITS(p);
+ p = smb_fdata(ndo, p, "ResType=[rw]\nResClass=[rw]\nTTL=[rD]\n", p + 8, 0);
+ if (p == NULL)
+ goto out;
+ rdlen = EXTRACT_16BITS(p);
+ ND_PRINT((ndo, "ResourceLength=%d\nResourceData=\n", rdlen));
+ p += 2;
+ if (rdlen == 6) {
+ 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;
+
+ ND_TCHECK(*p);
+ numnames = p[0];
+ p = smb_fdata(ndo, p, "NumNames=[B]\n", p + 1, 0);
+ if (p == NULL)
+ goto out;
+ while (numnames--) {
+ p = smb_fdata(ndo, p, "Name=[n2]\t#", maxbuf, 0);
+ if (p == NULL)
+ goto out;
+ ND_TCHECK(*p);
+ if (p[0] & 0x80)
+ ND_PRINT((ndo, "<GROUP> "));
+ switch (p[0] & 0x60) {
+ case 0x00: ND_PRINT((ndo, "B ")); break;
+ case 0x20: ND_PRINT((ndo, "P ")); break;
+ case 0x40: ND_PRINT((ndo, "M ")); break;
+ case 0x60: ND_PRINT((ndo, "_ ")); break;
+ }
+ if (p[0] & 0x10)
+ ND_PRINT((ndo, "<DEREGISTERING> "));
+ if (p[0] & 0x08)
+ ND_PRINT((ndo, "<CONFLICT> "));
+ if (p[0] & 0x04)
+ ND_PRINT((ndo, "<ACTIVE> "));
+ if (p[0] & 0x02)
+ ND_PRINT((ndo, "<PERMANENT> "));
+ ND_PRINT((ndo, "\n"));
+ p += 2;
+ }
+ } else {
+ print_data(ndo, p, min(rdlen, length - (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 (p < maxbuf)
+ smb_fdata(ndo, p, "AdditionalData:\n", maxbuf, 0);
+
out:
- printf("\n");
- fflush(stdout);
+ ND_PRINT((ndo, "\n"));
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
}
+/*
+ * Print an SMB-over-TCP packet received across tcp on port 445
+ */
+void
+smb_tcp_print(netdissect_options *ndo,
+ const u_char * data, int length)
+{
+ int caplen;
+ u_int smb_len;
+ const u_char *maxbuf;
+
+ if (length < 4)
+ goto trunc;
+ if (ndo->ndo_snapend < data)
+ goto trunc;
+ caplen = ndo->ndo_snapend - data;
+ if (caplen < 4)
+ goto trunc;
+ maxbuf = data + caplen;
+ smb_len = EXTRACT_24BITS(data + 1);
+ length -= 4;
+ caplen -= 4;
+ startbuf = data;
+ data += 4;
+
+ if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {
+ if ((int)smb_len > caplen) {
+ if ((int)smb_len > length)
+ ND_PRINT((ndo, "WARNING: Packet is continued in later TCP segments\n"));
+ else
+ ND_PRINT((ndo, "WARNING: Short packet. Try increasing the snap length by %d\n",
+ smb_len - caplen));
+ }
+ print_smb(ndo, data, maxbuf > data + smb_len ? data + smb_len : maxbuf);
+ } else
+ ND_PRINT((ndo, "SMB-over-TCP packet:(raw data or continuation?)\n"));
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
+}
/*
* print a NBT packet received across udp on port 138
*/
-void nbt_udp138_print(const uchar *data, int length)
+void
+nbt_udp138_print(netdissect_options *ndo,
+ 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 > ndo->ndo_snapend)
+ maxbuf = ndo->ndo_snapend;
+ if (maxbuf <= data)
+ return;
+ startbuf = data;
- if (vflag < 2) {
- printf("NBT UDP PACKET(138)");
- return;
- }
+ if (ndo->ndo_vflag < 2) {
+ ND_PRINT((ndo, "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(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);
- if (data != NULL)
- print_smb(data,maxbuf);
-
- printf("\n");
- fflush(stdout);
-}
+ if (data != NULL) {
+ /* If there isn't enough data for "\377SMB", don't check for it. */
+ if (&data[3] >= maxbuf)
+ goto out;
+ if (memcmp(data, "\377SMB",4) == 0)
+ print_smb(ndo, data, maxbuf);
+ }
+out:
+ ND_PRINT((ndo, "\n"));
+}
/*
- print netbeui frames
+ print netbeui frames
*/
-void netbeui_print(u_short control, const uchar *data, int length)
+struct nbf_strings {
+ const char *name;
+ const char *nonverbose;
+ const char *verbose;
+} nbf_strings[0x20] = {
+ { "Add Group Name Query", ", [P23]Name to add=[n2]#",
+ "[P5]ResponseCorrelator=[w]\n[P16]Name to add=[n2]\n" },
+ { "Add Name Query", ", [P23]Name to add=[n2]#",
+ "[P5]ResponseCorrelator=[w]\n[P16]Name to add=[n2]\n" },
+ { "Name In Conflict", NULL, NULL },
+ { "Status Query", NULL, NULL },
+ { NULL, NULL, NULL }, /* not used */
+ { NULL, NULL, NULL }, /* not used */
+ { NULL, NULL, NULL }, /* not used */
+ { "Terminate Trace", NULL, NULL },
+ { "Datagram", NULL,
+ "[P7]Destination=[n2]\nSource=[n2]\n" },
+ { "Broadcast Datagram", NULL,
+ "[P7]Destination=[n2]\nSource=[n2]\n" },
+ { "Name Query", ", [P7]Name=[n2]#",
+ "[P1]SessionNumber=[B]\nNameType=[B][P2]\nResponseCorrelator=[w]\nName=[n2]\nName of sender=[n2]\n" },
+ { NULL, NULL, NULL }, /* not used */
+ { NULL, NULL, NULL }, /* not used */
+ { "Add Name Response", ", [P1]GroupName=[w] [P4]Destination=[n2] Source=[n2]#",
+ "AddNameInProcess=[B]\nGroupName=[w]\nTransmitCorrelator=[w][P2]\nDestination=[n2]\nSource=[n2]\n" },
+ { "Name Recognized", NULL,
+ "[P1]Data2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nDestination=[n2]\nSource=[n2]\n" },
+ { "Status Response", NULL, NULL },
+ { NULL, NULL, NULL }, /* not used */
+ { NULL, NULL, NULL }, /* not used */
+ { NULL, NULL, NULL }, /* not used */
+ { "Terminate Trace", NULL, NULL },
+ { "Data Ack", NULL,
+ "[P3]TransmitCorrelator=[w][P2]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { "Data First/Middle", NULL,
+ "Flags=[{RECEIVE_CONTINUE|NO_ACK||PIGGYBACK_ACK_INCLUDED|}]\nResyncIndicator=[w][P2]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { "Data Only/Last", NULL,
+ "Flags=[{|NO_ACK|PIGGYBACK_ACK_ALLOWED|PIGGYBACK_ACK_INCLUDED|}]\nResyncIndicator=[w][P2]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { "Session Confirm", NULL,
+ "Data1=[B]\nData2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { "Session End", NULL,
+ "[P1]Data2=[w][P4]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { "Session Initialize", NULL,
+ "Data1=[B]\nData2=[w]\nTransmitCorrelator=[w]\nResponseCorelator=[w]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { "No Receive", NULL,
+ "Flags=[{|SEND_NO_ACK}]\nDataBytesAccepted=[b][P4]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { "Receive Outstanding", NULL,
+ "[P1]DataBytesAccepted=[b][P4]\nRemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { "Receive Continue", NULL,
+ "[P2]TransmitCorrelator=[w]\n[P2]RemoteSessionNumber=[B]\nLocalSessionNumber=[B]\n" },
+ { NULL, NULL, NULL }, /* not used */
+ { NULL, NULL, NULL }, /* not used */
+ { "Session Alive", NULL, NULL }
+};
+
+void
+netbeui_print(netdissect_options *ndo,
+ 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);
- break;
- }
+ const u_char *maxbuf = data + length;
+ int len;
+ int command;
+ const u_char *data2;
+ int is_truncated = 0;
+
+ if (maxbuf > ndo->ndo_snapend)
+ maxbuf = ndo->ndo_snapend;
+ ND_TCHECK(data[4]);
+ len = EXTRACT_LE_16BITS(data);
+ command = data[4];
+ data2 = data + len;
+ if (data2 >= maxbuf) {
+ data2 = maxbuf;
+ is_truncated = 1;
+ }
+
+ startbuf = data;
+
+ if (ndo->ndo_vflag < 2) {
+ ND_PRINT((ndo, "NBF Packet: "));
+ data = smb_fdata(ndo, data, "[P5]#", maxbuf, 0);
+ } else {
+ ND_PRINT((ndo, "\n>>> NBF Packet\nType=0x%X ", control));
+ data = smb_fdata(ndo, data, "Length=[d] Signature=[w] Command=[B]\n#", maxbuf, 0);
+ }
+ if (data == NULL)
+ goto out;
+
+ if (command > 0x1f || nbf_strings[command].name == NULL) {
+ if (ndo->ndo_vflag < 2)
+ data = smb_fdata(ndo, data, "Unknown NBF Command#", data2, 0);
+ else
+ data = smb_fdata(ndo, data, "Unknown NBF Command\n", data2, 0);
+ } else {
+ if (ndo->ndo_vflag < 2) {
+ ND_PRINT((ndo, "%s", nbf_strings[command].name));
+ if (nbf_strings[command].nonverbose != NULL)
+ data = smb_fdata(ndo, data, nbf_strings[command].nonverbose, data2, 0);
+ } else {
+ ND_PRINT((ndo, "%s:\n", nbf_strings[command].name));
+ if (nbf_strings[command].verbose != NULL)
+ data = smb_fdata(ndo, data, nbf_strings[command].verbose, data2, 0);
+ else
+ ND_PRINT((ndo, "\n"));
+ }
+ }
+
+ if (ndo->ndo_vflag < 2)
+ return;
+
+ if (data == NULL)
+ goto out;
+
+ if (is_truncated) {
+ /* data2 was past the end of the buffer */
+ goto out;
+ }
+
+ /* If this isn't a command that would contain an SMB message, quit. */
+ if (command != 0x08 && command != 0x09 && command != 0x15 &&
+ command != 0x16)
+ 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(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) {
+ ND_PRINT((ndo, "found SMB packet at %d\n", i));
+ print_smb(ndo, &data2[i], maxbuf);
+ break;
+ }
+ }
}
- }
out:
- printf("\n");
+ ND_PRINT((ndo, "\n"));
+ return;
+trunc:
+ ND_PRINT((ndo, "%s", tstr));
}
/*
- * print IPX-Netbios frames
+ * print IPX-Netbios frames
*/
-void ipx_netbios_print(const uchar *data, u_int length)
+void
+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
* 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. */
- 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) {
- fdata(data, "\n>>> IPX transport ", &data[i]);
- if (data != NULL)
- 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)
- fdata(data, "\n>>> Unknown IPX ", maxbuf);
+ smb_fdata(ndo, data, "\n>>> Unknown IPX ", maxbuf, 0);
}
projects / tcpdump / blobdiff