Default to first interface from pcap_findalldevs()

[tcpdump] / print-ipx.c

diff --git a/print-ipx.c b/print-ipx.c
index b24bbd2be1f9d6796037d38befdac9540b29cea1..22e613e77e1253104a591072ba2e25a5a1900d75 100644 (file)
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -26,11 +26,11 @@
 #include "config.h"
 #endif
 
 #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"
 


@@ -164,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:


@@ -176,7 +176,7 @@ 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])))));
+           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;
            if (fn_printzp(ndo, (const u_char *)&ipx[1], 48, ndo->ndo_snapend)) {
                ND_PRINT((ndo, "'"));
                goto trunc;