ICMP: Modernize packet parsing

Remove the icmp_print() unused parameter 'bp2'.
Enable ND_LONGJMP_FROM_TCHECK and remove a 'trunc' label.
Remove some redundant ND_TCHECK_*().
Reduce the scope of some variables.
Fix some indentations.
Remove some extra blank lines.

diff --git a/CHANGES b/CHANGES
index c9e8728832ad2e7bd43431e20a7ef65bb81198d8..4747f88febb08dd51f7a10a44de84bfbedadc198 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -26,7 +26,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
       Remove unused missing/snprintf.c.
       Remove unused missing/strdup.c.
       (FIXME: somebody please wrap the line below just before the release)
       Remove unused missing/snprintf.c.
       Remove unused missing/strdup.c.
       (FIXME: somebody please wrap the line below just before the release)

-      AODV, AppleTalk, BOOTP, CHDLC, DCCP, EAP, EGP, EIGRP, ForCES, Geneve, GRE, Juniper, L2TP, mobile, NetFlow, NTP, OLSR, PGM, RADIUS, RIP, RSVP, SCTP, SNMP, TCP, UDP, vsock: Modernize packet parsing style
+      AODV, AppleTalk, BOOTP, CHDLC, DCCP, EAP, EGP, EIGRP, ForCES, Geneve, GRE, ICMP, Juniper, L2TP, mobile, NetFlow, NTP, OLSR, PGM, RADIUS, RIP, RSVP, SCTP, SNMP, TCP, UDP, vsock: Modernize packet parsing style

       DCCP, EGP: Replace custom code with tok2str()
       UDP: Clean up address and port printing.
       AppleTalk: Declutter appletalk.h.
       DCCP, EGP: Replace custom code with tok2str()
       UDP: Clean up address and port printing.
       AppleTalk: Declutter appletalk.h.

diff --git a/netdissect.h b/netdissect.h
index 51c56e2b82ba665b92233c009d62c067458de60d..d2c57482d9f5e6bdc4750e96330ef948fba3379c 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -657,7 +657,7 @@ extern void hncp_print(netdissect_options *, const u_char *, u_int);
 extern void hsrp_print(netdissect_options *, const u_char *, u_int);
 extern void http_print(netdissect_options *, const u_char *, u_int);
 extern void icmp6_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
 extern void hsrp_print(netdissect_options *, const u_char *, u_int);
 extern void http_print(netdissect_options *, const u_char *, u_int);
 extern void icmp6_print(netdissect_options *, const u_char *, u_int, const u_char *, int);

-extern void icmp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
+extern void icmp_print(netdissect_options *, const u_char *, u_int, int);

 extern u_int ieee802_11_radio_print(netdissect_options *, const u_char *, u_int, u_int);
 extern u_int ieee802_15_4_print(netdissect_options *, const u_char *, u_int);
 extern void igmp_print(netdissect_options *, const u_char *, u_int);
 extern u_int ieee802_11_radio_print(netdissect_options *, const u_char *, u_int, u_int);
 extern u_int ieee802_15_4_print(netdissect_options *, const u_char *, u_int);
 extern void igmp_print(netdissect_options *, const u_char *, u_int);

diff --git a/print-icmp.c b/print-icmp.c
index 6f962500e36eea396ce9e40ac3227f9285edb0aa..5d492080f553c464b8a7e86008f94febb4493e5c 100644 (file)
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"


@@ -333,7 +334,6 @@ struct icmp_interface_identification_ifname_subobject_t {
     nd_byte     if_name[63];
 };
 
     nd_byte     if_name[63];
 };
 

-

 /* prototypes */
 const char *icmp_tstamp_print(u_int);
 
 /* prototypes */
 const char *icmp_tstamp_print(u_int);
 


@@ -354,34 +354,21 @@ icmp_tstamp_print(u_int tstamp)
 }
 
 void
 }
 
 void

-icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *bp2,
+icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen,

            int fragmented)
 {
            int fragmented)
 {

-       char *cp;

        const struct icmp *dp;
        uint8_t icmp_type, icmp_code;
        const struct icmp *dp;
        uint8_t icmp_type, icmp_code;

-        const struct icmp_ext_t *ext_dp;
-       const struct ip *ip;
+       const struct icmp_ext_t *ext_dp;

        const char *str;
        const char *str;

-       const struct ip *oip;
-       uint8_t ip_proto;
-       const struct udphdr *ouh;
-        const uint8_t *obj_tptr;
-        uint32_t raw_label;
-       const struct icmp_multipart_ext_object_header_t *icmp_multipart_ext_object_header;
-               u_int interface_role, if_index_flag, ipaddr_flag, name_flag, mtu_flag;
-        const uint8_t *offset;
-               const struct icmp_interface_identification_ipaddr_subobject_t *ipaddr_subobj;
-               const struct icmp_interface_identification_ifname_subobject_t *ifname_subobj;
-       u_int hlen, mtu, obj_tlen, obj_class_num, obj_ctype;
-       uint16_t dport;
+       const uint8_t *obj_tptr;
+       u_int hlen;

        char buf[MAXHOSTNAMELEN + 100];
        struct cksum_vec vec[1];
 
        ndo->ndo_protocol = "icmp";
        dp = (const struct icmp *)bp;
        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;
+       ext_dp = (const struct icmp_ext_t *)bp;

        str = buf;
 
        icmp_type = GET_U_1(dp->icmp_type);
        str = buf;
 
        icmp_type = GET_U_1(dp->icmp_type);


@@ -420,7 +407,12 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                        break;
 
                case ICMP_UNREACH_PORT:
                        break;
 
                case ICMP_UNREACH_PORT:

-                       ND_TCHECK_1(dp->icmp_ip.ip_p);
+                   {
+                       const struct ip *oip;
+                       const struct udphdr *ouh;
+                       uint8_t ip_proto;
+                       uint16_t dport;
+

                        oip = &dp->icmp_ip;
                        hlen = IP_HL(oip) * 4;
                        ouh = (const struct udphdr *)(((const u_char *)oip) + hlen);
                        oip = &dp->icmp_ip;
                        hlen = IP_HL(oip) * 4;
                        ouh = (const struct udphdr *)(((const u_char *)oip) + hlen);


@@ -450,10 +442,13 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                                break;
                        }
                        break;
                                break;
                        }
                        break;

+                   }

 
                case ICMP_UNREACH_NEEDFRAG:
                    {
                        const struct mtu_discovery *mp;
 
                case ICMP_UNREACH_NEEDFRAG:
                    {
                        const struct mtu_discovery *mp;

+                       u_int mtu;
+

                        mp = (const struct mtu_discovery *)(const u_char *)&dp->icmp_void;
                        mtu = GET_BE_U_2(mp->nexthopmtu);
                        if (mtu) {
                        mp = (const struct mtu_discovery *)(const u_char *)&dp->icmp_void;
                        mtu = GET_BE_U_2(mp->nexthopmtu);
                        if (mtu) {


@@ -585,6 +580,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 
        case ICMP_ROUTERADVERT:
            {
 
        case ICMP_ROUTERADVERT:
            {

+               char *cp;

                const struct ih_rdiscovery *ihp;
                const struct id_rdiscovery *idp;
                u_int lifetime, num, size;
                const struct ih_rdiscovery *ihp;
                const struct id_rdiscovery *idp;
                u_int lifetime, num, size;


@@ -593,7 +589,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                cp = buf + strlen(buf);
 
                ihp = (const struct ih_rdiscovery *)&dp->icmp_void;
                cp = buf + strlen(buf);
 
                ihp = (const struct ih_rdiscovery *)&dp->icmp_void;

-               ND_TCHECK_SIZE(ihp);

                (void)strncpy(cp, " lifetime ", sizeof(buf) - (cp - buf));
                cp = buf + strlen(buf);
                lifetime = GET_BE_U_2(ihp->ird_lifetime);
                (void)strncpy(cp, " lifetime ", sizeof(buf) - (cp - buf));
                cp = buf + strlen(buf);
                lifetime = GET_BE_U_2(ihp->ird_lifetime);


@@ -624,13 +619,12 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                }
                idp = (const struct id_rdiscovery *)&dp->icmp_data;
                while (num > 0) {
                }
                idp = (const struct id_rdiscovery *)&dp->icmp_data;
                while (num > 0) {

-                       ND_TCHECK_SIZE(idp);

                        (void)snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}",
                            GET_IPADDR_STRING(idp->ird_addr),
                            GET_BE_U_4(idp->ird_pref));
                        cp = buf + strlen(buf);
                        ++idp;
                        (void)snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}",
                            GET_IPADDR_STRING(idp->ird_addr),
                            GET_BE_U_4(idp->ird_pref));
                        cp = buf + strlen(buf);
                        ++idp;

-               num--;
+                       num--;

                }
            }
                break;
                }
            }
                break;


@@ -678,7 +672,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                break;
 
        case ICMP_TSTAMPREPLY:
                break;
 
        case ICMP_TSTAMPREPLY:

-               ND_TCHECK_4(dp->icmp_ttime);

                (void)snprintf(buf, sizeof(buf),
                    "time stamp reply id %u seq %u: org %s",
                                GET_BE_U_2(dp->icmp_id),
                (void)snprintf(buf, sizeof(buf),
                    "time stamp reply id %u seq %u: org %s",
                                GET_BE_U_2(dp->icmp_id),


@@ -717,6 +710,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
          * save the snaplength as this may get overridden in the IP printer.
          */
        if (ndo->ndo_vflag >= 1 && ICMP_ERRTYPE(icmp_type)) {
          * save the snaplength as this may get overridden in the IP printer.
          */
        if (ndo->ndo_vflag >= 1 && ICMP_ERRTYPE(icmp_type)) {

+               const struct ip *ip;

                const u_char *snapend_save;
 
                bp += 8;
                const u_char *snapend_save;
 
                bp += 8;


@@ -745,7 +739,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
          * Attempt to decode multi-part message extensions (rfc4884) only for some ICMP types.
          */
         if (ndo->ndo_vflag >= 1 && plen > ICMP_EXTD_MINLEN && ICMP_MULTIPART_EXT_TYPE(icmp_type)) {
          * Attempt to decode multi-part message extensions (rfc4884) only for some ICMP types.
          */
         if (ndo->ndo_vflag >= 1 && plen > ICMP_EXTD_MINLEN && ICMP_MULTIPART_EXT_TYPE(icmp_type)) {

-

             ND_TCHECK_SIZE(ext_dp);
 
             /*
             ND_TCHECK_SIZE(ext_dp);
 
             /*


@@ -789,9 +782,10 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
             obj_tptr = (const uint8_t *)ext_dp->icmp_ext_data;
 
             while (hlen > sizeof(struct icmp_multipart_ext_object_header_t)) {
             obj_tptr = (const uint8_t *)ext_dp->icmp_ext_data;
 
             while (hlen > sizeof(struct icmp_multipart_ext_object_header_t)) {

+                u_int obj_tlen, obj_class_num, obj_ctype;
+                const struct icmp_multipart_ext_object_header_t *icmp_multipart_ext_object_header;

 
                 icmp_multipart_ext_object_header = (const struct icmp_multipart_ext_object_header_t *)obj_tptr;
 
                 icmp_multipart_ext_object_header = (const struct icmp_multipart_ext_object_header_t *)obj_tptr;

-                ND_TCHECK_SIZE(icmp_multipart_ext_object_header);

                 obj_tlen = GET_BE_U_2(icmp_multipart_ext_object_header->length);
                 obj_class_num = GET_U_1(icmp_multipart_ext_object_header->class_num);
                 obj_ctype = GET_U_1(icmp_multipart_ext_object_header->ctype);
                 obj_tlen = GET_BE_U_2(icmp_multipart_ext_object_header->length);
                 obj_class_num = GET_U_1(icmp_multipart_ext_object_header->class_num);
                 obj_ctype = GET_U_1(icmp_multipart_ext_object_header->ctype);


@@ -816,18 +810,23 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                 case MPLS_STACK_ENTRY_OBJECT_CLASS:
                     switch(obj_ctype) {
                     case 1:
                 case MPLS_STACK_ENTRY_OBJECT_CLASS:
                     switch(obj_ctype) {
                     case 1:

+                      {
+                        uint32_t raw_label;
+

                         raw_label = GET_BE_U_4(obj_tptr);
                         ND_PRINT("\n\t    label %u, tc %u", MPLS_LABEL(raw_label), MPLS_TC(raw_label));
                         if (MPLS_STACK(raw_label))
                             ND_PRINT(", [S]");
                         ND_PRINT(", ttl %u", MPLS_TTL(raw_label));
                         break;
                         raw_label = GET_BE_U_4(obj_tptr);
                         ND_PRINT("\n\t    label %u, tc %u", MPLS_LABEL(raw_label), MPLS_TC(raw_label));
                         if (MPLS_STACK(raw_label))
                             ND_PRINT(", [S]");
                         ND_PRINT(", ttl %u", MPLS_TTL(raw_label));
                         break;

+                      }

                     default:
                         print_unknown_data(ndo, obj_tptr, "\n\t    ", obj_tlen);
                     }
                     break;
 
                 case INTERFACE_INFORMATION_OBJECT_CLASS:
                     default:
                         print_unknown_data(ndo, obj_tptr, "\n\t    ", obj_tlen);
                     }
                     break;
 
                 case INTERFACE_INFORMATION_OBJECT_CLASS:

+                  {

                     /*
                     Ctype in a INTERFACE_INFORMATION_OBJECT_CLASS object:
 
                     /*
                     Ctype in a INTERFACE_INFORMATION_OBJECT_CLASS object:
 


@@ -836,6 +835,9 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                     | Interface Role| Rsvd1 | Rsvd2 |ifIndex| IPAddr|  name |  MTU  |
                     +-------+-------+-------+-------+-------+-------+-------+-------+
                     */
                     | Interface Role| Rsvd1 | Rsvd2 |ifIndex| IPAddr|  name |  MTU  |
                     +-------+-------+-------+-------+-------+-------+-------+-------+
                     */

+                    const uint8_t *offset;
+                    u_int interface_role, if_index_flag, ipaddr_flag, name_flag, mtu_flag;
+

                     interface_role = (obj_ctype & 0xc0) >> 6;
                     if_index_flag  = (obj_ctype & 0x8) >> 3;
                     ipaddr_flag    = (obj_ctype & 0x4) >> 2;
                     interface_role = (obj_ctype & 0xc0) >> 6;
                     if_index_flag  = (obj_ctype & 0x8) >> 3;
                     ipaddr_flag    = (obj_ctype & 0x4) >> 2;


@@ -853,6 +855,8 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                         offset += 4;
                     }
                     if (ipaddr_flag) {
                         offset += 4;
                     }
                     if (ipaddr_flag) {

+                        const struct icmp_interface_identification_ipaddr_subobject_t *ipaddr_subobj;
+

                         ND_PRINT("\n\t\t IP Address sub-object: ");
                         ipaddr_subobj = (const struct icmp_interface_identification_ipaddr_subobject_t *) offset;
                         switch (GET_BE_U_2(ipaddr_subobj->afi)) {
                         ND_PRINT("\n\t\t IP Address sub-object: ");
                         ipaddr_subobj = (const struct icmp_interface_identification_ipaddr_subobject_t *) offset;
                         switch (GET_BE_U_2(ipaddr_subobj->afi)) {


@@ -872,6 +876,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                     }
                     if (name_flag) {
                         uint8_t inft_name_length_field;
                     }
                     if (name_flag) {
                         uint8_t inft_name_length_field;

+                        const struct icmp_interface_identification_ifname_subobject_t *ifname_subobj;

 
                         ifname_subobj = (const struct icmp_interface_identification_ifname_subobject_t *) offset;
                         inft_name_length_field = GET_U_1(ifname_subobj->length);
 
                         ifname_subobj = (const struct icmp_interface_identification_ifname_subobject_t *) offset;
                         inft_name_length_field = GET_U_1(ifname_subobj->length);


@@ -903,6 +908,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                         offset += 4;
                     }
                     break;
                         offset += 4;
                     }
                     break;

+                  }

 
                 default:
                     print_unknown_data(ndo, obj_tptr, "\n\t    ", obj_tlen);
 
                 default:
                     print_unknown_data(ndo, obj_tptr, "\n\t    ", obj_tlen);


@@ -914,8 +920,4 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                 obj_tptr += obj_tlen;
             }
         }
                 obj_tptr += obj_tlen;
             }
         }

-
-       return;
-trunc:
-       nd_print_trunc(ndo);

 }
 }

diff --git a/print-ip-demux.c b/print-ip-demux.c
index a71d8c1257f9d018b9794f198501e92b2d4b77a2..8dc7e1ca17d7ae3b6583c268b92b198f9f56ad90 100644 (file)
--- a/print-ip-demux.c
+++ b/print-ip-demux.c
@@ -104,7 +104,7 @@ again:
 
        case IPPROTO_ICMP:
                if (ver == 4)
 
        case IPPROTO_ICMP:
                if (ver == 4)

-                       icmp_print(ndo, bp, length, iph, fragmented);
+                       icmp_print(ndo, bp, length, fragmented);

                else {
                        ND_PRINT("[%s requires IPv4]",
                                 tok2str(ipproto_values,"unknown",nh));
                else {
                        ND_PRINT("[%s requires IPv4]",
                                 tok2str(ipproto_values,"unknown",nh));