s/sprintf/snprintf/.

[tcpdump] / print-icmp.c

diff --git a/print-icmp.c b/print-icmp.c
index 5e50f3accd19ab82d59a27f5d402e481d239f456..38c1fa8f58520f19c692fffdb364e607127830a1 100644 (file)
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -21,7 +21,11 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.40 1999-10-30 05:11:13 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.44 2000-01-17 06:24:25 itojun Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"

 #endif
 
 #include <sys/param.h>
 #endif
 
 #include <sys/param.h>


@@ -162,7 +166,7 @@ struct id_rdiscovery {
 };
 
 void
 };
 
 void

-icmp_print(register const u_char *bp, register const u_char *bp2)
+icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)

 {
        register char *cp;
        register const struct icmp *dp;
 {
        register char *cp;
        register const struct icmp *dp;


@@ -192,9 +196,10 @@ icmp_print(register const u_char *bp, register const u_char *bp2)
 
                case ICMP_UNREACH_PROTOCOL:
                        TCHECK(dp->icmp_ip.ip_p);
 
                case ICMP_UNREACH_PROTOCOL:
                        TCHECK(dp->icmp_ip.ip_p);

-                       (void)sprintf(buf, "%s protocol %d unreachable",
-                                      ipaddr_string(&dp->icmp_ip.ip_dst),
-                                      dp->icmp_ip.ip_p);
+                       (void)snprintf(buf, sizeof(buf),
+                           "%s protocol %d unreachable",
+                           ipaddr_string(&dp->icmp_ip.ip_dst),
+                           dp->icmp_ip.ip_p);

                        break;
 
                case ICMP_UNREACH_PORT:
                        break;
 
                case ICMP_UNREACH_PORT:


@@ -206,21 +211,21 @@ icmp_print(register const u_char *bp, register const u_char *bp2)
                        switch (oip->ip_p) {
 
                        case IPPROTO_TCP:
                        switch (oip->ip_p) {
 
                        case IPPROTO_TCP:

-                               (void)sprintf(buf,
+                               (void)snprintf(buf, sizeof(buf),

                                        "%s tcp port %s unreachable",
                                        ipaddr_string(&oip->ip_dst),
                                        tcpport_string(dport));
                                break;
 
                        case IPPROTO_UDP:
                                        "%s tcp port %s unreachable",
                                        ipaddr_string(&oip->ip_dst),
                                        tcpport_string(dport));
                                break;
 
                        case IPPROTO_UDP:

-                               (void)sprintf(buf,
+                               (void)snprintf(buf, sizeof(buf),

                                        "%s udp port %s unreachable",
                                        ipaddr_string(&oip->ip_dst),
                                        udpport_string(dport));
                                break;
 
                        default:
                                        "%s udp port %s unreachable",
                                        ipaddr_string(&oip->ip_dst),
                                        udpport_string(dport));
                                break;
 
                        default:

-                               (void)sprintf(buf,
+                               (void)snprintf(buf, sizeof(buf),

                                        "%s protocol %d port %d unreachable",
                                        ipaddr_string(&oip->ip_dst),
                                        oip->ip_p, dport);
                                        "%s protocol %d port %d unreachable",
                                        ipaddr_string(&oip->ip_dst),
                                        oip->ip_p, dport);


@@ -235,11 +240,11 @@ icmp_print(register const u_char *bp, register const u_char *bp2)
                        mp = (struct mtu_discovery *)&dp->icmp_void;
                         mtu = EXTRACT_16BITS(&mp->nexthopmtu);
                         if (mtu)
                        mp = (struct mtu_discovery *)&dp->icmp_void;
                         mtu = EXTRACT_16BITS(&mp->nexthopmtu);
                         if (mtu)

-                           (void)sprintf(buf,
+                           (void)snprintf(buf, sizeof(buf),

                                "%s unreachable - need to frag (mtu %d)",
                                ipaddr_string(&dp->icmp_ip.ip_dst), mtu);
                         else
                                "%s unreachable - need to frag (mtu %d)",
                                ipaddr_string(&dp->icmp_ip.ip_dst), mtu);
                         else

-                           (void)sprintf(buf,
+                           (void)snprintf(buf, sizeof(buf),

                                "%s unreachable - need to frag",
                                ipaddr_string(&dp->icmp_ip.ip_dst));
                        }
                                "%s unreachable - need to frag",
                                ipaddr_string(&dp->icmp_ip.ip_dst));
                        }


@@ -248,7 +253,7 @@ icmp_print(register const u_char *bp, register const u_char *bp2)
                default:
                        fmt = tok2str(unreach2str, "#%d %%s unreachable",
                            dp->icmp_code);
                default:
                        fmt = tok2str(unreach2str, "#%d %%s unreachable",
                            dp->icmp_code);

-                       (void)sprintf(buf, fmt,
+                       (void)snprintf(buf, sizeof(buf), fmt,

                            ipaddr_string(&dp->icmp_ip.ip_dst));
                        break;
                }
                            ipaddr_string(&dp->icmp_ip.ip_dst));
                        break;
                }


@@ -258,7 +263,7 @@ icmp_print(register const u_char *bp, register const u_char *bp2)
                TCHECK(dp->icmp_ip.ip_dst);
                fmt = tok2str(type2str, "redirect-#%d %%s to net %%s",
                    dp->icmp_code);
                TCHECK(dp->icmp_ip.ip_dst);
                fmt = tok2str(type2str, "redirect-#%d %%s to net %%s",
                    dp->icmp_code);

-               (void)sprintf(buf, fmt,
+               (void)snprintf(buf, sizeof(buf), fmt,

                    ipaddr_string(&dp->icmp_ip.ip_dst),
                    ipaddr_string(&dp->icmp_gwaddr));
                break;
                    ipaddr_string(&dp->icmp_ip.ip_dst),
                    ipaddr_string(&dp->icmp_gwaddr));
                break;


@@ -274,34 +279,37 @@ icmp_print(register const u_char *bp, register const u_char *bp2)
 
                ihp = (struct ih_rdiscovery *)&dp->icmp_void;
                TCHECK(*ihp);
 
                ihp = (struct ih_rdiscovery *)&dp->icmp_void;
                TCHECK(*ihp);

-               (void)strcpy(cp, " lifetime ");
+               (void)strncpy(cp, " lifetime ", sizeof(buf) - (cp - buf));

                cp = buf + strlen(buf);
                lifetime = EXTRACT_16BITS(&ihp->ird_lifetime);
                if (lifetime < 60)
                cp = buf + strlen(buf);
                lifetime = EXTRACT_16BITS(&ihp->ird_lifetime);
                if (lifetime < 60)

-                       (void)sprintf(cp, "%u", lifetime);
+                       (void)snprintf(cp, sizeof(buf) - (cp - buf), "%u",
+                           lifetime);

                else if (lifetime < 60 * 60)
                else if (lifetime < 60 * 60)

-                       (void)sprintf(cp, "%u:%02u",
+                       (void)snprintf(cp, sizeof(buf) - (cp - buf), "%u:%02u",

                            lifetime / 60, lifetime % 60);
                else
                            lifetime / 60, lifetime % 60);
                else

-                       (void)sprintf(cp, "%u:%02u:%02u",
+                       (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;
                            lifetime / 3600,
                            (lifetime % 3600) / 60,
                            lifetime % 60);
                cp = buf + strlen(buf);
 
                num = ihp->ird_addrnum;

-               (void)sprintf(cp, " %d:", num);
+               (void)snprintf(cp, sizeof(buf) - (cp - buf), " %d:", num);

                cp = buf + strlen(buf);
 
                size = ihp->ird_addrsiz;
                if (size != 2) {
                cp = buf + strlen(buf);
 
                size = ihp->ird_addrsiz;
                if (size != 2) {

-                       (void)sprintf(cp, " [size %d]", size);
+                       (void)snprintf(cp, sizeof(buf) - (cp - buf),
+                           " [size %d]", size);

                        break;
                }
                idp = (struct id_rdiscovery *)&dp->icmp_data;
                while (num-- > 0) {
                        TCHECK(*idp);
                        break;
                }
                idp = (struct id_rdiscovery *)&dp->icmp_data;
                while (num-- > 0) {
                        TCHECK(*idp);

-                       (void)sprintf(cp, " {%s %u}",
+                       (void)snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}",

                            ipaddr_string(&idp->ird_addr),
                            EXTRACT_32BITS(&idp->ird_pref));
                        cp = buf + strlen(buf);
                            ipaddr_string(&idp->ird_addr),
                            EXTRACT_32BITS(&idp->ird_pref));
                        cp = buf + strlen(buf);


@@ -322,25 +330,26 @@ icmp_print(register const u_char *bp, register const u_char *bp2)
                        break;
 
                default:
                        break;
 
                default:

-                       (void)sprintf(buf, "time exceeded-#%d", dp->icmp_code);
+                       (void)snprintf(buf, sizeof(buf), "time exceeded-#%d",
+                           dp->icmp_code);

                        break;
                }
                break;
 
        case ICMP_PARAMPROB:
                if (dp->icmp_code)
                        break;
                }
                break;
 
        case ICMP_PARAMPROB:
                if (dp->icmp_code)

-                       (void)sprintf(buf, "parameter problem - code %d",
-                                       dp->icmp_code);
+                       (void)snprintf(buf, sizeof(buf),
+                           "parameter problem - code %d", dp->icmp_code);

                else {
                        TCHECK(dp->icmp_pptr);
                else {
                        TCHECK(dp->icmp_pptr);

-                       (void)sprintf(buf, "parameter problem - octet %d",
-                                       dp->icmp_pptr);
+                       (void)snprintf(buf, sizeof(buf),
+                           "parameter problem - octet %d", dp->icmp_pptr);

                }
                break;
 
        case ICMP_MASKREPLY:
                TCHECK(dp->icmp_mask);
                }
                break;
 
        case ICMP_MASKREPLY:
                TCHECK(dp->icmp_mask);

-               (void)sprintf(buf, "address mask is 0x%08x",
+               (void)snprintf(buf, sizeof(buf), "address mask is 0x%08x",

                    (u_int32_t)ntohl(dp->icmp_mask));
                break;
 
                    (u_int32_t)ntohl(dp->icmp_mask));
                break;
 


@@ -349,6 +358,19 @@ icmp_print(register const u_char *bp, register const u_char *bp2)
                break;
        }
         (void)printf("icmp: %s", str);
                break;
        }
         (void)printf("icmp: %s", str);

+       if (vflag) {
+               if (TTEST2(*bp, plen)) {
+                       if (in_cksum((u_short*)dp, plen, 0))
+                               printf(" (wrong icmp csum)");
+               }
+       }
+       if (vflag > 1 && !ICMP_INFOTYPE(dp->icmp_type)) {
+               bp += 8;
+               (void)printf(" for ");
+               ip = (struct ip *)bp;
+               snaplen = snapend - bp;
+               ip_print(bp, ntohs(ip->ip_len));
+       }

        return;
 trunc:
        fputs("[|icmp]", stdout);
        return;
 trunc:
        fputs("[|icmp]", stdout);