Merge remote-tracking branch 'frr/master' into table-hash-ospf6-lsdb-refactor

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --cc bgpd/rfapi/rfapi_import.c
Simple merge

diff --cc bgpd/rfapi/rfapi_rib.c
Simple merge

diff --cc ospf6d/ospf6_abr.c
Simple merge

diff --cc ospf6d/ospf6_asbr.c
Simple merge

diff --cc ospf6d/ospf6_interface.c
index bff3200081a68a3bc409250208052532d5831c1a,d647b94df6ae8372bfccf32942f3202fb94cc377..ab5b4f935b0d01fb0ad42172527a0ec72edf9c3e
--- 1/ospf6d/ospf6_interface.c
--- 2/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@@ -989,23 -982,23 +982,21 @@@ ospf6_interface_show (struct vty *vty, 
    if (oi->thread_send_lsupdate)
      timersub (&oi->thread_send_lsupdate->u.sands, &now, &res);
    timerstring (&res, duration, sizeof (duration));
-   vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]%s",
+   vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]\n",
             oi->lsupdate_list->count, duration,
-            (oi->thread_send_lsupdate ? "on" : "off"),
-            VNL);
+            (oi->thread_send_lsupdate ? "on" : "off"));
 -  for (lsa = ospf6_lsdb_head (oi->lsupdate_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(oi->lsupdate_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
  
    timerclear (&res);
    if (oi->thread_send_lsack)
      timersub (&oi->thread_send_lsack->u.sands, &now, &res);
    timerstring (&res, duration, sizeof (duration));
-   vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]%s",
+   vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]\n",
             oi->lsack_list->count, duration,
-            (oi->thread_send_lsack ? "on" : "off"),
-            VNL);
+            (oi->thread_send_lsack ? "on" : "off"));
 -  for (lsa = ospf6_lsdb_head (oi->lsack_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(oi->lsack_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
    ospf6_bfd_show_info(vty, oi->bfd_info, 1);
    return 0;
  }

diff --cc ospf6d/ospf6_intra.c
Simple merge

diff --cc ospf6d/ospf6_message.c
Simple merge

diff --cc ospf6d/ospf6_neighbor.c
index 9ff4e558397fa1572ea31822c09603816e66f6cf,fec99292771c1842e6ce89b043b9724ba605e50b..d0a97eea4e7524f8f33b0d4a31f045dd9cd7e8c3
--- 1/ospf6d/ospf6_neighbor.c
--- 2/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@@ -742,67 -745,66 +736,59 @@@ ospf6_neighbor_show_detail (struct vty 
             (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_IBIT) ? "Initial " : ""),
             (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_MBIT) ? "More " : ""),
             (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_MSBIT) ?
-             "Master" : "Slave"), (u_long) ntohl (on->dbdesc_seqnum),
-            VNL);
+             "Master" : "Slave"), (u_long) ntohl (on->dbdesc_seqnum));
  
-   vty_out (vty, "    Summary-List: %d LSAs%s", on->summary_list->count,
-            VNL);
+   vty_out (vty, "    Summary-List: %d LSAs\n", on->summary_list->count);
 -  for (lsa = ospf6_lsdb_head (on->summary_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(on->summary_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
  
-   vty_out (vty, "    Request-List: %d LSAs%s", on->request_list->count,
-            VNL);
+   vty_out (vty, "    Request-List: %d LSAs\n", on->request_list->count);
 -  for (lsa = ospf6_lsdb_head (on->request_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(on->request_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
  
-   vty_out (vty, "    Retrans-List: %d LSAs%s", on->retrans_list->count,
-            VNL);
+   vty_out (vty, "    Retrans-List: %d LSAs\n", on->retrans_list->count);
 -  for (lsa = ospf6_lsdb_head (on->retrans_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(on->retrans_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
  
    timerclear (&res);
    if (on->thread_send_dbdesc)
      timersub (&on->thread_send_dbdesc->u.sands, &now, &res);
    timerstring (&res, duration, sizeof (duration));
-   vty_out (vty, "    %d Pending LSAs for DbDesc in Time %s [thread %s]%s",
+   vty_out (vty, "    %d Pending LSAs for DbDesc in Time %s [thread %s]\n",
             on->dbdesc_list->count, duration,
-            (on->thread_send_dbdesc ? "on" : "off"),
-            VNL);
+            (on->thread_send_dbdesc ? "on" : "off"));
 -  for (lsa = ospf6_lsdb_head (on->dbdesc_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(on->dbdesc_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
  
    timerclear (&res);
    if (on->thread_send_lsreq)
      timersub (&on->thread_send_lsreq->u.sands, &now, &res);
    timerstring (&res, duration, sizeof (duration));
-   vty_out (vty, "    %d Pending LSAs for LSReq in Time %s [thread %s]%s",
+   vty_out (vty, "    %d Pending LSAs for LSReq in Time %s [thread %s]\n",
             on->request_list->count, duration,
-            (on->thread_send_lsreq ? "on" : "off"),
-            VNL);
+            (on->thread_send_lsreq ? "on" : "off"));
 -  for (lsa = ospf6_lsdb_head (on->request_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(on->request_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
  
    timerclear (&res);
    if (on->thread_send_lsupdate)
      timersub (&on->thread_send_lsupdate->u.sands, &now, &res);
    timerstring (&res, duration, sizeof (duration));
-   vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]%s",
+   vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]\n",
             on->lsupdate_list->count, duration,
-            (on->thread_send_lsupdate ? "on" : "off"),
-            VNL);
+            (on->thread_send_lsupdate ? "on" : "off"));
 -  for (lsa = ospf6_lsdb_head (on->lsupdate_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(on->lsupdate_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
  
    timerclear (&res);
    if (on->thread_send_lsack)
      timersub (&on->thread_send_lsack->u.sands, &now, &res);
    timerstring (&res, duration, sizeof (duration));
-   vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]%s",
+   vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]\n",
             on->lsack_list->count, duration,
-            (on->thread_send_lsack ? "on" : "off"),
-            VNL);
+            (on->thread_send_lsack ? "on" : "off"));
 -  for (lsa = ospf6_lsdb_head (on->lsack_list); lsa;
 -       lsa = ospf6_lsdb_next (lsa))
 +  for (ALL_LSDB(on->lsack_list, lsa))
-     vty_out (vty, "      %s%s", lsa->name, VNL);
+     vty_out (vty, "      %s\n", lsa->name);
  
    ospf6_bfd_show_info(vty, on->bfd_info, 0);
  }

diff --cc ospf6d/ospf6_spf.c
Simple merge

diff --cc tests/Makefile.am
index c10c3def68d00eb51d6fec72d69692f336aa60fa,8f612c45a5e8cb822f8b4afb8327b02da67b9cae..43003e707592699139aeb57caeafd82873d6f82b
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -164,9 -149,7 +164,10 @@@ EXTRA_DIST = 
      lib/test_table.py \
      lib/test_timer_correctness.py \
      lib/test_ttable.py \
+     lib/test_ttable.refout \
 +    ospf6d/test_lsdb.py \
 +    ospf6d/test_lsdb.in \
 +    ospf6d/test_lsdb.refout \
      # end
  
  .PHONY: tests.xml