More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 6e0c99bb192852ff0d6b20bbea2c96faa996eb41..babdf7c2593f26b5b1a44cf4ef34adb50c98f5b4 100644 (file)
--- 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
@@ -485,6 +480,10 @@ udp_print(register const u_char *bp, u_int length,
                        udpipaddr_print(ip, sport, dport);
                        pgm_print(cp, length, bp2);
                        break;
+               case PT_LMP:
+                       udpipaddr_print(ip, sport, dport);
+                       lmp_print(cp, length);
+                       break;
                }
                return;
        }
@@ -608,7 +607,7 @@ udp_print(register const u_char *bp, u_int length,
                else if (ISPORT(NETBIOS_DGRAM_PORT))
                        nbt_udp138_print((const u_char *)(up + 1), length);
 #endif
-               else if (dport == 3456)
+               else if (dport == VAT_PORT)
                        vat_print((const void *)(up + 1), up);
                else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
                        zephyr_print((const void *)(up + 1), length);
@@ -625,13 +624,15 @@ udp_print(register const u_char *bp, u_int length,
                        ripng_print((const u_char *)(up + 1), 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);
                else if (ISPORT(BABEL_PORT) || ISPORT(BABEL_PORT_OLD))
                        babel_print((const u_char *)(up + 1), length);
 #endif /*INET6*/
                /*
                 * Kludge in test for whiteboard packets.
                 */
-               else if (dport == 4567)
+               else if (dport == WB_PORT)
                        wb_print((const void *)(up + 1), length);
                else if (ISPORT(CISCO_AUTORP_PORT))
                        cisco_autorp_print((const void *)(up + 1), length);
@@ -676,6 +677,8 @@ udp_print(register const u_char *bp, u_int length,
                        syslog_print((const u_char *)(up + 1), length);
                 else if (ISPORT(OTV_PORT))
                        otv_print((const u_char *)(up + 1), length);
+                else if (ISPORT(VXLAN_PORT))
+                       vxlan_print((const u_char *)(up + 1), length);
                else
                        (void)printf("UDP, length %u",
                            (u_int32_t)(ulen - sizeof(*up)));