Changeset 4c88365 for libpacketdump

Timestamp:

02/05/19 11:53:46 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

6f6fcbb

Parents:

0486a72

Message:

libpacketdump cleanup ERF output

File:

• libpacketdump/link_21.c (modified) (1 diff)

libpacketdump/link_21.c

@@ -14 +14 @@
 
                 if (meta->items[i].datatype == TRACE_META_STRING) {
-                        printf("   Name: %s ID: %u Value: %s\n",
+                        printf("   %s: %s\n",
                                 meta->items[i].option_name,
-                                meta->items[i].option,
                                 (char *)meta->items[i].data);
                 } else if (meta->items[i].datatype == TRACE_META_UINT8) {
-                        printf("   Name: %s ID: %u Value: %u\n",
+                        printf("   %s: %u\n",
                                 meta->items[i].option_name,
-                                meta->items[i].option,
                                 *(uint8_t *)meta->items[i].data);
                 } else if (meta->items[i].datatype == TRACE_META_UINT32) {
-                        printf("   Name: %s ID: %u Value: %u\n",
+                        printf("   %s: %u\n",
                                 meta->items[i].option_name,
-                                meta->items[i].option,
                                 *(uint32_t *)meta->items[i].data);
                 } else if (meta->items[i].datatype == TRACE_META_UINT64) {
-                        printf("   Name: %s ID: %u Value: %lu\n",
+                        printf("   %s: %lu\n",
                                 meta->items[i].option_name,
-                                meta->items[i].option,
                                 *(uint64_t *)meta->items[i].data);
                 } else if (meta->items[i].datatype == TRACE_META_IPV4) {
                         struct in_addr ip;
                         ip.s_addr = *(uint32_t *)meta->items[i].data;
-                        printf("   Name: %s ID: %u Value: %s\n",
+                        printf("   %s: %s\n",
                                 meta->items[i].option_name,
-                                meta->items[i].option,
                                 inet_ntoa(ip));
                 } else if (meta->items[i].datatype == TRACE_META_IPV6) {
-                        printf("   Name: %s ID: %u Value: %s\n",
+                        printf("   %s: %s\n",
                                 meta->items[i].option_name,
-                                meta->items[i].option,
                                 (char *)meta->items[i].data);
                 } else if (meta->items[i].datatype == TRACE_META_MAC) {
                         unsigned char *mac = meta->items[i].data;
-                        printf("   Name: %s ID: %u Value: %02x:%02x:%02x:%02x:%02x:%02x\n",
+                        printf("   %s: %02x:%02x:%02x:%02x:%02x:%02x\n",
                                 meta->items[i].option_name,
-                                meta->items[i].option,
                                 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
                 } else {
-                        printf("   Name: Unknown ID: %u Option Value (RAW): ", meta->items[i].option);
+                        printf("   Unknown Option ID %u (output RAW): ", meta->items[i].option);
                         int k;
                         unsigned char *curr = (unsigned char *)meta->items[i].data;