Changeset 387d299 for libpacketdump/ip_89.c

Timestamp:

07/04/14 11:37:25 (7 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

d14e23d

Parents:

9ad7a35

Message:

Remove duplicate macros in libpacketdump

Ensure OSPF libpacketdump module won't segfault or print garbage
if a truncated OSPF header is passed into it.

Renamed 'len' field in OSPF header to 'ospf_len' to avoid
potential conflict with variables named len in libpacketdump
code.

File:

• libpacketdump/ip_89.c (modified) (2 diffs)

libpacketdump/ip_89.c

@@ -10 +10 @@
 static void dump_ospf_v2_header(libtrace_ospf_v2_t *hdr, unsigned len) {
 
-        printf(" OSPF Header: Version %u Type %u ",
-                        hdr->ospf_v, hdr->type);
+        DISPLAY(hdr, ospf_v, " OSPF Header: Version %u");
+        DISPLAY(hdr, type, " Type %u ");
         switch(hdr->type) {
                 case TRACE_OSPF_HELLO:
@@ -29 +29 @@
                         break;
         }
+        printf("\n");
 
-        printf("\n OSPF Header: Length %u \n", ntohs(hdr->len));
-        printf(" OSPF Header: Router Id %s ", inet_ntoa(hdr->router));
-        printf("Area Id %s\n", inet_ntoa(hdr->area));
-        printf(" OSPF Header: Checksum %u Auth Type %u\n", ntohs(hdr->sum),
-                        ntohs(hdr->au_type));
-
-        printf(" OSPF Header: Auth Key ID %u Auth Data Len %u\n", 
-                        hdr->au_key_id, hdr->au_data_len);
-        printf(" OSPF Header: Auth Crypto Seq %u\n", ntohl(hdr->au_seq_num));
-
+        DISPLAYS(hdr, ospf_len, "OSPF Header: Length %u \n");
+        DISPLAYIP(hdr, router, " OSPF Header: Router Id %s ");
+        DISPLAYIP(hdr, area, "Area Id %s\n");
+        DISPLAYS(hdr, sum, " OSPF Header: Checksum %u ");
+        DISPLAYS(hdr, au_type, "Auth Type %u\n");
+        DISPLAY(hdr, au_key_id, " OSPF Header: Auth Key ID %u ");
+        DISPLAY(hdr, au_data_len, "Auth Data Len %u\n");
+        DISPLAYL(hdr, au_seq_num, " OSPF Header: Auth Crypto Seq %u\n");
 
 }