summaryrefslogtreecommitdiffstats
path: root/addrtoname.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:52:32 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:52:32 +0000
commit19d738d1692ee8b11eb2de0f9995732b32cf6bac (patch)
tree35501236837919acfbf69e867f25e6830ee9301d /addrtoname.c
parentAdding debian version 4.99.4-4. (diff)
downloadtcpdump-19d738d1692ee8b11eb2de0f9995732b32cf6bac.tar.xz
tcpdump-19d738d1692ee8b11eb2de0f9995732b32cf6bac.zip
Merging upstream version 4.99.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--addrtoname.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/addrtoname.c b/addrtoname.c
index 914665c..fd04e78 100644
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -22,9 +22,7 @@
* and address to string conversion routines
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#ifdef HAVE_CASPER
#include <libcasper.h>
@@ -526,8 +524,7 @@ lookup_nsap(netdissect_options *ndo, const u_char *nsap,
k = (ensap[0] << 8) | ensap[1];
j = (ensap[2] << 8) | ensap[3];
i = (ensap[4] << 8) | ensap[5];
- }
- else
+ } else
i = j = k = 0;
tp = &nsaptable[(i ^ j) & (HASHNAMESIZE-1)];
@@ -1116,7 +1113,7 @@ static const struct ipxsap_ent {
{ 0x030a, "GalacticommWorldgroupServer" },
{ 0x030c, "IntelNetport2/HP JetDirect/HP Quicksilver" },
{ 0x0320, "AttachmateGateway" },
- { 0x0327, "MicrosoftDiagnostiocs" },
+ { 0x0327, "MicrosoftDiagnostics" },
{ 0x0328, "WATCOM SQL Server" },
{ 0x0335, "MultiTechSystems MultisynchCommServer" },
{ 0x0343, "Xylogics RemoteAccessServer/LANModem" },