X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/073489bc829384eb9a027783a0b7c236fe4c2c98..859d3eb8b99b36161e553d515d63de6b50c952f9:/print-udp.c diff --git a/print-udp.c b/print-udp.c index 46f66e9e..e289be61 100644 --- a/print-udp.c +++ b/print-udp.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.120 2003-08-06 06:49:40 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.121 2003-09-12 22:05:57 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -562,15 +562,12 @@ udp_print(register const u_char *bp, u_int length, break; case PT_AODV: - (void)printf("%s.%s > %s.%s: ", - ipaddr_string(&ip->ip_src), - udpport_string(sport), - ipaddr_string(&ip->ip_dst), - udpport_string(dport)); + udpipaddr_print(ip, sport, dport); + aodv_print((const u_char *)(up + 1), length, #ifdef INET6 - aodv_print((void *)(up + 1), length, (void *) ip6); + ip6 != NULL); #else - aodv_print((void *)(up + 1), length, NULL); + FALSE); #endif break; } @@ -651,10 +648,11 @@ udp_print(register const u_char *bp, u_int length, else if (ISPORT(RIP_PORT)) rip_print((const u_char *)(up + 1), length); else if (ISPORT(AODV_PORT)) + aodv_print((const u_char *)(up + 1), length, #ifdef INET6 - aodv_print((const u_char *)(up + 1), length, (void *) ip6); + ip6 != NULL); #else - aodv_print((const u_char *)(up + 1), length, NULL); + FALSE); #endif else if (ISPORT(ISAKMP_PORT)) isakmp_print((const u_char *)(up + 1), length, bp2);