Fix small misspellings

[tcpdump] / print-icmp.c

diff --git a/print-icmp.c b/print-icmp.c
index 269b14fbd8f7e86bc02321dbc52bf706419ef0a7..86da44bd99ec2bde3c99c9fec3812db6585ce258 100644 (file)
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -52,8 +52,8 @@ struct icmp {
        nd_uint8_t  icmp_code;          /* type sub code */
        nd_uint16_t icmp_cksum;         /* ones complement cksum of struct */
        union {
-               nd_uint8_t ih_pptr;             /* ICMP_PARAMPROB */
-               struct in_addr ih_gwaddr;       /* ICMP_REDIRECT */
+               nd_uint8_t ih_pptr;     /* ICMP_PARAMPROB */
+               nd_ipv4 ih_gwaddr;      /* ICMP_REDIRECT */
                struct ih_idseq {
                        nd_uint16_t icd_id;
                        nd_uint16_t icd_seq;
@@ -260,7 +260,7 @@ struct id_rdiscovery {
  * draft-bonica-internet-icmp-08
  *
  * The Destination Unreachable, Time Exceeded
- * and Parameter Problem messages are slighly changed as per
+ * and Parameter Problem messages are slightly changed as per
  * the above draft. A new Length field gets added to give
  * the caller an idea about the length of the piggypacked
  * IP packet before the MPLS extension header starts.
@@ -347,6 +347,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
        char buf[MAXHOSTNAMELEN + 100];
        struct cksum_vec vec[1];
 
+       ndo->ndo_protocol = "icmp";
        dp = (const struct icmp *)bp;
         ext_dp = (const struct icmp_ext_t *)bp;
        ip = (const struct ip *)bp2;
@@ -375,7 +376,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                        ND_TCHECK_1(dp->icmp_ip.ip_p);
                        (void)nd_snprintf(buf, sizeof(buf),
                            "%s protocol %u unreachable",
-                           ipaddr_string(ndo, &dp->icmp_ip.ip_dst),
+                           ipaddr_string(ndo, dp->icmp_ip.ip_dst),
                            EXTRACT_U_1(dp->icmp_ip.ip_p));
                        break;
 
@@ -392,21 +393,21 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                        case IPPROTO_TCP:
                                (void)nd_snprintf(buf, sizeof(buf),
                                        "%s tcp port %s unreachable",
-                                       ipaddr_string(ndo, &oip->ip_dst),
+                                       ipaddr_string(ndo, oip->ip_dst),
                                        tcpport_string(ndo, dport));
                                break;
 
                        case IPPROTO_UDP:
                                (void)nd_snprintf(buf, sizeof(buf),
                                        "%s udp port %s unreachable",
-                                       ipaddr_string(ndo, &oip->ip_dst),
+                                       ipaddr_string(ndo, oip->ip_dst),
                                        udpport_string(ndo, dport));
                                break;
 
                        default:
                                (void)nd_snprintf(buf, sizeof(buf),
                                        "%s protocol %u port %u unreachable",
-                                       ipaddr_string(ndo, &oip->ip_dst),
+                                       ipaddr_string(ndo, oip->ip_dst),
                                        ip_proto, dport);
                                break;
                        }
@@ -420,11 +421,11 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                        if (mtu) {
                                (void)nd_snprintf(buf, sizeof(buf),
                                    "%s unreachable - need to frag (mtu %u)",
-                                   ipaddr_string(ndo, &dp->icmp_ip.ip_dst), mtu);
+                                   ipaddr_string(ndo, dp->icmp_ip.ip_dst), mtu);
                        } else {
                                (void)nd_snprintf(buf, sizeof(buf),
                                    "%s unreachable - need to frag",
-                                   ipaddr_string(ndo, &dp->icmp_ip.ip_dst));
+                                   ipaddr_string(ndo, dp->icmp_ip.ip_dst));
                        }
                    }
                        break;
@@ -433,7 +434,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                        fmt = tok2str(unreach2str, "#%u %%s unreachable",
                            icmp_code);
                        (void)nd_snprintf(buf, sizeof(buf), fmt,
-                           ipaddr_string(ndo, &dp->icmp_ip.ip_dst));
+                           ipaddr_string(ndo, dp->icmp_ip.ip_dst));
                        break;
                }
                break;
@@ -443,8 +444,8 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                fmt = tok2str(type2str, "redirect-#%u %%s to net %%s",
                    icmp_code);
                (void)nd_snprintf(buf, sizeof(buf), fmt,
-                   ipaddr_string(ndo, &dp->icmp_ip.ip_dst),
-                   ipaddr_string(ndo, &dp->icmp_gwaddr));
+                   ipaddr_string(ndo, dp->icmp_ip.ip_dst),
+                   ipaddr_string(ndo, dp->icmp_gwaddr));
                break;
 
        case ICMP_ROUTERADVERT:
@@ -490,7 +491,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                while (num-- > 0) {
                        ND_TCHECK_SIZE(idp);
                        (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}",
-                           ipaddr_string(ndo, &idp->ird_addr),
+                           ipaddr_string(ndo, idp->ird_addr),
                            EXTRACT_BE_U_4(idp->ird_pref));
                        cp = buf + strlen(buf);
                        ++idp;
@@ -591,6 +592,9 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                 ndo->ndo_snapend = snapend_save;
        }
 
+       /* ndo_protocol reassignment after ip_print() call */
+       ndo->ndo_protocol = "icmp";
+
         /*
          * Attempt to decode the MPLS extensions only for some ICMP types.
          */
@@ -696,11 +700,5 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 
        return;
 trunc:
-       ND_PRINT("[|icmp]");
+       nd_print_trunc(ndo);
 }
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */