ospfd6: Clear locks when ospf messages need to be chunked

When there are too many LSA updates to be sent in a packet the code needs to
correctly clear the locks that are taken while walking the lists and then wait
for the appropriate timer to expire to continue walking the list.   The routine
that was being called would not properly remove all the locks that needed to be
cleared, and would also try to incorrectly delete the lsa/route.   The code now
clears the locks and leaves the lsa on the list.  When the timers fire again
the code continues walking the list to send the rest of the lsas to the
neighbor.

Signed-off-by: Lynne Morrison <lynne@voltanet.io>

diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index 160f012d780a4ec54764f9997d6ea0fffff73b00..aebe43b9ecff86c8dd5d30cbeebafe023b8e7dd6 100644 (file)
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -1829,7 +1829,9 @@ int ospf6_dbdesc_send(struct thread *thread)
                        /* MTU check */
                        if (p - sendbuf + sizeof(struct ospf6_lsa_header)
                            > ospf6_packet_max(on->ospf6_if)) {
-                               ospf6_lsdb_lsa_unlock(lsa);
+                               ospf6_lsa_unlock(lsa);
+                               if (lsanext)
+                                       ospf6_lsa_unlock(lsanext);
                                break;
                        }
                        memcpy(p, lsa->header, sizeof(struct ospf6_lsa_header));
@@ -1876,7 +1878,9 @@ int ospf6_dbdesc_send_newone(struct thread *thread)
 
                if (size + sizeof(struct ospf6_lsa_header)
                    > ospf6_packet_max(on->ospf6_if)) {
-                       ospf6_lsdb_lsa_unlock(lsa);
+                       ospf6_lsa_unlock(lsa);
+                       if (lsanext)
+                               ospf6_lsa_unlock(lsanext);
                        break;
                }
 
@@ -1935,7 +1939,9 @@ int ospf6_lsreq_send(struct thread *thread)
                /* MTU check */
                if (p - sendbuf + sizeof(struct ospf6_lsreq_entry)
                    > ospf6_packet_max(on->ospf6_if)) {
-                       ospf6_lsdb_lsa_unlock(lsa);
+                       ospf6_lsa_unlock(lsa);
+                       if (lsanext)
+                               ospf6_lsa_unlock(lsanext);
                        break;
                }
 
@@ -2396,7 +2402,9 @@ int ospf6_lsack_send_interface(struct thread *thread)
                        thread_add_event(master, ospf6_lsack_send_interface, oi,
                                         0, &oi->thread_send_lsack);
 
-                       ospf6_lsdb_lsa_unlock(lsa);
+                       ospf6_lsa_unlock(lsa);
+                       if (lsanext)
+                               ospf6_lsa_unlock(lsanext);
                        break;
                }