add support for AS-PIC cookies

[tcpdump] / print-sunrpc.c

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 529bf36ab37d5c9124428848ab7e1e34ad49660c..ffedd91e1b78caca3d11c808ae12cb50637b5287 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -20,52 +20,47 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.30 2000-01-17 06:24:26 itojun Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.46.2.1 2005-04-27 21:44:06 guy Exp $ (LBL)";

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

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
+#include <tcpdump-stdinc.h>

 
 

+#ifdef HAVE_GETRPCBYNUMBER

 #include <rpc/rpc.h>
 #ifdef HAVE_RPC_RPCENT_H
 #include <rpc/rpcent.h>
 #include <rpc/rpc.h>
 #ifdef HAVE_RPC_RPCENT_H
 #include <rpc/rpcent.h>

-#endif
-#include <rpc/pmap_prot.h>
+#endif /* HAVE_RPC_RPCENT_H */
+#endif /* HAVE_GETRPCBYNUMBER */

 
 

-#include <ctype.h>
-#include <netdb.h>

 #include <stdio.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"
 #include <stdio.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"
+
+#include "ip.h"
+#ifdef INET6
+#include "ip6.h"
+#endif
+
+#include "rpc_auth.h"
+#include "rpc_msg.h"
+#include "pmap_prot.h"

 
 static struct tok proc2str[] = {
 
 static struct tok proc2str[] = {

-       { PMAPPROC_NULL,        "null" },
-       { PMAPPROC_SET,         "set" },
-       { PMAPPROC_UNSET,       "unset" },
-       { PMAPPROC_GETPORT,     "getport" },
-       { PMAPPROC_DUMP,        "dump" },
-       { PMAPPROC_CALLIT,      "call" },
-       { 0,                    NULL }
+       { SUNRPC_PMAPPROC_NULL,         "null" },
+       { SUNRPC_PMAPPROC_SET,          "set" },
+       { SUNRPC_PMAPPROC_UNSET,        "unset" },
+       { SUNRPC_PMAPPROC_GETPORT,      "getport" },
+       { SUNRPC_PMAPPROC_DUMP,         "dump" },
+       { SUNRPC_PMAPPROC_CALLIT,       "call" },
+       { 0,                            NULL }

 };
 
 /* Forwards */
 };
 
 /* Forwards */


@@ -75,44 +70,64 @@ void
 sunrpcrequest_print(register const u_char *bp, register u_int length,
                    register const u_char *bp2)
 {
 sunrpcrequest_print(register const u_char *bp, register u_int length,
                    register const u_char *bp2)
 {

-       register const struct rpc_msg *rp;
+       register const struct sunrpc_msg *rp;

        register const struct ip *ip;
        register const struct ip *ip;

+#ifdef INET6
+       register const struct ip6_hdr *ip6;
+#endif

        u_int32_t x;
        u_int32_t x;

+       char srcid[20], dstid[20];      /*fits 32bit*/
+
+       rp = (struct sunrpc_msg *)bp;
+
+       if (!nflag) {
+               snprintf(srcid, sizeof(srcid), "0x%x",
+                   EXTRACT_32BITS(&rp->rm_xid));
+               strlcpy(dstid, "sunrpc", sizeof(dstid));
+       } else {
+               snprintf(srcid, sizeof(srcid), "0x%x",
+                   EXTRACT_32BITS(&rp->rm_xid));
+               snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
+       }

 
 

-       rp = (struct rpc_msg *)bp;
-       ip = (struct ip *)bp2;
+       switch (IP_V((struct ip *)bp2)) {
+       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);
+               break;
+#ifdef INET6
+       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);
+               break;
+#endif
+       default:
+               printf("%s.%s > %s.%s: %d", "?", srcid, "?", dstid, length);
+               break;
+       }

 
 

-       if (!nflag)
-               (void)printf("%s.%x > %s.sunrpc: %d",
-                            ipaddr_string(&ip->ip_src),
-                            (u_int32_t)ntohl(rp->rm_xid),
-                            ipaddr_string(&ip->ip_dst),
-                            length);
-       else
-               (void)printf("%s.%x > %s.%x: %d",
-                            ipaddr_string(&ip->ip_src),
-                            (u_int32_t)ntohl(rp->rm_xid),
-                            ipaddr_string(&ip->ip_dst),
-                            PMAPPORT,
-                            length);

        printf(" %s", tok2str(proc2str, " proc #%u",
        printf(" %s", tok2str(proc2str, " proc #%u",

-           (u_int32_t)ntohl(rp->rm_call.cb_proc)));
-       x = ntohl(rp->rm_call.cb_rpcvers);
+           EXTRACT_32BITS(&rp->rm_call.cb_proc)));
+       x = EXTRACT_32BITS(&rp->rm_call.cb_rpcvers);

        if (x != 2)
                printf(" [rpcver %u]", x);
 
        if (x != 2)
                printf(" [rpcver %u]", x);
 

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

 
 

-       case PMAPPROC_SET:
-       case PMAPPROC_UNSET:
-       case PMAPPROC_GETPORT:
-       case PMAPPROC_CALLIT:
-               x = ntohl(rp->rm_call.cb_prog);
+       case SUNRPC_PMAPPROC_SET:
+       case SUNRPC_PMAPPROC_UNSET:
+       case SUNRPC_PMAPPROC_GETPORT:
+       case SUNRPC_PMAPPROC_CALLIT:
+               x = EXTRACT_32BITS(&rp->rm_call.cb_prog);

                if (!nflag)
                        printf(" %s", progstr(x));
                else
                        printf(" %u", x);
                if (!nflag)
                        printf(" %s", progstr(x));
                else
                        printf(" %u", x);

-               printf(".%u", (u_int32_t)ntohl(rp->rm_call.cb_vers));
+               printf(".%u", EXTRACT_32BITS(&rp->rm_call.cb_vers));

                break;
        }
 }
                break;
        }
 }


@@ -121,16 +136,22 @@ static char *
 progstr(prog)
        u_int32_t prog;
 {
 progstr(prog)
        u_int32_t prog;
 {

+#ifdef HAVE_GETRPCBYNUMBER

        register struct rpcent *rp;
        register struct rpcent *rp;

+#endif

        static char buf[32];
        static char buf[32];

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

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

+#ifdef HAVE_GETRPCBYNUMBER

        rp = getrpcbynumber(prog);
        if (rp == NULL)
        rp = getrpcbynumber(prog);
        if (rp == NULL)

+#endif

                (void) snprintf(buf, sizeof(buf), "#%u", prog);
                (void) snprintf(buf, sizeof(buf), "#%u", prog);

+#ifdef HAVE_GETRPCBYNUMBER

        else
        else

-               strcpy(buf, rp->r_name);
+               strlcpy(buf, rp->r_name, sizeof(buf));
+#endif

        return (buf);
 }
        return (buf);
 }