Fix some "unsigned int" vs. "size_t" issues (they're not necessarily the

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 3a8d10002de72086bdcb3063b5d59ec7edfccd10..e8239fc1ecbb856b127eead99acc8ff443774235 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.135 2004-12-27 00:41:32 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.139 2006-03-03 22:31:16 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -526,7 +526,7 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
-                           FALSE);
+                           0);
 #endif
                        break;
                }
@@ -613,13 +613,15 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
-                           FALSE);
+                           0);
 #endif
-               else if (ISPORT(ISAKMP_PORT))
-                       isakmp_print((const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT))
+                        isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT_NATT))
+                        isakmp_rfc3948_print(gndo, (const u_char *)(up + 1), length, bp2);
 #if 1 /*???*/
-               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
-                       isakmp_print((const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
+                       isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);
 #endif
                else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
                        snmp_print((const u_char *)(up + 1), length);
@@ -679,6 +681,8 @@ udp_print(register const u_char *bp, u_int length,
                        bfd_print((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))
+                       vqp_print((const u_char *)(up + 1), length);
                 else if (ISPORT(SIP_PORT))
                        sip_print((const u_char *)(up + 1), length);
                 else if (ISPORT(SYSLOG_PORT))
@@ -690,3 +694,12 @@ udp_print(register const u_char *bp, u_int length,
        } else
                (void)printf("UDP, length %u", (u_int32_t)(ulen - sizeof(*up)));
 }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
+