bpf_dump.c moved to libpcap

[tcpdump] / print-icmp.c

diff --git a/print-icmp.c b/print-icmp.c
index 38c1fa8f58520f19c692fffdb364e607127830a1..2d846a966c967e62fe0b0fcbf543245679144fa5 100644 (file)
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.44 2000-01-17 06:24:25 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.47 2000-06-10 13:41:19 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -234,20 +234,20 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
                        break;
 
                case ICMP_UNREACH_NEEDFRAG:
-                       {
+                   {
                        register const struct mtu_discovery *mp;
-
                        mp = (struct mtu_discovery *)&dp->icmp_void;
                         mtu = EXTRACT_16BITS(&mp->nexthopmtu);
-                        if (mtu)
-                           (void)snprintf(buf, sizeof(buf),
-                               "%s unreachable - need to frag (mtu %d)",
-                               ipaddr_string(&dp->icmp_ip.ip_dst), mtu);
-                        else
-                           (void)snprintf(buf, sizeof(buf),
-                               "%s unreachable - need to frag",
-                               ipaddr_string(&dp->icmp_ip.ip_dst));
+                        if (mtu) {
+                               (void)snprintf(buf, sizeof(buf),
+                                   "%s unreachable - need to frag (mtu %d)",
+                                   ipaddr_string(&dp->icmp_ip.ip_dst), mtu);
+                        } else {
+                               (void)snprintf(buf, sizeof(buf),
+                                   "%s unreachable - need to frag",
+                                   ipaddr_string(&dp->icmp_ip.ip_dst));
                        }
+                   }
                        break;
 
                default:
@@ -269,12 +269,12 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
                break;
 
        case ICMP_ROUTERADVERT:
-               {
+           {
                register const struct ih_rdiscovery *ihp;
                register const struct id_rdiscovery *idp;
                u_int lifetime, num, size;
 
-               (void)strcpy(buf, "router advertisement");
+               (void)snprintf(buf, sizeof(buf), "router advertisement");
                cp = buf + strlen(buf);
 
                ihp = (struct ih_rdiscovery *)&dp->icmp_void;
@@ -282,18 +282,19 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
                (void)strncpy(cp, " lifetime ", sizeof(buf) - (cp - buf));
                cp = buf + strlen(buf);
                lifetime = EXTRACT_16BITS(&ihp->ird_lifetime);
-               if (lifetime < 60)
+               if (lifetime < 60) {
                        (void)snprintf(cp, sizeof(buf) - (cp - buf), "%u",
                            lifetime);
-               else if (lifetime < 60 * 60)
+               } else if (lifetime < 60 * 60) {
                        (void)snprintf(cp, sizeof(buf) - (cp - buf), "%u:%02u",
                            lifetime / 60, lifetime % 60);
-               else
+               } else {
                        (void)snprintf(cp, sizeof(buf) - (cp - buf),
                            "%u:%02u:%02u",
                            lifetime / 3600,
                            (lifetime % 3600) / 60,
                            lifetime % 60);
+               }
                cp = buf + strlen(buf);
 
                num = ihp->ird_addrnum;
@@ -313,8 +314,9 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
                            ipaddr_string(&idp->ird_addr),
                            EXTRACT_32BITS(&idp->ird_pref));
                        cp = buf + strlen(buf);
+                       ++idp;
                }
-               }
+           }
                break;
 
        case ICMP_TIMXCEED:
@@ -350,7 +352,24 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
        case ICMP_MASKREPLY:
                TCHECK(dp->icmp_mask);
                (void)snprintf(buf, sizeof(buf), "address mask is 0x%08x",
-                   (u_int32_t)ntohl(dp->icmp_mask));
+                   (unsigned)ntohl(dp->icmp_mask));
+               break;
+
+       case ICMP_TSTAMP:
+               TCHECK(dp->icmp_seq);
+               (void)sprintf(buf, "time stamp query id %u seq %u",
+                   (unsigned)ntohs(dp->icmp_id),
+                   (unsigned)ntohs(dp->icmp_seq));
+               break;
+
+       case ICMP_TSTAMPREPLY:
+               TCHECK(dp->icmp_ttime);
+               (void)sprintf(buf, "time stamp reply id %u seq %u : org 0x%lx recv 0x%lx xmit 0x%lx",
+                   (unsigned)ntohs(dp->icmp_id),
+                   (unsigned)ntohs(dp->icmp_seq),
+                   (unsigned long)ntohl(dp->icmp_otime),
+                   (unsigned long)ntohl(dp->icmp_rtime),
+                   (unsigned long)ntohl(dp->icmp_ttime));
                break;
 
        default: