X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d8b3af528a3af5d3715f0d05c3583420acfb8a22..5d6a1edd068e89b14f7525f11f992c46e16cfc2f:/print-smb.c diff --git a/print-smb.c b/print-smb.c index cc7bd6fd..f0e992c4 100644 --- a/print-smb.c +++ b/print-smb.c @@ -10,11 +10,6 @@ #include "config.h" #endif -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.47 2007-12-09 00:30:47 guy Exp $"; -#endif - #include #include @@ -24,6 +19,8 @@ static const char rcsid[] _U_ = #include "extract.h" #include "smb.h" +static const char tstr[] = "[|SMB]"; + static int request = 0; static int unicodestr = 0; @@ -140,7 +137,7 @@ trans2_qfsinfo(const u_char *param, const u_char *data, int pcnt, int dcnt) } return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -234,7 +231,7 @@ print_trans2(const u_char *words, const u_char *dat, const u_char *buf, const u_ } return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -316,7 +313,7 @@ print_browse(const u_char *param, int paramlen, const u_char *data, int datalen) } return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -363,7 +360,7 @@ print_trans(const u_char *words, const u_char *data1, const u_char *buf, const u f4 = "|Data "; } - smb_fdata(words + 1, f1, SMBMIN(words + 1 + 2 * words[0], maxbuf), + smb_fdata(words + 1, f1, min(words + 1 + 2 * words[0], maxbuf), unicodestr); TCHECK2(*data1, 2); @@ -383,13 +380,13 @@ print_trans(const u_char *words, const u_char *data1, const u_char *buf, const u } if (paramlen) - smb_fdata(param, f3, SMBMIN(param + paramlen, maxbuf), unicodestr); + smb_fdata(param, f3, min(param + paramlen, maxbuf), unicodestr); if (datalen) - smb_fdata(data, f4, SMBMIN(data + datalen, maxbuf), unicodestr); + smb_fdata(data, f4, min(data + datalen, maxbuf), unicodestr); } return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -414,24 +411,24 @@ print_negprot(const u_char *words, const u_char *data, const u_char *buf _U_, co } if (f1) - smb_fdata(words + 1, f1, SMBMIN(words + 1 + wct * 2, maxbuf), + smb_fdata(words + 1, f1, min(words + 1 + wct * 2, maxbuf), unicodestr); else - print_data(words + 1, SMBMIN(wct * 2, PTR_DIFF(maxbuf, words + 1))); + print_data(words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1))); TCHECK2(*data, 2); bcc = EXTRACT_LE_16BITS(data); printf("smb_bcc=%u\n", bcc); if (bcc > 0) { if (f2) - smb_fdata(data + 2, f2, SMBMIN(data + 2 + EXTRACT_LE_16BITS(data), + smb_fdata(data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data), maxbuf), unicodestr); else - print_data(data + 2, SMBMIN(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2))); + print_data(data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2))); } return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -458,24 +455,24 @@ print_sesssetup(const u_char *words, const u_char *data, const u_char *buf _U_, } if (f1) - smb_fdata(words + 1, f1, SMBMIN(words + 1 + wct * 2, maxbuf), + smb_fdata(words + 1, f1, min(words + 1 + wct * 2, maxbuf), unicodestr); else - print_data(words + 1, SMBMIN(wct * 2, PTR_DIFF(maxbuf, words + 1))); + print_data(words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1))); TCHECK2(*data, 2); bcc = EXTRACT_LE_16BITS(data); printf("smb_bcc=%u\n", bcc); if (bcc > 0) { if (f2) - smb_fdata(data + 2, f2, SMBMIN(data + 2 + EXTRACT_LE_16BITS(data), + smb_fdata(data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data), maxbuf), unicodestr); else - print_data(data + 2, SMBMIN(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2))); + print_data(data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2))); } return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -499,7 +496,7 @@ print_lockingandx(const u_char *words, const u_char *data, const u_char *buf _U_ f1 = "Com2=[w]\nOff2=[d]\n"; } - maxwords = SMBMIN(words + 1 + wct * 2, maxbuf); + maxwords = min(words + 1 + wct * 2, maxbuf); if (wct) smb_fdata(words + 1, f1, maxwords, unicodestr); @@ -508,14 +505,14 @@ print_lockingandx(const u_char *words, const u_char *data, const u_char *buf _U_ printf("smb_bcc=%u\n", bcc); if (bcc > 0) { if (f2) - smb_fdata(data + 2, f2, SMBMIN(data + 2 + EXTRACT_LE_16BITS(data), + smb_fdata(data + 2, f2, min(data + 2 + EXTRACT_LE_16BITS(data), maxbuf), unicodestr); else - print_data(data + 2, SMBMIN(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2))); + print_data(data + 2, min(EXTRACT_LE_16BITS(data), PTR_DIFF(maxbuf, data + 2))); } return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -847,7 +844,7 @@ print_smb(const u_char *buf, const u_char *maxbuf) TCHECK(words[0]); wct = words[0]; data = words + 1 + wct * 2; - maxwords = SMBMIN(data, maxbuf); + maxwords = min(data, maxbuf); if (request) { f1 = fn->descript.req_f1; @@ -884,7 +881,7 @@ print_smb(const u_char *buf, const u_char *maxbuf) } else { if (bcc > 0) { printf("smb_buf[]=\n"); - print_data(data + 2, SMBMIN(bcc, PTR_DIFF(maxbuf, data + 2))); + print_data(data + 2, min(bcc, PTR_DIFF(maxbuf, data + 2))); } } } @@ -898,7 +895,7 @@ print_smb(const u_char *buf, const u_char *maxbuf) if (command == 0xFF) break; TCHECK2(words[3], 2); - newsmboffset = EXTRACT_LE_16BITS(words + 3); + newsmboffset = EXTRACT_LE_16BITS(words + 3); fn = smbfind(command, smb_fns); @@ -914,7 +911,7 @@ print_smb(const u_char *buf, const u_char *maxbuf) printf("\n"); return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -1078,7 +1075,7 @@ nbt_tcp_print(const u_char *data, int length) } return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -1240,7 +1237,7 @@ out: fflush(stdout); return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -1282,7 +1279,7 @@ smb_tcp_print (const u_char * data, int length) printf("SMB-over-TCP packet:(raw data or continuation?)\n"); return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; } @@ -1471,7 +1468,7 @@ out: printf("\n"); return; trunc: - printf("[|SMB]"); + printf("%s", tstr); return; }