Default to first interface from pcap_findalldevs()

[tcpdump] / print-sunrpc.c

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 4652e8f21b55d30a57fe3be8e8e5331ff2ae33df..2394dd03320cd8039e486ebc68c02ceea6c557b3 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.47 2005-04-27 21:43:48 guy Exp $ (LBL)";
-#endif
-

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


@@ -43,7 +38,7 @@ static const char rcsid[] _U_ =
  */
 #undef _XOPEN_SOURCE_EXTENDED
 
  */
 #undef _XOPEN_SOURCE_EXTENDED
 

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

 
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
 #include <rpc/rpc.h>
 
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
 #include <rpc/rpc.h>


@@ -55,14 +50,12 @@ static const char rcsid[] _U_ =
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

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

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

-#ifdef INET6

 #include "ip6.h"
 #include "ip6.h"

-#endif

 
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 
 #include "rpc_auth.h"
 #include "rpc_msg.h"


@@ -137,23 +130,23 @@ static const char rcsid[] _U_ =
  * The service supports remote procedure calls on udp/ip or tcp/ip socket 111.
  */
 
  * The service supports remote procedure calls on udp/ip or tcp/ip socket 111.
  */
 

-#define SUNRPC_PMAPPORT                ((u_int16_t)111)
-#define SUNRPC_PMAPPROG                ((u_int32_t)100000)
-#define SUNRPC_PMAPVERS                ((u_int32_t)2)
-#define SUNRPC_PMAPVERS_PROTO  ((u_int32_t)2)
-#define SUNRPC_PMAPVERS_ORIG   ((u_int32_t)1)
-#define SUNRPC_PMAPPROC_NULL   ((u_int32_t)0)
-#define SUNRPC_PMAPPROC_SET    ((u_int32_t)1)
-#define SUNRPC_PMAPPROC_UNSET  ((u_int32_t)2)
-#define SUNRPC_PMAPPROC_GETPORT        ((u_int32_t)3)
-#define SUNRPC_PMAPPROC_DUMP   ((u_int32_t)4)
-#define SUNRPC_PMAPPROC_CALLIT ((u_int32_t)5)
+#define SUNRPC_PMAPPORT                ((uint16_t)111)
+#define SUNRPC_PMAPPROG                ((uint32_t)100000)
+#define SUNRPC_PMAPVERS                ((uint32_t)2)
+#define SUNRPC_PMAPVERS_PROTO  ((uint32_t)2)
+#define SUNRPC_PMAPVERS_ORIG   ((uint32_t)1)
+#define SUNRPC_PMAPPROC_NULL   ((uint32_t)0)
+#define SUNRPC_PMAPPROC_SET    ((uint32_t)1)
+#define SUNRPC_PMAPPROC_UNSET  ((uint32_t)2)
+#define SUNRPC_PMAPPROC_GETPORT        ((uint32_t)3)
+#define SUNRPC_PMAPPROC_DUMP   ((uint32_t)4)
+#define SUNRPC_PMAPPROC_CALLIT ((uint32_t)5)

 
 struct sunrpc_pmap {
 
 struct sunrpc_pmap {

-       u_int32_t pm_prog;
-       u_int32_t pm_vers;
-       u_int32_t pm_prot;
-       u_int32_t pm_port;
+       uint32_t pm_prog;
+       uint32_t pm_vers;
+       uint32_t pm_prot;
+       uint32_t pm_port;

 };
 
 static const struct tok proc2str[] = {
 };
 
 static const struct tok proc2str[] = {


@@ -167,23 +160,21 @@ static const struct tok proc2str[] = {
 };
 
 /* Forwards */
 };
 
 /* Forwards */

-static char *progstr(u_int32_t);
+static char *progstr(uint32_t);

 
 void
 
 void

-sunrpcrequest_print(register const u_char *bp, register u_int length,
-                   register const u_char *bp2)
+sunrpcrequest_print(netdissect_options *ndo, register const u_char *bp,
+                    register u_int length, register const u_char *bp2)

 {
        register const struct sunrpc_msg *rp;
        register const struct ip *ip;
 {
        register const struct sunrpc_msg *rp;
        register const struct ip *ip;

-#ifdef INET6

        register const struct ip6_hdr *ip6;
        register const struct ip6_hdr *ip6;

-#endif
-       u_int32_t x;
+       uint32_t x;

        char srcid[20], dstid[20];      /*fits 32bit*/
 
        char srcid[20], dstid[20];      /*fits 32bit*/
 

-       rp = (struct sunrpc_msg *)bp;
+       rp = (const struct sunrpc_msg *)bp;

 
 

-       if (!nflag) {
+       if (!ndo->ndo_nflag) {

                snprintf(srcid, sizeof(srcid), "0x%x",
                    EXTRACT_32BITS(&rp->rm_xid));
                strlcpy(dstid, "sunrpc", sizeof(dstid));
                snprintf(srcid, sizeof(srcid), "0x%x",
                    EXTRACT_32BITS(&rp->rm_xid));
                strlcpy(dstid, "sunrpc", sizeof(dstid));


@@ -193,31 +184,29 @@ sunrpcrequest_print(register const u_char *bp, register u_int length,
                snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
        }
 
                snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
        }
 

-       switch (IP_V((struct ip *)bp2)) {
+       switch (IP_V((const struct ip *)bp2)) {

        case 4:
        case 4:

-               ip = (struct ip *)bp2;
-               printf("%s.%s > %s.%s: %d",
-                   ipaddr_string(&ip->ip_src), srcid,
-                   ipaddr_string(&ip->ip_dst), dstid, length);
+               ip = (const struct ip *)bp2;
+               ND_PRINT((ndo, "%s.%s > %s.%s: %d",
+                   ipaddr_string(ndo, &ip->ip_src), srcid,
+                   ipaddr_string(ndo, &ip->ip_dst), dstid, length));

                break;
                break;

-#ifdef INET6

        case 6:
        case 6:

-               ip6 = (struct ip6_hdr *)bp2;
-               printf("%s.%s > %s.%s: %d",
-                   ip6addr_string(&ip6->ip6_src), srcid,
-                   ip6addr_string(&ip6->ip6_dst), dstid, length);
+               ip6 = (const struct ip6_hdr *)bp2;
+               ND_PRINT((ndo, "%s.%s > %s.%s: %d",
+                   ip6addr_string(ndo, &ip6->ip6_src), srcid,
+                   ip6addr_string(ndo, &ip6->ip6_dst), dstid, length));

                break;
                break;

-#endif

        default:
        default:

-               printf("%s.%s > %s.%s: %d", "?", srcid, "?", dstid, length);
+               ND_PRINT((ndo, "%s.%s > %s.%s: %d", "?", srcid, "?", dstid, length));

                break;
        }
 
                break;
        }
 

-       printf(" %s", tok2str(proc2str, " proc #%u",
-           EXTRACT_32BITS(&rp->rm_call.cb_proc)));
+       ND_PRINT((ndo, " %s", tok2str(proc2str, " proc #%u",
+           EXTRACT_32BITS(&rp->rm_call.cb_proc))));

        x = EXTRACT_32BITS(&rp->rm_call.cb_rpcvers);
        if (x != 2)
        x = EXTRACT_32BITS(&rp->rm_call.cb_rpcvers);
        if (x != 2)

-               printf(" [rpcver %u]", x);
+               ND_PRINT((ndo, " [rpcver %u]", x));

 
        switch (EXTRACT_32BITS(&rp->rm_call.cb_proc)) {
 
 
        switch (EXTRACT_32BITS(&rp->rm_call.cb_proc)) {
 


@@ -226,24 +215,23 @@ sunrpcrequest_print(register const u_char *bp, register u_int length,
        case SUNRPC_PMAPPROC_GETPORT:
        case SUNRPC_PMAPPROC_CALLIT:
                x = EXTRACT_32BITS(&rp->rm_call.cb_prog);
        case SUNRPC_PMAPPROC_GETPORT:
        case SUNRPC_PMAPPROC_CALLIT:
                x = EXTRACT_32BITS(&rp->rm_call.cb_prog);

-               if (!nflag)
-                       printf(" %s", progstr(x));
+               if (!ndo->ndo_nflag)
+                       ND_PRINT((ndo, " %s", progstr(x)));

                else
                else

-                       printf(" %u", x);
-               printf(".%u", EXTRACT_32BITS(&rp->rm_call.cb_vers));
+                       ND_PRINT((ndo, " %u", x));
+               ND_PRINT((ndo, ".%u", EXTRACT_32BITS(&rp->rm_call.cb_vers)));

                break;
        }
 }
 
 static char *
                break;
        }
 }
 
 static char *

-progstr(prog)
-       u_int32_t prog;
+progstr(uint32_t prog)

 {
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
        register struct rpcent *rp;
 #endif
        static char buf[32];
 {
 #if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
        register struct rpcent *rp;
 #endif
        static char buf[32];

-       static u_int32_t lastprog = 0;
+       static uint32_t lastprog = 0;

 
        if (lastprog != 0 && prog == lastprog)
                return (buf);
 
        if (lastprog != 0 && prog == lastprog)
                return (buf);