Changeset 387d299 for lib

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:

• lib/libtrace.h.in (modified) (1 diff)

lib/libtrace.h.in

@@ -867 +867 @@
         uint8_t ospf_v;         /**< OSPF Version, should be 2 */
         uint8_t type;           /**< OSPF Packet Type */
-        uint16_t len;           /**< Packet length, including OSPF header */
+        uint16_t ospf_len;      /**< Packet length, including OSPF header */
         struct in_addr router;  /**< Router ID of the packet source */
         struct in_addr area;    /**< Area the packet belongs to */