Changeset 1453435 for libpacketdump/ospf2_1.c

Timestamp:

01/06/12 16:43:16 (11 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:

cb64286

Parents:

f46f7f4

Message:

• Fixed bug where OSPF Hello packets did not support multiple neighbours
• Updated OSPF Hello libpacketdump decoder to report all neighbours
• Updated documentation to describe OSPF structures

File:

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

libpacketdump/ospf2_1.c

@@ -10 +10 @@
 
         libtrace_ospf_hello_v2_t *hello = (libtrace_ospf_hello_v2_t *)packet;
-        
+        struct in_addr *neigh;
+
         if (len < 4) 
                 return;
@@ -53 +54 @@
                 return;
 
-        printf(" OSPF Hello: Designated Router: %s\n", inet_ntoa(hello->designated));
+        printf(" OSPF Hello: Designated Router %s\n", inet_ntoa(hello->designated));
 
         if (len < 20)
                 return;
 
-        printf(" OSPF Hello: Backup Designated Router: %s\n", inet_ntoa(hello->backup));
+        printf(" OSPF Hello: Backup Designated Router %s\n", inet_ntoa(hello->backup));
 
-        if (len < 24)
-                return;
-        
-        printf(" OSPF Hello: Neighbour: %s\n", inet_ntoa(hello->backup));
+        neigh = (struct in_addr *)(packet + sizeof(libtrace_ospf_hello_v2_t));
+        len -= sizeof(libtrace_ospf_hello_v2_t);
+        while (len >= 4) {
+                printf(" OSPF Hello: Neighbour %s\n", inet_ntoa(*neigh));
+                neigh++;
+                len -= sizeof(struct in_addr);
+        }
+
+
 
         return;