OpenSourceRouting / quagga-snap / 7cf997226e8

Commits

Dinesh Dutt authored and David Lamparter committed 7cf997226e8 25 Aug 2013

ospf6d: don't send LSAck on an interface if we've flooded the LSU out that i/f

If we flood an LSA back out the same interface we received it from, don't send
an LSAck out that interface for that LSA. This is as per RFC 2328, section 13.5

Signed-off-by: Dinesh G Dutt <ddutt at cumulusnetworks.com>
Reviewed-by: Pradosh Mohapatra <pmohapat at cumulusnetworks.com>
Reviewed-by: Scott Feldman <sfeldma at cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

ospf6d/ospf6_flood.c

Modified

-380
+  if (from && from->ospf6_if == oi &&
-381
+      (from->router_id == oi->drouter || from->router_id == oi->bdrouter))
-382
+    {
-383
+      if (is_debug)
-384
+        zlog_debug ("Received is from the I/F's DR or BDR, next interface");
-385
+      return;
-386
+    }
-387
-388
+  /* (4) If the new LSA was received on this interface,
-389
+     and the interface state is BDR, examin next interface */
--
+  if (from && from->ospf6_if == oi && oi->state == OSPF6_INTERFACE_BDR)
-+
+  if (from && from->ospf6_if == oi)
-391
+    {
--
+      if (is_debug)
--
+        zlog_debug ("Received is from the I/F, itself BDR, next interface");
--
+      return;
-+
+      if (oi->state == OSPF6_INTERFACE_BDR)
-+
+	{
-+
+	  if (is_debug)
-+
+	    zlog_debug ("Received is from the I/F, itself BDR, next interface");
-+
+	  return;
-+
+	}
-+
+      SET_FLAG(lsa->flag, OSPF6_LSA_FLOODBACK);
-399
+    }
-400
-401
+  /* (5) flood the LSA out the interface. */
-402
+  if (is_debug)
-403
+    zlog_debug ("Schedule flooding for the interface");
-404
+  if ((oi->type == OSPF_IFTYPE_BROADCAST) ||
-405
+      (oi->type == OSPF_IFTYPE_POINTOPOINT))
-406
+    {
-407
+      ospf6_lsdb_add (ospf6_lsa_copy (lsa), oi->lsupdate_list);
-408
+      if (oi->thread_send_lsupdate == NULL)
-557
+  struct ospf6_interface *oi;
-558
+  int is_debug = 0;
-559
-560
+  if (IS_OSPF6_DEBUG_FLOODING ||
-561
+      IS_OSPF6_DEBUG_FLOOD_TYPE (lsa->header->type))
-562
+    is_debug++;
-563
-564
+  assert (from && from->ospf6_if);
-565
+  oi = from->ospf6_if;
-566
--
+  /* LSA has been flood back out receiving interface.
--
+     No acknowledgement sent. */
--
+  if (CHECK_FLAG (lsa->flag, OSPF6_LSA_FLOODBACK))
--
+    {
--
+      if (is_debug)
--
+        zlog_debug ("No acknowledgement (BDR & FloodBack)");
--
+      return;
--
+    }
--
-567
+  /* LSA is more recent than database copy, but was not flooded
-568
+     back out receiving interface. Delayed acknowledgement sent
-569
+     if advertisement received from Designated Router,
-570
+     otherwide do nothing. */
-571
+  if (ismore_recent < 0)
-572
+    {
-573
+      if (oi->drouter == from->router_id)
-574
+        {
-575
+          if (is_debug)
-576
+            zlog_debug ("Delayed acknowledgement (BDR & MoreRecent & from DR)");

quagga-snap

Commits

Jira Issues

Add shortcut