Browse Source

[ospfd] Avoid getting NSM stuck in ExStart by using local view of DR/BDR

2006-06-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* ospf_nsm.c: (nsm_twoway_received) When deciding whether to
	  change from state Init to ExStart, the test for whether the
	  neighboring router is DR or BDR should be against the
	  local router's notion of DR/BDR, not the neighbor's view.
Andrew J. Schorr 14 years ago
parent
commit
7694787c19
2 changed files with 9 additions and 2 deletions
  1. 7 0
      ospfd/ChangeLog
  2. 2 2
      ospfd/ospf_nsm.c

+ 7 - 0
ospfd/ChangeLog

@@ -1,3 +1,10 @@
+2006-06-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_nsm.c: (nsm_twoway_received) When deciding whether to
+	  change from state Init to ExStart, the test for whether the
+	  neighboring router is DR or BDR should be against the
+	  local router's notion of DR/BDR, not the neighbor's view.
+
 2006-06-28 Erik Muller <erikm@internap.com>
 
 	* ospfd.h: Define 2 new struct ospf config flags:

+ 2 - 2
ospfd/ospf_nsm.c

@@ -203,8 +203,8 @@ nsm_twoway_received (struct ospf_neighbor *nbr)
     next_state = NSM_ExStart;
 
   /* Neighboring Router is the DRouter or the BDRouter. */
-  if (IPV4_ADDR_SAME (&nbr->address.u.prefix4, &nbr->d_router) ||
-      IPV4_ADDR_SAME (&nbr->address.u.prefix4, &nbr->bd_router))
+  if (IPV4_ADDR_SAME (&nbr->address.u.prefix4, &DR(oi)) ||
+      IPV4_ADDR_SAME (&nbr->address.u.prefix4, &BDR(oi)))
     next_state = NSM_ExStart;
 
   return next_state;