Improve printout of DHCPv6 options.

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 27441c25eae16a69eb87f2d09494e862b0b59905..d71e4d3abd11840596b4ba15d3a299f2ac7cf6d7 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.129 2003-11-19 00:19:56 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.142 2007-08-08 17:20:58 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -33,9 +33,6 @@ static const char rcsid[] _U_ =
 #ifdef SEGSIZE
 #undef SEGSIZE
 #endif
 #ifdef SEGSIZE
 #undef SEGSIZE
 #endif

-#include <arpa/tftp.h>
-
-#include <rpc/rpc.h>

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


@@ -52,6 +49,8 @@ static const char rcsid[] _U_ =
 #include "ip6.h"
 #endif
 #include "ipproto.h"
 #include "ip6.h"
 #endif
 #include "ipproto.h"

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

 
 #include "nameser.h"
 #include "nfs.h"
 
 #include "nameser.h"
 #include "nfs.h"


@@ -468,8 +467,8 @@ udp_print(register const u_char *bp, u_int length,
                return;
        }
        if (packettype) {
                return;
        }
        if (packettype) {

-               register struct rpc_msg *rp;
-               enum msg_type direction;
+               register struct sunrpc_msg *rp;
+               enum sunrpc_msg_type direction;

 
                switch (packettype) {
 
 
                switch (packettype) {
 


@@ -484,9 +483,9 @@ udp_print(register const u_char *bp, u_int length,
                        break;
 
                case PT_RPC:
                        break;
 
                case PT_RPC:

-                       rp = (struct rpc_msg *)(up + 1);
-                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);
-                       if (direction == CALL)
+                       rp = (struct sunrpc_msg *)(up + 1);
+                       direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+                       if (direction == SUNRPC_CALL)

                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);
                        else
                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);
                        else


@@ -526,7 +525,7 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
 #ifdef INET6
                            ip6 != NULL);
 #else

-                           FALSE);
+                           0);

 #endif
                        break;
                }
 #endif
                        break;
                }


@@ -534,24 +533,24 @@ udp_print(register const u_char *bp, u_int length,
        }
 
        if (!qflag) {
        }
 
        if (!qflag) {

-               register struct rpc_msg *rp;
-               enum msg_type direction;
+               register struct sunrpc_msg *rp;
+               enum sunrpc_msg_type direction;

 
 

-               rp = (struct rpc_msg *)(up + 1);
+               rp = (struct sunrpc_msg *)(up + 1);

                if (TTEST(rp->rm_direction)) {
                if (TTEST(rp->rm_direction)) {

-                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);
-                       if (dport == NFS_PORT && direction == CALL) {
+                       direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+                       if (dport == NFS_PORT && direction == SUNRPC_CALL) {

                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }

-                       if (sport == NFS_PORT && direction == REPLY) {
+                       if (sport == NFS_PORT && direction == SUNRPC_REPLY) {

                                nfsreply_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
 #ifdef notdef
                                nfsreply_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
 #ifdef notdef

-                       if (dport == SUNRPC_PORT && direction == CALL) {
+                       if (dport == SUNRPC_PORT && direction == SUNRPC_CALL) {

                                sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
                                return;
                        }
                                sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
                                return;
                        }


@@ -568,7 +567,7 @@ udp_print(register const u_char *bp, u_int length,
        }
        udpipaddr_print(ip, sport, dport);
 
        }
        udpipaddr_print(ip, sport, dport);
 

-       if (IP_V(ip) == 4 && vflag && !fragmented) {
+       if (IP_V(ip) == 4 && (vflag > 1) && !Kflag && !fragmented) {

                int sum = up->uh_sum;
                if (sum == 0) {
                        (void)printf("[no cksum] ");
                int sum = up->uh_sum;
                if (sum == 0) {
                        (void)printf("[no cksum] ");


@@ -581,7 +580,7 @@ udp_print(register const u_char *bp, u_int length,
                }
        }
 #ifdef INET6
                }
        }
 #ifdef INET6

-       if (IP_V(ip) == 6 && ip6->ip6_plen && vflag && !fragmented) {
+       if (IP_V(ip) == 6 && ip6->ip6_plen && vflag && !Kflag && !fragmented) {

                int sum = up->uh_sum;
                /* for IPv6, UDP checksum is mandatory */
                if (TTEST2(cp[0], length)) {
                int sum = up->uh_sum;
                /* for IPv6, UDP checksum is mandatory */
                if (TTEST2(cp[0], length)) {


@@ -613,13 +612,15 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
 #ifdef INET6
                            ip6 != NULL);
 #else

-                           FALSE);
+                           0);

 #endif
 #endif

-               else if (ISPORT(ISAKMP_PORT))
-                       isakmp_print((const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT))
+                        isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT_NATT))
+                        isakmp_rfc3948_print(gndo, (const u_char *)(up + 1), length, bp2);

 #if 1 /*???*/
 #if 1 /*???*/

-               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
-                       isakmp_print((const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
+                       isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);

 #endif
                else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
                        snmp_print((const u_char *)(up + 1), length);
 #endif
                else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
                        snmp_print((const u_char *)(up + 1), length);


@@ -670,17 +671,49 @@ udp_print(register const u_char *bp, u_int length,
                        hsrp_print((const u_char *)(up + 1), length);
                else if (ISPORT(LWRES_PORT))
                        lwres_print((const u_char *)(up + 1), length);
                        hsrp_print((const u_char *)(up + 1), length);
                else if (ISPORT(LWRES_PORT))
                        lwres_print((const u_char *)(up + 1), length);

-                else if (ISPORT(LDP_PORT))
+               else if (ISPORT(LDP_PORT))

                        ldp_print((const u_char *)(up + 1), length);
                        ldp_print((const u_char *)(up + 1), length);

-                else if (ISPORT(MPLS_LSP_PING_PORT))
-                       mpls_lsp_ping_print((const u_char *)(up + 1), length);
+               else if (ISPORT(OLSR_PORT))
+                       olsr_print((const u_char *)(up + 1), length,
+#if INET6
+                                       (IP_V(ip) == 6) ? 1 : 0);
+#else
+                                       0);
+#endif
+               else if (ISPORT(MPLS_LSP_PING_PORT))
+                       lspping_print((const u_char *)(up + 1), length);

                else if (dport == BFD_CONTROL_PORT ||
                         dport == BFD_ECHO_PORT )
                        bfd_print((const u_char *)(up+1), length, dport);
                else if (dport == BFD_CONTROL_PORT ||
                         dport == BFD_ECHO_PORT )
                        bfd_print((const u_char *)(up+1), length, dport);

+                else if (ISPORT(LMP_PORT))
+                       lmp_print((const u_char *)(up + 1), length);
+               else if (ISPORT(VQP_PORT))
+                       vqp_print((const u_char *)(up + 1), length);
+                else if (ISPORT(SFLOW_PORT))
+                        sflow_print((const u_char *)(up + 1), length);
+               else if (dport == LWAPP_CONTROL_PORT)
+                       lwapp_control_print((const u_char *)(up + 1), length, 1);
+                else if (sport == LWAPP_CONTROL_PORT)
+                        lwapp_control_print((const u_char *)(up + 1), length, 0);
+                else if (ISPORT(LWAPP_DATA_PORT))
+                        lwapp_data_print((const u_char *)(up + 1), length);
+                else if (ISPORT(SIP_PORT))
+                       sip_print((const u_char *)(up + 1), length);
+                else if (ISPORT(SYSLOG_PORT))
+                       syslog_print((const u_char *)(up + 1), length);

                else
                else

-                       (void)printf("UDP, length: %u",
+                       (void)printf("UDP, length %u",

                            (u_int32_t)(ulen - sizeof(*up)));
 #undef ISPORT
        } else
                            (u_int32_t)(ulen - sizeof(*up)));
 #undef ISPORT
        } else

-               (void)printf("UDP, length: %u", (u_int32_t)(ulen - sizeof(*up)));
+               (void)printf("UDP, length %u", (u_int32_t)(ulen - sizeof(*up)));

 }
 }

+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
+