Default to first interface from pcap_findalldevs()

[tcpdump] / print-ipx.c

diff --git a/print-ipx.c b/print-ipx.c
index 93f5d595586217befdc30b77b6040befb38bbc45..22e613e77e1253104a591072ba2e25a5a1900d75 100644 (file)
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -22,16 +22,15 @@
  * Contributed by Brad Parker ([email protected]).
  */
 
  * Contributed by Brad Parker ([email protected]).
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 


@@ -89,7 +88,7 @@ ipx_print(netdissect_options *ndo, const u_char *p, u_int length)
        ND_TCHECK(ipx->length);
        length = EXTRACT_16BITS(&ipx->length);
 
        ND_TCHECK(ipx->length);
        length = EXTRACT_16BITS(&ipx->length);
 

-       ipx_decode(ndo, ipx, (u_char *)ipx + ipxSize, length - ipxSize);
+       ipx_decode(ndo, ipx, p + ipxSize, length - ipxSize);

        return;
 trunc:
        ND_PRINT((ndo, "[|ipx %d]", length));
        return;
 trunc:
        ND_PRINT((ndo, "[|ipx %d]", length));


@@ -117,10 +116,10 @@ ipx_decode(netdissect_options *ndo, const struct ipxHdr *ipx, const u_char *data
        ND_PRINT((ndo, "ipx-ncp %d", length));
        break;
       case IPX_SKT_SAP:
        ND_PRINT((ndo, "ipx-ncp %d", length));
        break;
       case IPX_SKT_SAP:

-       ipx_sap_print(ndo, (u_short *)datap, length);
+       ipx_sap_print(ndo, (const u_short *)datap, length);

        break;
       case IPX_SKT_RIP:
        break;
       case IPX_SKT_RIP:

-       ipx_rip_print(ndo, (u_short *)datap, length);
+       ipx_rip_print(ndo, (const u_short *)datap, length);

        break;
       case IPX_SKT_NETBIOS:
        ND_PRINT((ndo, "ipx-netbios %d", length));
        break;
       case IPX_SKT_NETBIOS:
        ND_PRINT((ndo, "ipx-netbios %d", length));


@@ -165,7 +164,7 @@ ipx_sap_print(netdissect_options *ndo, const u_short *ipx, u_int length)
            ND_PRINT((ndo, "ipx-sap-nearest-req"));
 
        ND_TCHECK(ipx[0]);
            ND_PRINT((ndo, "ipx-sap-nearest-req"));
 
        ND_TCHECK(ipx[0]);

-       ND_PRINT((ndo, " %s", ipxsap_string(htons(EXTRACT_16BITS(&ipx[0])))));
+       ND_PRINT((ndo, " %s", ipxsap_string(ndo, htons(EXTRACT_16BITS(&ipx[0])))));

        break;
 
       case 2:
        break;
 
       case 2:


@@ -177,14 +176,14 @@ ipx_sap_print(netdissect_options *ndo, const u_short *ipx, u_int length)
 
        for (i = 0; i < 8 && length > 0; i++) {
            ND_TCHECK(ipx[0]);
 
        for (i = 0; i < 8 && length > 0; i++) {
            ND_TCHECK(ipx[0]);

-           ND_PRINT((ndo, " %s '", ipxsap_string(htons(EXTRACT_16BITS(&ipx[0])))));
-           if (fn_printzp(ndo, (u_char *)&ipx[1], 48, ndo->ndo_snapend)) {
+           ND_PRINT((ndo, " %s '", ipxsap_string(ndo, htons(EXTRACT_16BITS(&ipx[0])))));
+           if (fn_printzp(ndo, (const u_char *)&ipx[1], 48, ndo->ndo_snapend)) {

                ND_PRINT((ndo, "'"));
                goto trunc;
            }
            ND_TCHECK2(ipx[25], 10);
            ND_PRINT((ndo, "' addr %s",
                ND_PRINT((ndo, "'"));
                goto trunc;
            }
            ND_TCHECK2(ipx[25], 10);
            ND_PRINT((ndo, "' addr %s",

-               ipxaddr_string(EXTRACT_32BITS(&ipx[25]), (u_char *)&ipx[27])));
+               ipxaddr_string(EXTRACT_32BITS(&ipx[25]), (const u_char *)&ipx[27])));

            ipx += 32;
            length -= 64;
        }
            ipx += 32;
            length -= 64;
        }