More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-ipx.c

diff --git a/print-ipx.c b/print-ipx.c
index 413d6ba9c02bcd88227119392449a4d993021e07..e7102a5e5a7c5657c21310362a943db014c6a2ae 100644 (file)
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -22,20 +22,11 @@
  * Contributed by Brad Parker ([email protected]).
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.30 2001-01-15 03:23:59 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -43,9 +34,32 @@ static const char rcsid[] =
 
 #include "interface.h"
 #include "addrtoname.h"
-#include "ipx.h"
 #include "extract.h"
 
+/* well-known sockets */
+#define        IPX_SKT_NCP             0x0451
+#define        IPX_SKT_SAP             0x0452
+#define        IPX_SKT_RIP             0x0453
+#define        IPX_SKT_NETBIOS         0x0455
+#define        IPX_SKT_DIAGNOSTICS     0x0456
+#define        IPX_SKT_NWLINK_DGM      0x0553  /* NWLink datagram, may contain SMB */
+#define        IPX_SKT_EIGRP           0x85be  /* Cisco EIGRP over IPX */
+
+/* IPX transport header */
+struct ipxHdr {
+    u_int16_t  cksum;          /* Checksum */
+    u_int16_t  length;         /* Length, in bytes, including header */
+    u_int8_t   tCtl;           /* Transport Control (i.e. hop count) */
+    u_int8_t   pType;          /* Packet Type (i.e. level 2 protocol) */
+    u_int16_t  dstNet[2];      /* destination net */
+    u_int8_t   dstNode[6];     /* destination node */
+    u_int16_t  dstSkt;         /* destination socket */
+    u_int16_t  srcNet[2];      /* source net */
+    u_int8_t   srcNode[6];     /* source node */
+    u_int16_t  srcSkt;         /* source socket */
+};
+
+#define ipxSize        30
 
 static const char *ipxaddr_string(u_int32_t, const u_char *);
 void ipx_decode(const struct ipxHdr *, const u_char *, u_int);
@@ -60,12 +74,15 @@ ipx_print(const u_char *p, u_int length)
 {
        const struct ipxHdr *ipx = (const struct ipxHdr *)p;
 
+       if (!eflag)
+               printf("IPX ");
+
        TCHECK(ipx->srcSkt);
-       (void)printf("%s.%x > ",
+       (void)printf("%s.%04x > ",
                     ipxaddr_string(EXTRACT_32BITS(ipx->srcNet), ipx->srcNode),
                     EXTRACT_16BITS(&ipx->srcSkt));
 
-       (void)printf("%s.%x:",
+       (void)printf("%s.%04x: ",
                     ipxaddr_string(EXTRACT_32BITS(ipx->dstNet), ipx->dstNode),
                     EXTRACT_16BITS(&ipx->dstSkt));
 
@@ -84,7 +101,7 @@ ipxaddr_string(u_int32_t net, const u_char *node)
 {
     static char line[256];
 
-    snprintf(line, sizeof(line), "%x.%02x:%02x:%02x:%02x:%02x:%02x",
+    snprintf(line, sizeof(line), "%08x.%02x:%02x:%02x:%02x:%02x:%02x",
            net, node[0], node[1], node[2], node[3], node[4], node[5]);
 
     return line;
@@ -98,7 +115,7 @@ ipx_decode(const struct ipxHdr *ipx, const u_char *datap, u_int length)
     dstSkt = EXTRACT_16BITS(&ipx->dstSkt);
     switch (dstSkt) {
       case IPX_SKT_NCP:
-       (void)printf(" ipx-ncp %d", length);
+       (void)printf("ipx-ncp %d", length);
        break;
       case IPX_SKT_SAP:
        ipx_sap_print((u_short *)datap, length);
@@ -107,21 +124,25 @@ ipx_decode(const struct ipxHdr *ipx, const u_char *datap, u_int length)
        ipx_rip_print((u_short *)datap, length);
        break;
       case IPX_SKT_NETBIOS:
-       (void)printf(" ipx-netbios %d", length);
+       (void)printf("ipx-netbios %d", length);
+#ifdef TCPDUMP_DO_SMB
        ipx_netbios_print(datap, length);
+#endif
        break;
       case IPX_SKT_DIAGNOSTICS:
-       (void)printf(" ipx-diags %d", length);
+       (void)printf("ipx-diags %d", length);
        break;
       case IPX_SKT_NWLINK_DGM:
-       (void)printf(" ipx-nwlink-dgm %d", length);
+       (void)printf("ipx-nwlink-dgm %d", length);
+#ifdef TCPDUMP_DO_SMB
        ipx_netbios_print(datap, length);
+#endif
        break;
       case IPX_SKT_EIGRP:
-       (void)printf(" ipx-eigrp %d", length);
+       eigrp_print(datap, length);
        break;
       default:
-       (void)printf(" ipx-#%x %d", dstSkt, length);
+       (void)printf("ipx-#%x %d", dstSkt, length);
        break;
     }
 }
@@ -145,7 +166,7 @@ ipx_sap_print(const u_short *ipx, u_int length)
            (void)printf("ipx-sap-nearest-req");
 
        TCHECK(ipx[0]);
-       (void)printf(" %x", EXTRACT_16BITS(&ipx[0]));
+       (void)printf(" %s", ipxsap_string(htons(EXTRACT_16BITS(&ipx[0]))));
        break;
 
       case 2:
@@ -156,9 +177,13 @@ ipx_sap_print(const u_short *ipx, u_int length)
            (void)printf("ipx-sap-nearest-resp");
 
        for (i = 0; i < 8 && length > 0; i++) {
+           TCHECK(ipx[0]);
+           (void)printf(" %s '", ipxsap_string(htons(EXTRACT_16BITS(&ipx[0]))));
+           if (fn_printzp((u_char *)&ipx[1], 48, snapend)) {
+               printf("'");
+               goto trunc;
+           }
            TCHECK2(ipx[25], 10);
-           (void)printf(" %x '", EXTRACT_16BITS(&ipx[0]));
-           fn_print((u_char *)&ipx[1], (u_char *)&ipx[1] + 48);
            printf("' addr %s",
                ipxaddr_string(EXTRACT_32BITS(&ipx[25]), (u_char *)&ipx[27]));
            ipx += 32;
@@ -189,7 +214,7 @@ ipx_rip_print(const u_short *ipx, u_int length)
        (void)printf("ipx-rip-req");
        if (length > 0) {
            TCHECK(ipx[3]);
-           (void)printf(" %u/%d.%d", EXTRACT_32BITS(&ipx[0]),
+           (void)printf(" %08x/%d.%d", EXTRACT_32BITS(&ipx[0]),
                         EXTRACT_16BITS(&ipx[2]), EXTRACT_16BITS(&ipx[3]));
        }
        break;
@@ -197,7 +222,7 @@ ipx_rip_print(const u_short *ipx, u_int length)
        (void)printf("ipx-rip-resp");
        for (i = 0; i < 50 && length > 0; i++) {
            TCHECK(ipx[3]);
-           (void)printf(" %u/%d.%d", EXTRACT_32BITS(&ipx[0]),
+           (void)printf(" %08x/%d.%d", EXTRACT_32BITS(&ipx[0]),
                         EXTRACT_16BITS(&ipx[2]), EXTRACT_16BITS(&ipx[3]));
 
            ipx += 4;
@@ -212,4 +237,3 @@ ipx_rip_print(const u_short *ipx, u_int length)
 trunc:
     printf("[|ipx %d]", length);
 }
-