X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/39a7d38ee8332a8e70dff64676cc488443a5b76f..f34af1aa63da301ae7ee91e2300dff31702001f0:/print-smb.c diff --git a/print-smb.c b/print-smb.c index 6c84f733..d8e66f13 100644 --- a/print-smb.c +++ b/print-smb.c @@ -9,10 +9,10 @@ /* \summary: SMB/CIFS printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include @@ -20,7 +20,6 @@ #include "extract.h" #include "smb.h" -static const char tstr[] = "[|SMB]"; static int request = 0; static int unicodestr = 0; @@ -102,8 +101,8 @@ trans2_findfirst(netdissect_options *ndo, smb_fdata(ndo, param, fmt, param + pcnt, unicodestr); if (dcnt) { - ND_PRINT((ndo, "data:\n")); - smb_print_data(ndo, data, dcnt); + ND_PRINT("data:\n"); + smb_data_print(ndo, data, dcnt); } } @@ -137,12 +136,12 @@ trans2_qfsinfo(netdissect_options *ndo, smb_fdata(ndo, data, fmt, data + dcnt, unicodestr); } if (dcnt) { - ND_PRINT((ndo, "data:\n")); - smb_print_data(ndo, data, dcnt); + ND_PRINT("data:\n"); + smb_data_print(ndo, data, dcnt); } return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } static const struct smbfnsint trans2_fns[] = { @@ -191,8 +190,8 @@ print_trans2(netdissect_options *ndo, fn = smbfindint(EXTRACT_LE_U_2(w + 14 * 2), trans2_fns); } else { if (EXTRACT_U_1(words) == 0) { - ND_PRINT((ndo, "%s\n", fn->name)); - ND_PRINT((ndo, "Trans2Interim\n")); + ND_PRINT("%s\n", fn->name); + ND_PRINT("Trans2Interim\n"); return; } ND_TCHECK_2(w + (7 * 2)); @@ -202,7 +201,7 @@ print_trans2(netdissect_options *ndo, data = buf + EXTRACT_LE_U_2(w + 7 * 2); } - ND_PRINT((ndo, "%s param_length=%u data_length=%u\n", fn->name, pcnt, dcnt)); + ND_PRINT("%s param_length=%u data_length=%u\n", fn->name, pcnt, dcnt); if (request) { if (EXTRACT_U_1(words) == 8) { @@ -227,7 +226,7 @@ print_trans2(netdissect_options *ndo, ND_TCHECK_2(dat); bcc = EXTRACT_LE_U_2(dat); - ND_PRINT((ndo, "smb_bcc=%u\n", bcc)); + ND_PRINT("smb_bcc=%u\n", bcc); if (fn->descript.fn) (*fn->descript.fn)(ndo, param, data, pcnt, dcnt); else { @@ -236,7 +235,7 @@ print_trans2(netdissect_options *ndo, } return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } static void @@ -317,7 +316,7 @@ print_browse(netdissect_options *ndo, } return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } @@ -371,7 +370,7 @@ print_trans(netdissect_options *ndo, ND_TCHECK_2(data1); bcc = EXTRACT_LE_U_2(data1); - ND_PRINT((ndo, "smb_bcc=%u\n", bcc)); + ND_PRINT("smb_bcc=%u\n", bcc); if (bcc > 0) { smb_fdata(ndo, data1 + 2, f2, maxbuf - (paramlen + datalen), unicodestr); @@ -392,7 +391,7 @@ print_trans(netdissect_options *ndo, } return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } @@ -420,22 +419,22 @@ print_negprot(netdissect_options *ndo, smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf), unicodestr); else - smb_print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1))); + smb_data_print(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1))); ND_TCHECK_2(data); bcc = EXTRACT_LE_U_2(data); - ND_PRINT((ndo, "smb_bcc=%u\n", bcc)); + ND_PRINT("smb_bcc=%u\n", bcc); if (bcc > 0) { if (f2) smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data), maxbuf), unicodestr); else - smb_print_data(ndo, data + 2, + smb_data_print(ndo, data + 2, min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2))); } return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } static void @@ -465,22 +464,22 @@ print_sesssetup(netdissect_options *ndo, smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf), unicodestr); else - smb_print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1))); + smb_data_print(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1))); ND_TCHECK_2(data); bcc = EXTRACT_LE_U_2(data); - ND_PRINT((ndo, "smb_bcc=%u\n", bcc)); + ND_PRINT("smb_bcc=%u\n", bcc); if (bcc > 0) { if (f2) smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data), maxbuf), unicodestr); else - smb_print_data(ndo, data + 2, + smb_data_print(ndo, data + 2, min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2))); } return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } static void @@ -510,18 +509,18 @@ print_lockingandx(netdissect_options *ndo, ND_TCHECK_2(data); bcc = EXTRACT_LE_U_2(data); - ND_PRINT((ndo, "smb_bcc=%u\n", bcc)); + ND_PRINT("smb_bcc=%u\n", bcc); if (bcc > 0) { if (f2) smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data), maxbuf), unicodestr); else - smb_print_data(ndo, data + 2, + smb_data_print(ndo, data + 2, min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2))); } return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } @@ -819,9 +818,9 @@ print_smb(netdissect_options *ndo, fn = smbfind(command, smb_fns); if (ndo->ndo_vflag > 1) - ND_PRINT((ndo, "\n")); + ND_PRINT("\n"); - ND_PRINT((ndo, "SMB PACKET: %s (%s)\n", fn->name, request ? "REQUEST" : "REPLY")); + ND_PRINT("SMB PACKET: %s (%s)\n", fn->name, request ? "REQUEST" : "REPLY"); if (ndo->ndo_vflag < 2) return; @@ -835,13 +834,13 @@ print_smb(netdissect_options *ndo, smb_fdata(ndo, buf, fmt_smbheader, buf + 33, unicodestr); if (nterrcodes) { - nterror = EXTRACT_LE_U_4(buf + 5); + nterror = EXTRACT_LE_U_4(buf + 5); if (nterror) - ND_PRINT((ndo, "NTError = %s\n", nt_errstr(nterror))); + ND_PRINT("NTError = %s\n", nt_errstr(nterror)); } else { if (EXTRACT_U_1(buf + 5)) - ND_PRINT((ndo, "SMBError = %s\n", smb_errstr(EXTRACT_U_1(buf + 5), - EXTRACT_LE_U_2(buf + 7)))); + ND_PRINT("SMBError = %s\n", smb_errstr(EXTRACT_U_1(buf + 5), + EXTRACT_LE_U_2(buf + 7))); } smboffset = 32; @@ -879,21 +878,21 @@ print_smb(netdissect_options *ndo, for (i = 0; words + 1 + 2 * i < maxwords; i++) { ND_TCHECK_2(words + 1 + 2 * i); v = EXTRACT_LE_U_2(words + 1 + 2 * i); - ND_PRINT((ndo, "smb_vwv[%u]=%u (0x%X)\n", i, v, v)); + ND_PRINT("smb_vwv[%u]=%u (0x%X)\n", i, v, v); } } } ND_TCHECK_2(data); bcc = EXTRACT_LE_U_2(data); - ND_PRINT((ndo, "smb_bcc=%u\n", bcc)); + ND_PRINT("smb_bcc=%u\n", bcc); if (f2) { if (bcc > 0) smb_fdata(ndo, data + 2, f2, data + 2 + bcc, unicodestr); } else { if (bcc > 0) { - ND_PRINT((ndo, "smb_buf[]=\n")); - smb_print_data(ndo, data + 2, min(bcc, PTR_DIFF(maxbuf, data + 2))); + ND_PRINT("smb_buf[]=\n"); + smb_data_print(ndo, data + 2, min(bcc, PTR_DIFF(maxbuf, data + 2))); } } } @@ -911,19 +910,19 @@ print_smb(netdissect_options *ndo, fn = smbfind(command, smb_fns); - ND_PRINT((ndo, "\nSMB PACKET: %s (%s) (CHAINED)\n", - fn->name, request ? "REQUEST" : "REPLY")); + ND_PRINT("\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)); + ND_PRINT("Bad andX offset: %u <= %u\n", newsmboffset, smboffset); break; } smboffset = newsmboffset; } - ND_PRINT((ndo, "\n")); + ND_PRINT("\n"); return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } @@ -939,6 +938,7 @@ nbt_tcp_print(netdissect_options *ndo, u_int nbt_len; const u_char *maxbuf; + ndo->ndo_protocol = "nbt_tcp"; if (length < 4) goto trunc; if (ndo->ndo_snapend < data) @@ -957,18 +957,18 @@ nbt_tcp_print(netdissect_options *ndo, startbuf = data; if (ndo->ndo_vflag < 2) { - ND_PRINT((ndo, " NBT Session Packet: ")); + ND_PRINT(" NBT Session Packet: "); switch (type) { case 0x00: - ND_PRINT((ndo, "Session Message")); + ND_PRINT("Session Message"); break; case 0x81: - ND_PRINT((ndo, "Session Request")); + ND_PRINT("Session Request"); break; case 0x82: - ND_PRINT((ndo, "Session Granted")); + ND_PRINT("Session Granted"); break; case 0x83: @@ -983,29 +983,29 @@ nbt_tcp_print(netdissect_options *ndo, goto trunc; ecode = EXTRACT_U_1(data + 4); - ND_PRINT((ndo, "Session Reject, ")); + ND_PRINT("Session Reject, "); switch (ecode) { case 0x80: - ND_PRINT((ndo, "Not listening on called name")); + ND_PRINT("Not listening on called name"); break; case 0x81: - ND_PRINT((ndo, "Not listening for calling name")); + ND_PRINT("Not listening for calling name"); break; case 0x82: - ND_PRINT((ndo, "Called name not present")); + ND_PRINT("Called name not present"); break; case 0x83: - ND_PRINT((ndo, "Called name present, but insufficient resources")); + ND_PRINT("Called name present, but insufficient resources"); break; default: - ND_PRINT((ndo, "Unspecified error 0x%X", ecode)); + ND_PRINT("Unspecified error 0x%X", ecode); break; } } break; case 0x85: - ND_PRINT((ndo, "Session Keepalive")); + ND_PRINT("Session Keepalive"); break; default: @@ -1013,7 +1013,7 @@ nbt_tcp_print(netdissect_options *ndo, break; } } else { - ND_PRINT((ndo, "\n>>> NBT Session Packet\n")); + ND_PRINT("\n>>> NBT Session Packet\n"); switch (type) { case 0x00: data = smb_fdata(ndo, data, "[P1]NBT Session Message\nFlags=[B]\nLength=[ru]\n", @@ -1023,14 +1023,14 @@ nbt_tcp_print(netdissect_options *ndo, if (nbt_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) { if (nbt_len > caplen) { if (nbt_len > length) - ND_PRINT((ndo, "WARNING: Packet is continued in later TCP segments\n")); + ND_PRINT("WARNING: Packet is continued in later TCP segments\n"); else - ND_PRINT((ndo, "WARNING: Short packet. Try increasing the snap length by %u\n", - nbt_len - caplen)); + ND_PRINT("WARNING: Short packet. Try increasing the snap length by %u\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")); + ND_PRINT("Session packet:(raw data or continuation?)\n"); break; case 0x81: @@ -1057,19 +1057,19 @@ nbt_tcp_print(netdissect_options *ndo, ecode = EXTRACT_U_1(origdata + 4); switch (ecode) { case 0x80: - ND_PRINT((ndo, "Not listening on called name\n")); + ND_PRINT("Not listening on called name\n"); break; case 0x81: - ND_PRINT((ndo, "Not listening for calling name\n")); + ND_PRINT("Not listening for calling name\n"); break; case 0x82: - ND_PRINT((ndo, "Called name not present\n")); + ND_PRINT("Called name not present\n"); break; case 0x83: - ND_PRINT((ndo, "Called name present, but insufficient resources\n")); + ND_PRINT("Called name present, but insufficient resources\n"); break; default: - ND_PRINT((ndo, "Unspecified error 0x%X\n", ecode)); + ND_PRINT("Unspecified error 0x%X\n", ecode); break; } } @@ -1084,11 +1084,11 @@ nbt_tcp_print(netdissect_options *ndo, data = smb_fdata(ndo, data, "NBT - Unknown packet type\nType=[B]\n", maxbuf, 0); break; } - ND_PRINT((ndo, "\n")); + ND_PRINT("\n"); } return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } static const struct tok opcode_str[] = { @@ -1115,6 +1115,7 @@ nbt_udp137_print(netdissect_options *ndo, const u_char *p; u_int total, i; + ndo->ndo_protocol = "nbt_udp137"; ND_TCHECK_2(data + 10); name_trn_id = EXTRACT_BE_U_2(data); response = (EXTRACT_U_1(data + 2) >> 7); @@ -1131,33 +1132,33 @@ nbt_udp137_print(netdissect_options *ndo, return; if (ndo->ndo_vflag > 1) - ND_PRINT((ndo, "\n>>> ")); + ND_PRINT("\n>>> "); - ND_PRINT((ndo, "NBT UDP PACKET(137): %s", tok2str(opcode_str, "OPUNKNOWN", opcode))); + ND_PRINT("NBT UDP PACKET(137): %s", tok2str(opcode_str, "OPUNKNOWN", opcode)); if (response) { - ND_PRINT((ndo, "; %s", rcode ? "NEGATIVE" : "POSITIVE")); + ND_PRINT("; %s", rcode ? "NEGATIVE" : "POSITIVE"); } - ND_PRINT((ndo, "; %s; %s", response ? "RESPONSE" : "REQUEST", - (nm_flags & 1) ? "BROADCAST" : "UNICAST")); + ND_PRINT("; %s; %s", response ? "RESPONSE" : "REQUEST", + (nm_flags & 1) ? "BROADCAST" : "UNICAST"); if (ndo->ndo_vflag < 2) return; - ND_PRINT((ndo, "\nTrnID=0x%X\nOpCode=%u\nNmFlags=0x%X\nRcode=%u\nQueryCount=%u\nAnswerCount=%u\nAuthorityCount=%u\nAddressRecCount=%u\n", + ND_PRINT("\nTrnID=0x%X\nOpCode=%u\nNmFlags=0x%X\nRcode=%u\nQueryCount=%u\nAnswerCount=%u\nAuthorityCount=%u\nAddressRecCount=%u\n", name_trn_id, opcode, nm_flags, rcode, qdcount, ancount, nscount, - arcount)); + arcount); p = data + 12; total = ancount + nscount + arcount; if (qdcount > 100 || total > 100) { - ND_PRINT((ndo, "Corrupt packet??\n")); + ND_PRINT("Corrupt packet??\n"); return; } if (qdcount) { - ND_PRINT((ndo, "QuestionRecords:\n")); + ND_PRINT("QuestionRecords:\n"); for (i = 0; i < qdcount; i++) { p = smb_fdata(ndo, p, "|Name=[n1]\nQuestionType=[rw]\nQuestionClass=[rw]\n#", @@ -1168,7 +1169,7 @@ nbt_udp137_print(netdissect_options *ndo, } if (total) { - ND_PRINT((ndo, "\nResourceRecords:\n")); + ND_PRINT("\nResourceRecords:\n"); for (i = 0; i < total; i++) { u_int rdlen; u_int restype; @@ -1183,7 +1184,7 @@ nbt_udp137_print(netdissect_options *ndo, goto out; ND_TCHECK_2(p); rdlen = EXTRACT_BE_U_2(p); - ND_PRINT((ndo, "ResourceLength=%u\nResourceData=\n", rdlen)); + ND_PRINT("ResourceLength=%u\nResourceData=\n", rdlen); p += 2; if (rdlen == 6) { p = smb_fdata(ndo, p, "AddrType=[rw]\nAddress=[b.b.b.b]\n", p + rdlen, 0); @@ -1206,28 +1207,28 @@ nbt_udp137_print(netdissect_options *ndo, if (p >= maxbuf) goto out; if (EXTRACT_U_1(p) & 0x80) - ND_PRINT((ndo, " ")); + ND_PRINT(" "); switch (EXTRACT_U_1(p) & 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; + case 0x00: ND_PRINT("B "); break; + case 0x20: ND_PRINT("P "); break; + case 0x40: ND_PRINT("M "); break; + case 0x60: ND_PRINT("_ "); break; } if (EXTRACT_U_1(p) & 0x10) - ND_PRINT((ndo, " ")); + ND_PRINT(" "); if (EXTRACT_U_1(p) & 0x08) - ND_PRINT((ndo, " ")); + ND_PRINT(" "); if (EXTRACT_U_1(p) & 0x04) - ND_PRINT((ndo, " ")); + ND_PRINT(" "); if (EXTRACT_U_1(p) & 0x02) - ND_PRINT((ndo, " ")); - ND_PRINT((ndo, "\n")); + ND_PRINT(" "); + ND_PRINT("\n"); p += 2; } } else { if (p >= maxbuf) goto out; - smb_print_data(ndo, p, min(rdlen, length - (p - data))); + smb_data_print(ndo, p, min(rdlen, length - (p - data))); p += rdlen; } } @@ -1238,10 +1239,10 @@ nbt_udp137_print(netdissect_options *ndo, smb_fdata(ndo, p, "AdditionalData:\n", maxbuf, 0); out: - ND_PRINT((ndo, "\n")); + ND_PRINT("\n"); return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } /* @@ -1255,6 +1256,7 @@ smb_tcp_print(netdissect_options *ndo, u_int smb_len; const u_char *maxbuf; + ndo->ndo_protocol = "smb_tcp"; if (length < 4) goto trunc; if (ndo->ndo_snapend < data) @@ -1273,18 +1275,18 @@ smb_tcp_print(netdissect_options *ndo, if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) { if (smb_len > caplen) { if (smb_len > length) - ND_PRINT((ndo, " WARNING: Packet is continued in later TCP segments\n")); + ND_PRINT(" WARNING: Packet is continued in later TCP segments\n"); else - ND_PRINT((ndo, " WARNING: Short packet. Try increasing the snap length by %u\n", - smb_len - caplen)); + ND_PRINT(" WARNING: Short packet. Try increasing the snap length by %u\n", + smb_len - caplen); } else - ND_PRINT((ndo, " ")); + ND_PRINT(" "); 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")); + ND_PRINT(" SMB-over-TCP packet:(raw data or continuation?)\n"); return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } /* @@ -1296,6 +1298,7 @@ nbt_udp138_print(netdissect_options *ndo, { const u_char *maxbuf = data + length; + ndo->ndo_protocol = "nbt_udp138"; if (maxbuf > ndo->ndo_snapend) maxbuf = ndo->ndo_snapend; if (maxbuf <= data) @@ -1303,7 +1306,7 @@ nbt_udp138_print(netdissect_options *ndo, startbuf = data; if (ndo->ndo_vflag < 2) { - ND_PRINT((ndo, "NBT UDP PACKET(138)")); + ND_PRINT("NBT UDP PACKET(138)"); return; } @@ -1320,7 +1323,7 @@ nbt_udp138_print(netdissect_options *ndo, print_smb(ndo, data, maxbuf); } out: - ND_PRINT((ndo, "\n")); + ND_PRINT("\n"); } @@ -1392,6 +1395,7 @@ netbeui_print(netdissect_options *ndo, const u_char *data2; int is_truncated = 0; + ndo->ndo_protocol = "netbeui"; if (maxbuf > ndo->ndo_snapend) maxbuf = ndo->ndo_snapend; ND_TCHECK_1(data + 4); @@ -1406,10 +1410,10 @@ netbeui_print(netdissect_options *ndo, startbuf = data; if (ndo->ndo_vflag < 2) { - ND_PRINT((ndo, "NBF Packet: ")); + ND_PRINT("NBF Packet: "); data = smb_fdata(ndo, data, "[P5]#", maxbuf, 0); } else { - ND_PRINT((ndo, "\n>>> NBF Packet\nType=0x%X ", control)); + ND_PRINT("\n>>> NBF Packet\nType=0x%X ", control); data = smb_fdata(ndo, data, "Length=[u] Signature=[w] Command=[B]\n#", maxbuf, 0); } if (data == NULL) @@ -1422,15 +1426,15 @@ netbeui_print(netdissect_options *ndo, 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)); + ND_PRINT("%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)); + ND_PRINT("%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")); + ND_PRINT("\n"); } } @@ -1462,7 +1466,7 @@ netbeui_print(netdissect_options *ndo, if ((data2 + i + 3) >= maxbuf) break; if (memcmp(data2 + i, "\377SMB", 4) == 0) { - ND_PRINT((ndo, "found SMB packet at %u\n", i)); + ND_PRINT("found SMB packet at %u\n", i); print_smb(ndo, data2 + i, maxbuf); break; } @@ -1470,10 +1474,10 @@ netbeui_print(netdissect_options *ndo, } out: - ND_PRINT((ndo, "\n")); + ND_PRINT("\n"); return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } @@ -1491,6 +1495,7 @@ ipx_netbios_print(netdissect_options *ndo, u_int i; const u_char *maxbuf; + ndo->ndo_protocol = "ipx_netbios"; maxbuf = data + length; /* Don't go past the end of the captured data in the packet. */ if (maxbuf > ndo->ndo_snapend) @@ -1502,7 +1507,7 @@ ipx_netbios_print(netdissect_options *ndo, if (memcmp(data + i, "\377SMB", 4) == 0) { smb_fdata(ndo, data, "\n>>> IPX transport ", data + i, 0); print_smb(ndo, data + i, maxbuf); - ND_PRINT((ndo, "\n")); + ND_PRINT("\n"); break; } }