X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/40f7c8d61c4edc8f5895d58bc7f5836f50068dd0..ce1fc8263da72437c1df54b8b3ee682413d9e6ed:/print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 5d985b85..f52de035 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.142 2007-08-08 17:20:58 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -286,16 +281,16 @@ static int udp_cksum(register const struct ip *ip,
 		     register const struct udphdr *up,
 		     register u_int len)
 {
-	return (nextproto4_cksum(ip, (const u_int8_t *)(void *)up, len,
-	    IPPROTO_UDP));
+	return nextproto4_cksum(ip, (const u_int8_t *)(void *)up, len, len,
+				IPPROTO_UDP);
 }
 
 #ifdef INET6
 static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
 	u_int len)
 {
-	return (nextproto6_cksum(ip6, (const u_int8_t *)(void *)up, len,
-	    IPPROTO_UDP));
+	return nextproto6_cksum(ip6, (const u_int8_t *)(void *)up, len, len,
+	    IPPROTO_UDP);
 }
 #endif
 
@@ -477,7 +472,7 @@ udp_print(register const u_char *bp, u_int length,
 
 		case PT_VXLAN:
 			udpipaddr_print(ip, sport, dport);
-			vxlan_print((const u_char *)(up + 1), length);
+			vxlan_print(gndo, (const u_char *)(up + 1), length);
 			break;
 
 		case PT_PGM:
@@ -493,6 +488,7 @@ udp_print(register const u_char *bp, u_int length,
 		return;
 	}
 
+	udpipaddr_print(ip, sport, dport);
 	if (!qflag) {
 		register struct sunrpc_msg *rp;
 		enum sunrpc_msg_type direction;
@@ -501,12 +497,14 @@ udp_print(register const u_char *bp, u_int length,
 		if (TTEST(rp->rm_direction)) {
 			direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
 			if (dport == NFS_PORT && direction == SUNRPC_CALL) {
-				nfsreq_print((u_char *)rp, length,
+				(void)printf("NFS request xid %u ", EXTRACT_32BITS(&rp->rm_xid));
+				nfsreq_print_noaddr((u_char *)rp, length,
 				    (u_char *)ip);
 				return;
 			}
 			if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
-				nfsreply_print((u_char *)rp, length,
+				(void)printf("NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid));
+				nfsreply_print_noaddr((u_char *)rp, length,
 				    (u_char *)ip);
 				return;
 			}
@@ -526,7 +524,6 @@ udp_print(register const u_char *bp, u_int length,
 			return;
 		}
 	}
-	udpipaddr_print(ip, sport, dport);
 
 	if (vflag && !Kflag && !fragmented) {
                 /* Check the checksum, if possible. */
@@ -630,7 +627,7 @@ udp_print(register const u_char *bp, u_int length,
 		else if (ISPORT(DHCP6_SERV_PORT) || ISPORT(DHCP6_CLI_PORT))
 			dhcp6_print((const u_char *)(up + 1), length);
 		else if (ISPORT(AHCP_PORT))
-			ahcp_print((const u_char *)(up + 1), length);
+			ahcp_print(gndo, (const u_char *)(up + 1), length);
 		else if (ISPORT(BABEL_PORT) || ISPORT(BABEL_PORT_OLD))
 			babel_print((const u_char *)(up + 1), length);
 #endif /*INET6*/
@@ -647,7 +644,7 @@ udp_print(register const u_char *bp, u_int length,
 			 ISPORT(RADIUS_NEW_ACCOUNTING_PORT) )
 			radius_print((const u_char *)(up+1), length);
 		else if (dport == HSRP_PORT)
-			hsrp_print((const u_char *)(up + 1), length);
+			hsrp_print(gndo, (const u_char *)(up + 1), length);
 		else if (ISPORT(LWRES_PORT))
 			lwres_print((const u_char *)(up + 1), length);
 		else if (ISPORT(LDP_PORT))
@@ -663,7 +660,7 @@ udp_print(register const u_char *bp, u_int length,
 			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);
+			bfd_print(gndo, (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))
@@ -681,9 +678,9 @@ udp_print(register const u_char *bp, u_int length,
                 else if (ISPORT(SYSLOG_PORT))
 			syslog_print((const u_char *)(up + 1), length);
                 else if (ISPORT(OTV_PORT))
-			otv_print((const u_char *)(up + 1), length);
+			otv_print(gndo, (const u_char *)(up + 1), length);
                 else if (ISPORT(VXLAN_PORT))
-			vxlan_print((const u_char *)(up + 1), length);
+			vxlan_print(gndo, (const u_char *)(up + 1), length);
 		else
 			(void)printf("UDP, length %u",
 			    (u_int32_t)(ulen - sizeof(*up)));