X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d261660e6504365c835487b92fb04440278cc5b5..859d3eb8b99b36161e553d515d63de6b50c952f9:/print-smb.c diff --git a/print-smb.c b/print-smb.c index a6fa73cc..985575c2 100644 --- 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 @@ -12,40 +12,54 @@ #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.27 2002-09-05 21:25:48 guy Exp $"; #endif +#include + #include #include -#include #include "interface.h" +#include "extract.h" #include "smb.h" static int request = 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)(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)(const u_char *, const u_char *, int, int); }; struct smbfns { int id; - char *name; + const char *name; int flags; struct smbdescript descript; }; +struct smbfnsint +{ + int id; + const char *name; + int flags; + struct smbdescriptint descript; +}; + #define DEFDESCRIPT { NULL, NULL, NULL, NULL, NULL } #define FLG_CHAIN (1 << 0) @@ -55,31 +69,36 @@ smbfind(int id, 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 struct smbfnsint * +smbfindint(int id, struct smbfnsint *list) { - char *fmt; - va_list ap; - int pcnt, dcnt; + int sindex; + + for (sindex = 0; list[sindex].name; sindex++) + if (list[sindex].id == id) + return(&list[sindex]); - va_start(ap, data); - pcnt = va_arg(ap, int); - dcnt = va_arg(ap, int); - va_end(ap); + return(&list[0]); +} + +static void +trans2_findfirst(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"; 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); @@ -87,22 +106,16 @@ trans2_findfirst(const uchar *param, const uchar *data, ...) } static void -trans2_qfsinfo(const uchar *param, const uchar *data, ...) +trans2_qfsinfo(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); + TCHECK2(*param, 2); + level = EXTRACT_LE_16BITS(param); fmt = "InfoLevel=[d]\n"; - fdata(param, fmt, param + pcnt); + smb_fdata(param, fmt, param + pcnt); } else { switch (level) { case 1: @@ -118,316 +131,327 @@ trans2_qfsinfo(const uchar *param, const uchar *data, ...) fmt = "UnknownLevel\n"; break; } - fdata(data, fmt, data + dcnt); + smb_fdata(data, fmt, data + dcnt); } if (dcnt) { printf("data:\n"); print_data(data, dcnt); } + return; +trunc: + printf("[|SMB]"); + return; } -struct smbfns trans2_fns[] = { - { 0, "TRANSACT2_OPEN", 0, +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(const u_char *words, const u_char *dat _U_, const u_char *buf, const u_char *maxbuf) { - static struct smbfns *fn = &trans2_fns[0]; - uchar *data, *param; - uchar *f1 = NULL, *f2 = NULL; + static 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); + 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); + 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) { + printf("%s\n", fn->name); + printf("Trans2Interim\n"); + return; + } + 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); if (request) { - if (CVAL(words, 0) == 8) { - fdata(words + 1, + if (words[0] == 8) { + 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); - return; + return; } 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); - 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; } 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(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); f1 = fn->descript.rep_f1; f2 = fn->descript.rep_f2; } if (fn->descript.fn) - fn->descript.fn(param, data, pcnt, dcnt); + (*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 : "Parameters=\n", param + pcnt); + smb_fdata(data, f2 ? f2 : "Data=\n", data + dcnt); } + return; +trunc: + printf("[|SMB]"); + return; } static void -print_browse(uchar *param, int paramlen, const uchar *data, int datalen) +print_browse(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; - fdata(param, "BROWSE PACKET\n|Param ", param+paramlen); + TCHECK(data[0]); + command = data[0]; + + smb_fdata(param, "BROWSE PACKET\n|Param ", param+paramlen); 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: - 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: - data = fdata(data, + data = smb_fdata(data, "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: - 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: - data = fdata(data, + data = smb_fdata(data, "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: - data = fdata(data, + data = smb_fdata(data, "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: - data = fdata(data, + data = smb_fdata(data, "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; } + return; +trunc: + printf("[|SMB]"); + return; } static void -print_ipc(uchar *param, int paramlen, uchar *data, int datalen) +print_ipc(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(param, "Command=[w]\nStr1=[S]\nStr2=[S]\n", param + paramlen); if (datalen) - fdata(data, "IPC ", data + datalen); + smb_fdata(data, "IPC ", data + datalen); } static void -print_trans(const uchar *words, const uchar *data1, ...) +print_trans(const u_char *words, const u_char *data1, const u_char *buf, const u_char *maxbuf) { - uchar *f1, *f2, *f3, *f4; - uchar *data, *param; + const char *f1, *f2, *f3, *f4; + const u_char *data, *param; + const u_char *w = words + 1; 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); + 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 { - 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); + 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 "; } - fdata(words + 1, f1, MIN(words + 1 + 2 * CVAL(words, 0), maxbuf)); - fdata(data1 + 2, f2, maxbuf - (paramlen + datalen)); + smb_fdata(words + 1, f1, SMBMIN(words + 1 + 2 * words[0], maxbuf)); + smb_fdata(data1 + 2, f2, maxbuf - (paramlen + datalen)); - if (!strcmp(data1 + 2, "\\MAILSLOT\\BROWSE")) { + if (strcmp((const char *)(data1 + 2), "\\MAILSLOT\\BROWSE") == 0) { print_browse(param, paramlen, data, datalen); return; } - if (!strcmp(data1 + 2, "\\PIPE\\LANMAN")) { + if (strcmp((const char *)(data1 + 2), "\\PIPE\\LANMAN") == 0) { print_ipc(param, paramlen, data, datalen); return; } if (paramlen) - fdata(param, f3, MIN(param + paramlen, maxbuf)); + smb_fdata(param, f3, SMBMIN(param + paramlen, maxbuf)); if (datalen) - fdata(data, f4, MIN(data + datalen, maxbuf)); + smb_fdata(data, f4, SMBMIN(data + datalen, maxbuf)); + return; +trunc: + printf("[|SMB]"); + return; } static void -print_negprot(const uchar *words, const uchar *data, ...) +print_negprot(const u_char *words, const u_char *data, const u_char *buf _U_, const u_char *maxbuf) { - 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); + u_int wcnt; + const char *f1 = NULL, *f2 = NULL; + TCHECK(words[0]); + wcnt = words[0]; if (request) f2 = "*|Dialect=[Z]\n"; else { - if (CVAL(words, 0) == 1) + if (wcnt == 1) f1 = "Core Protocol\nDialectIndex=[d]"; - else if (CVAL(words, 0) == 17) + else if (wcnt == 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) + else if (wcnt == 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 (f1) - fdata(words + 1, f1, MIN(words + 1 + CVAL(words, 0) * 2, maxbuf)); + if (f1) + smb_fdata(words + 1, f1, SMBMIN(words + 1 + wcnt * 2, maxbuf)); else - print_data(words + 1, MIN(CVAL(words, 0) * 2, - PTR_DIFF(maxbuf, words + 1))); + print_data(words + 1, SMBMIN(wcnt * 2, PTR_DIFF(maxbuf, words + 1))); - if (f2) - fdata(data + 2, f2, MIN(data + 2 + SVAL(data, 0), maxbuf)); + TCHECK2(*data, 2); + if (f2) + smb_fdata(data + 2, f2, SMBMIN(data + 2 + EXTRACT_LE_16BITS(data), maxbuf)); else - print_data(data + 2, MIN(SVAL(data, 0), PTR_DIFF(maxbuf, data + 2))); + print_data(data + 2, SMBMIN(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2))); + return; +trunc: + printf("[|SMB]"); + return; } static void -print_sesssetup(const uchar *words, const uchar *data, ...) +print_sesssetup(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); + u_int wcnt; + const char *f1 = NULL, *f2 = NULL; + TCHECK(words[0]); + wcnt = words[0]; 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"; } 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 (wcnt == 3) { + f1 = "Com2=[w]\nOff2=[d]\nAction=[w]\n"; + } else if (wcnt == 13) { + f1 = "Com2=[B]\nRes=[B]\nOff2=[d]\nAction=[w]\n"; + f2 = "NativeOS=[S]\nNativeLanMan=[S]\nPrimaryDomain=[S]\n"; } } - if (f1) - fdata(words + 1, f1, MIN(words + 1 + CVAL(words, 0) * 2, maxbuf)); + if (f1) + smb_fdata(words + 1, f1, SMBMIN(words + 1 + wcnt * 2, maxbuf)); else - print_data(words + 1, MIN(CVAL(words, 0) * 2, - PTR_DIFF(maxbuf, words + 1))); + print_data(words + 1, SMBMIN(wcnt * 2, PTR_DIFF(maxbuf, words + 1))); - if (f2) - fdata(data + 2, f2, MIN(data + 2 + SVAL(data, 0), maxbuf)); + TCHECK2(*data, 2); + if (f2) + smb_fdata(data + 2, f2, SMBMIN(data + 2 + EXTRACT_LE_16BITS(data), maxbuf)); else - print_data(data + 2, MIN(SVAL(data, 0), PTR_DIFF(maxbuf, data+2))); + print_data(data + 2, SMBMIN(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2))); + return; +trunc: + printf("[|SMB]"); + return; } @@ -495,10 +519,10 @@ static struct smbfns smb_fns[] = { { "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, - { NULL, "Path=[Z]\n", NULL, NULL, NULL } }, + { NULL, "Path=[Z]\n", NULL, NULL, NULL } }, { SMBdskattr, "SMBdskattr", 0, { NULL, NULL, @@ -515,7 +539,7 @@ static struct smbfns smb_fns[] = { { pSETDIR, "SMBsetdir", 0, { NULL, "Path=[Z]\n", NULL, NULL, NULL } }, { SMBlseek, "SMBlseek", 0, - { "Handle=[d]\nMode=[w]\nOffset=[D]\n", "Offset=[D]\n", NULL, NULL } }, + { "Handle=[d]\nMode=[w]\nOffset=[D]\n", "Offset=[D]\n", NULL, NULL, NULL } }, { SMBflush, "SMBflush", 0, { "Handle=[d]\n", NULL, NULL, NULL, NULL } }, @@ -655,7 +679,7 @@ static struct smbfns smb_fns[] = { { SMBsendstrt, "SMBsendstrt", 0, { NULL, "Source=[Z]\nDest=[Z]\n", "GroupID=[d]\n", NULL, NULL } }, - + { SMBsendend, "SMBsendend", 0, { "GroupID=[d]\n", NULL, NULL, NULL, NULL } }, @@ -669,7 +693,7 @@ static struct smbfns smb_fns[] = { { SMBcancelf, "SMBcancelf", 0, DEFDESCRIPT }, { SMBgetmac, "SMBgetmac", 0, DEFDESCRIPT }, - { SMBnegprot, "SMBnegprot", 0, + { SMBnegprot, "SMBnegprot", 0, { NULL, NULL, NULL, NULL, print_negprot } }, { SMBsesssetupX, "SMBsesssetupX", FLG_CHAIN, @@ -693,7 +717,7 @@ static struct smbfns smb_fns[] = { { "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 } }, + NULL, NULL } }, { SMBntcancel, "SMBntcancel", 0, DEFDESCRIPT }, @@ -705,17 +729,19 @@ static struct smbfns smb_fns[] = { * 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; - const uchar *words, *data; + const u_char *words, *data; struct smbfns *fn; - char *fmt_smbheader = + 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"; - request = (CVAL(buf, 9) & 0x80) ? 0 : 1; - command = CVAL(buf, 4); + TCHECK(buf[9]); + request = (buf[9] & 0x80) ? 0 : 1; + + command = buf[4]; fn = smbfind(command, smb_fns); @@ -728,20 +754,22 @@ print_smb(const uchar *buf, const uchar *maxbuf) 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); - int num = SVAL(buf, 7); - printf("SMBError = %s\n", smb_errstr(class, num)); - } + if (buf[5]) + printf("SMBError = %s\n", smb_errstr(buf[5], EXTRACT_LE_16BITS(&buf[7]))); words = buf + 32; - data = words + 1 + CVAL(words,0)*2; + TCHECK(words[0]); + + for (;;) { + const char *f1, *f2; + int wct; + u_int bcc; - while (words && data) { - char *f1, *f2; - int wct = CVAL(words, 0); + TCHECK(words[0]); + wct = words[0]; + data = words + 1 + wct * 2; if (request) { f1 = fn->descript.req_f1; @@ -752,49 +780,62 @@ print_smb(const uchar *buf, const uchar *maxbuf) } if (fn->descript.fn) - fn->descript.fn(words, data, buf, maxbuf); + (*fn->descript.fn)(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; + if (wct) { 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 (f1) + smb_fdata(words + 1, f1, words + 1 + wct * 2); + else { + int i; + int v; + + for (i = 0; i < wct; i++) { + TCHECK2(words[1 + 2 * i], 2); + v = EXTRACT_LE_16BITS(words + 1 + 2 * i); + printf("smb_vwv[%d]=%d (0x%X)\n", i, v, v); + } } } + TCHECK2(*data, 2); + bcc = EXTRACT_LE_16BITS(data); if (f2) { - printf("smbbuf[]=\n"); - fdata(data + 2, f2, maxbuf); + if (bcc > 0) { + printf("smbbuf[]=\n"); + smb_fdata(data + 2, f2, data + 2 + bcc); + } } else { - int bcc = SVAL(data, 0); - printf("smb_bcc=%d\n", bcc); + printf("smb_bcc=%u\n", bcc); if (bcc > 0) { printf("smb_buf[]=\n"); - print_data(data + 2, MIN(bcc, PTR_DIFF(maxbuf, data + 2))); + print_data(data + 2, SMBMIN(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; + TCHECK(words[1]); + command = EXTRACT_LE_16BITS(words + 1); + if (command == 0xFF) + break; + TCHECK2(words[3], 2); + words = buf + 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; + printf("\nSMB PACKET: %s (%s) (CHAINED)\n", + fn->name, request ? "REQUEST" : "REPLY"); } - printf("\n"); + printf("\n"); + return; +trunc: + printf("[|SMB]"); + return; } @@ -802,20 +843,24 @@ print_smb(const uchar *buf, const uchar *maxbuf) * 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; - int flags = CVAL(data, 0); - int nbt_len = RSVAL(data, 2); + const u_char *maxbuf = data + length; + int flags; + u_int nbt_len; + + TCHECK2(data[2], 2); + flags = data[0]; + nbt_len = EXTRACT_16BITS(data + 2); startbuf = data; if (maxbuf <= data) return; if (vflag > 1) - printf ("\n>>> "); + printf ("\n>>>"); - printf("NBT Packet"); + printf(" NBT Packet"); if (vflag < 2) return; @@ -823,10 +868,10 @@ nbt_tcp_print(const uchar *data, int length) printf("\n"); switch (flags) { - case 1: + case 1: 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; @@ -840,51 +885,58 @@ nbt_tcp_print(const uchar *data, int length) break; case 0x81: - data = fdata(data, + data = smb_fdata(data, "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); + int ecode; - data = fdata(data, "NBT SessionReject\nFlags=[rW]\nReason=[B]\n", + TCHECK(data[4]); + ecode = data[4]; + + data = smb_fdata(data, "NBT SessionReject\nFlags=[rW]\nReason=[B]\n", maxbuf); switch (ecode) { - case 0x80: - printf("Not listening on called name\n"); + case 0x80: + printf("Not listening on called name\n"); break; - case 0x81: - printf("Not listening for calling name\n"); + case 0x81: + printf("Not listening for calling name\n"); break; - case 0x82: - printf("Called name not present\n"); + case 0x82: + printf("Called name not present\n"); break; - case 0x83: - printf("Called name present, but insufficient resources\n"); + case 0x83: + printf("Called name present, but insufficient resources\n"); break; default: - printf("Unspecified error 0x%X\n", ecode); - break; + printf("Unspecified error 0x%X\n", ecode); + break; } } 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); - 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); + return; +trunc: + printf("[|SMB]"); + return; } @@ -892,139 +944,158 @@ nbt_tcp_print(const uchar *data, int length) * 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, response, opcode, nm_flags, rcode; + int qdcount, ancount, nscount, arcount; + const char *opcodestr; + const u_char *p; + int total, i; + + 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; + + 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 - printf("; POSITIVE"); - } - - if (response) - printf("; RESPONSE"); - else - printf("; REQUEST"); - - if (nm_flags&1) - printf("; BROADCAST"); - else - printf("; UNICAST"); - - if (vflag < 2) - return; + printf("; REQUEST"); - 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 (nm_flags & 1) + printf("; BROADCAST"); + else + printf("; UNICAST"); - p = data + 12; + if (vflag < 2) + return; - { - int total = ancount+nscount+arcount; - int i; + 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; + + total = ancount + nscount + arcount; - if (qdcount>100 || total>100) { - printf("Corrupt packet??\n"); - return; + if (qdcount > 100 || total > 100) { + printf("Corrupt packet??\n"); + return; } if (qdcount) { - printf("QuestionRecords:\n"); - for (i=0;i "); - 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(" "); - if (p[0] & 0x08) printf(" "); - if (p[0] & 0x04) printf(" "); - if (p[0] & 0x02) printf(" "); - printf("\n"); - p += 2; + goto out; + restype = EXTRACT_16BITS(p); + p = smb_fdata(p, "ResType=[rw]\nResClass=[rw]\nTTL=[rD]\n", p + 8); + if (p == NULL) + goto out; + rdlen = EXTRACT_16BITS(p); + 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; + + TCHECK(*p); + numnames = 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); + TCHECK(*p); + if (p[0] & 0x80) + printf(" "); + 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(" "); + if (p[0] & 0x08) + printf(" "); + if (p[0] & 0x04) + printf(" "); + if (p[0] & 0x02) + printf(" "); + printf("\n"); + p += 2; + } + } else { + print_data(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(p, "AdditionalData:\n", maxbuf); + out: - printf("\n"); - fflush(stdout); + printf("\n"); + fflush(stdout); + return; +trunc: + printf("[|SMB]"); + return; } @@ -1032,149 +1103,177 @@ out: /* * 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) { + /* 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(data, maxbuf); + } +out: + 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; + 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 (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; + } + 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: - printf("\n"); + printf("\n"); + return; +trunc: + printf("[|SMB]"); + return; } /* - * 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; - const uchar *maxbuf; + const u_char *maxbuf; maxbuf = data + length; /* Don't go past the end of the captured data in the packet. */ @@ -1185,7 +1284,7 @@ void ipx_netbios_print(const uchar *data, u_int length) 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"); @@ -1194,5 +1293,5 @@ void ipx_netbios_print(const uchar *data, u_int length) } } if (i == 128) - fdata(data, "\n>>> Unknown IPX ", maxbuf); + smb_fdata(data, "\n>>> Unknown IPX ", maxbuf); }