OpenFlow 1.0: Simplify of10_vendor_message_print().

[tcpdump] / print-icmp.c

diff --git a/print-icmp.c b/print-icmp.c
index 020e433ee44496570be966fef06fbcb6ab338d63..dd767ebab094d9d7112a70609efb4e38fe17773b 100644 (file)
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -324,7 +324,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 
        case ICMP_ECHO:
        case ICMP_ECHOREPLY:
-               ND_TCHECK_2(dp->icmp_seq);
                (void)snprintf(buf, sizeof(buf), "echo %s, id %u, seq %u",
                                icmp_type == ICMP_ECHO ?
                                "request" : "reply",
@@ -333,7 +332,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                break;
 
        case ICMP_UNREACH:
-               ND_TCHECK_4(dp->icmp_ip.ip_dst);
                switch (icmp_code) {
 
                case ICMP_UNREACH_NET:
@@ -349,7 +347,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                        break;
 
                case ICMP_UNREACH_PROTOCOL:
-                       ND_TCHECK_1(dp->icmp_ip.ip_p);
                        (void)snprintf(buf, sizeof(buf),
                            "%s protocol %u unreachable",
                            GET_IPADDR_STRING(dp->icmp_ip.ip_dst),
@@ -481,7 +478,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                break;
 
        case ICMP_REDIRECT:
-               ND_TCHECK_4(dp->icmp_ip.ip_dst);
                switch (icmp_code) {
 
                case ICMP_REDIRECT_NET:
@@ -597,7 +593,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                        (void)snprintf(buf, sizeof(buf),
                            "parameter problem - code %u", icmp_code);
                else {
-                       ND_TCHECK_1(dp->icmp_pptr);
                        (void)snprintf(buf, sizeof(buf),
                            "parameter problem - octet %u",
                            GET_U_1(dp->icmp_pptr));
@@ -610,7 +605,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                break;
 
        case ICMP_TSTAMP:
-               ND_TCHECK_2(dp->icmp_seq);
                (void)snprintf(buf, sizeof(buf),
                    "time stamp query id %u seq %u",
                    GET_BE_U_2(dp->icmp_id),