X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0a427cd722f775d0371c9e8dc8b7a905a763d2bf..refs/pull/433/head:/print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 134a98cc..c3edf6ef 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -444,7 +444,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 
 		case PT_CNFP:
 			udpipaddr_print(ndo, ip, sport, dport);
-			cnfp_print(ndo, cp, (const u_char *)ip);
+			cnfp_print(ndo, cp);
 			break;
 
 		case PT_TFTP:
@@ -679,13 +679,14 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 			otv_print(ndo, (const u_char *)(up + 1), length);
                 else if (ISPORT(VXLAN_PORT))
 			vxlan_print(ndo, (const u_char *)(up + 1), length);
+                else if (ISPORT(GENEVE_PORT))
+			geneve_print(ndo, (const u_char *)(up + 1), length);
 		else {
 			if (ulen > length)
 				ND_PRINT((ndo, "UDP, bad length %u > %u",
 				    ulen, length));
 			else
-				ND_PRINT((ndo, "UDP, length %u",
-				    (uint32_t)(ulen - sizeof(*up))));
+				ND_PRINT((ndo, "UDP, length %u", ulen));
 		}
 #undef ISPORT
 	} else {
@@ -693,8 +694,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 			ND_PRINT((ndo, "UDP, bad length %u > %u",
 			    ulen, length));
 		else
-			ND_PRINT((ndo, "UDP, length %u",
-			    (uint32_t)(ulen - sizeof(*up))));
+			ND_PRINT((ndo, "UDP, length %u", ulen));
 	}
 }