Fix some compiler warnings from the previous checkin.

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 885d42e4da0c201e1bafa0bdba38d99147cf6de5..fb56be58aab688881f81004ebbb9d1b7bf08283b 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -469,6 +469,22 @@ udp_print(register const u_char *bp, u_int length,
                            0);
 #endif
                        break;
                            0);
 #endif
                        break;

+
+               case PT_RADIUS:
+                       udpipaddr_print(ip, sport, dport);
+                       radius_print(cp, length);
+                       break;
+
+               case PT_VXLAN:
+                       udpipaddr_print(ip, sport, dport);
+                       vxlan_print((const u_char *)(up + 1), length);
+                       break;
+
+               case PT_PGM:
+               case PT_PGM_ZMTP1:
+                       udpipaddr_print(ip, sport, dport);
+                       pgm_print(cp, length, bp2);
+                       break;

                }
                return;
        }
                }
                return;
        }


@@ -592,7 +608,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 (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);
                        vat_print((const void *)(up + 1), up);
                else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
                        zephyr_print((const void *)(up + 1), length);


@@ -615,7 +631,7 @@ udp_print(register const u_char *bp, u_int length,
                /*
                 * Kludge in test for whiteboard packets.
                 */
                /*
                 * 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);
                        wb_print((const void *)(up + 1), length);
                else if (ISPORT(CISCO_AUTORP_PORT))
                        cisco_autorp_print((const void *)(up + 1), length);


@@ -658,6 +674,8 @@ udp_print(register const u_char *bp, u_int length,
                        sip_print((const u_char *)(up + 1), length);
                 else if (ISPORT(SYSLOG_PORT))
                        syslog_print((const u_char *)(up + 1), length);
                        sip_print((const u_char *)(up + 1), 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);

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