]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-icmp.c
CREDITS: add author of a change backported to 4.99.2. [skip ci]
[tcpdump] / print-icmp.c
index fe90aff0f3a3f391eb235226c96017fd8d3fb55a..074d937716c3927811eb53987f027ce84bd2e503 100644 (file)
@@ -86,9 +86,6 @@ struct icmp {
 #define        icmp_data       icmp_dun.id_data
 };
 
-#define ICMP_EXT_EXTRACT_VERSION(x) (((x)&0xf0)>>4)
-#define ICMP_MPLS_EXT_VERSION 2
-
 /*
  * Lower bounds on packet lengths for various types.
  * For the error advice packets must first insure that the
@@ -188,11 +185,6 @@ struct icmp {
 #define ICMP_UNREACH_PRECEDENCE_CUTOFF 15      /* precedence cutoff */
 #endif
 
-/* rfc4950  */
-#define MPLS_STACK_ENTRY_OBJECT_CLASS            1
-/* rfc5837 */
-#define INTERFACE_INFORMATION_OBJECT_CLASS       2
-
 /* Most of the icmp types */
 static const struct tok icmp2str[] = {
        { ICMP_ECHOREPLY,               "echo reply" },
@@ -226,13 +218,17 @@ struct id_rdiscovery {
 };
 
 /*
- * draft-bonica-internet-icmp-08
+ * RFC 4884 - Extended ICMP to Support Multi-Part Messages
+ *
+ * This is a general extension mechanism, based on the mechanism
+ * in draft-bonica-icmp-mpls-02 ICMP Extensions for MultiProtocol
+ * Label Switching.
  *
  * The Destination Unreachable, Time Exceeded
  * and Parameter Problem messages are slightly changed as per
- * the above draft. A new Length field gets added to give
+ * the above RFC. A new Length field gets added to give
  * the caller an idea about the length of the piggybacked
- * IP packet before the MPLS extension header starts.
+ * IP packet before the extension header starts.
  *
  * The Length field represents length of the padded "original datagram"
  * field  measured in 32-bit words.
@@ -264,6 +260,32 @@ struct icmp_ext_t {
     nd_byte     icmp_ext_data[1];
 };
 
+/*
+ * Extract version from the first octet of icmp_ext_version_res.
+ */
+#define ICMP_EXT_EXTRACT_VERSION(x) (((x)&0xf0)>>4)
+
+/*
+ * Current version.
+ */
+#define ICMP_EXT_VERSION 2
+
+/*
+ * Extension object class numbers.
+ *
+ * Class 1 dates back to draft-bonica-icmp-mpls-02.
+ *
+ * Class 2 was used for an "Extended Payload Object Class", which
+ * contained bytes of the payload beyond the first 128 bytes, in
+ * draft-bonica-icmp-mpls-02; it was reassigned to an "Interface
+ * Information Object" in RFC 5837.
+ */
+
+/* rfc4950  */
+#define MPLS_STACK_ENTRY_OBJECT_CLASS            1
+/* rfc5837 */
+#define INTERFACE_INFORMATION_OBJECT_CLASS       2
+
 struct icmp_multipart_ext_object_header_t {
     nd_uint16_t length;
     nd_uint8_t  class_num;
@@ -276,6 +298,42 @@ static const struct tok icmp_multipart_ext_obj_values[] = {
     { 0, NULL}
 };
 
+/* rfc5837 */
+static const struct tok icmp_interface_identification_role_values[] = {
+    { 0, "the IP interface upon which a datagram arrived"},
+    { 1, "the sub-IP component of an IP interface upon which a datagram arrived"},
+    { 2, "the IP interface through which the datagram would have been forwarded had it been forwardable"},
+    { 3, "the IP next hop to which the datagram would have been forwarded"},
+    { 0, NULL }
+};
+
+/*
+Interface IP Address Sub-Object
+0                            31
++-------+-------+-------+-------+
+|      AFI      |    Reserved   |
++-------+-------+-------+-------+
+|         IP Address   ....
+*/
+struct icmp_interface_identification_ipaddr_subobject_t {
+    nd_uint16_t  afi;
+    nd_uint16_t  reserved;
+    nd_uint32_t  ip_addr;
+};
+
+/*
+Interface Name Sub-Object
+octet    0        1                                   63
+        +--------+-----------................-----------------+
+        | length |   interface name octets 1-63               |
+        +--------+-----------................-----------------+
+*/
+struct icmp_interface_identification_ifname_subobject_t {
+    nd_uint8_t  length;
+    nd_byte     if_name[63];
+};
+
+
 /* prototypes */
 const char *icmp_tstamp_print(u_int);
 
@@ -311,6 +369,10 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
         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;
        char buf[MAXHOSTNAMELEN + 100];
@@ -708,7 +770,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
              * Sanity checking of the header.
              */
             if (ICMP_EXT_EXTRACT_VERSION(*(ext_dp->icmp_ext_version_res)) !=
-                ICMP_MPLS_EXT_VERSION) {
+                ICMP_EXT_VERSION) {
                 ND_PRINT(" packet not supported");
                 return;
             }
@@ -751,7 +813,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                 obj_tlen-=sizeof(struct icmp_multipart_ext_object_header_t);
 
                 switch (obj_class_num) {
-                case 1:
+                case MPLS_STACK_ENTRY_OBJECT_CLASS:
                     switch(obj_ctype) {
                     case 1:
                         raw_label = GET_BE_U_4(obj_tptr);
@@ -765,11 +827,78 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                     }
                     break;
 
-               /*
-                *  FIXME those are the defined objects that lack a decoder
-                *  you are welcome to contribute code ;-)
-                */
-                case 2:
+                case INTERFACE_INFORMATION_OBJECT_CLASS:
+                    /*
+                    Ctype in a INTERFACE_INFORMATION_OBJECT_CLASS object:
+
+                    Bit     0       1       2       3       4       5       6       7
+                    +-------+-------+-------+-------+-------+-------+-------+-------+
+                    | Interface Role| Rsvd1 | Rsvd2 |ifIndex| IPAddr|  name |  MTU  |
+                    +-------+-------+-------+-------+-------+-------+-------+-------+
+                    */
+                    interface_role = (obj_ctype & 0xc0) >> 6;
+                    if_index_flag  = (obj_ctype & 0x8) >> 3;
+                    ipaddr_flag    = (obj_ctype & 0x4) >> 2;
+                    name_flag      = (obj_ctype & 0x2) >> 1;
+                    mtu_flag       = (obj_ctype & 0x1);
+
+                    ND_PRINT("\n\t\t This object describes %s",
+                             tok2str(icmp_interface_identification_role_values,
+                             "an unknown interface role",interface_role));
+
+                    offset = obj_tptr;
+
+                    if (if_index_flag) {
+                        ND_PRINT("\n\t\t Interface Index: %u", GET_BE_U_4(offset));
+                        offset += 4;
+                    }
+                    if (ipaddr_flag) {
+                        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)) {
+                            case 1:
+                                ND_PRINT("%s", GET_IPADDR_STRING(ipaddr_subobj->ip_addr));
+                                offset += 4;
+                                break;
+                            case 2:
+                                ND_PRINT("%s", GET_IP6ADDR_STRING(ipaddr_subobj->ip_addr));
+                                offset += 16;
+                                break;
+                            default:
+                                ND_PRINT("Unknown Address Family Identifier");
+                                return;
+                        }
+                        offset += 4;
+                    }
+                    if (name_flag) {
+                        uint8_t inft_name_length_field;
+
+                        ifname_subobj = (const struct icmp_interface_identification_ifname_subobject_t *) offset;
+                        inft_name_length_field = GET_U_1(ifname_subobj->length);
+                        ND_PRINT("\n\t\t Interface Name");
+                        if (inft_name_length_field % 4 != 0) {
+                            ND_PRINT(" [length %u != N x 4]", inft_name_length_field);
+                            nd_print_invalid(ndo);
+                            offset += inft_name_length_field;
+                            break;
+                        }
+                        if (inft_name_length_field > 64) {
+                            ND_PRINT(" [length %u > 64]", inft_name_length_field);
+                            nd_print_invalid(ndo);
+                            offset += inft_name_length_field;
+                            break;
+                        }
+                        ND_PRINT(", length %u: ", inft_name_length_field);
+                        nd_printjnp(ndo, ifname_subobj->if_name,
+                                    inft_name_length_field - 1);
+                        offset += inft_name_length_field;
+                    }
+                    if (mtu_flag) {
+                        ND_PRINT("\n\t\t MTU: %u", GET_BE_U_4(offset));
+                        offset += 4;
+                    }
+                    break;
+
                 default:
                     print_unknown_data(ndo, obj_tptr, "\n\t    ", obj_tlen);
                     break;