proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 11:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ospfd] Raise ExchangeDone earlier, avoid often needless round of DD packets

Browse Source 
2006-08-03 Paul Jakma <paul.jakma@sun.com>

	* ospf_packet.c: (ospf_make_db_desc) Unset the DD More bit
	  after constructing the packet, if appropriate.
	  (ospf_db_desc_proc) Speed up Exchange, slave should raise
	  ExchangeDone earlier, as RFC mandates, by forming its reply
	  before deciding whether both sides are done, avoids a
	  needless round of empty DD packet exchanges at the end of
	  Exchange, hence speeding up ExchangeDone.
	  (ospf_db_desc) use UNSET_FLAG macro.
This commit is contained in:
Paul Jakma 2006-08-27 06:29:30 +00:00
parent ba122e779d
commit 8dd24ee6d7
2 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ospfd/ChangeLog
View File

@ -6,6 +6,17 @@
(ospf_lsdb_delete) ditto. (ospf_lsdb_delete) ditto.
(ospf_lsdb_delete_all) ditto. (ospf_lsdb_delete_all) ditto.
2006-08-03 Paul Jakma <paul.jakma@sun.com>
* ospf_packet.c: (ospf_make_db_desc) Unset the DD More bit
after constructing the packet, if appropriate.
(ospf_db_desc_proc) Speed up Exchange, slave should raise
ExchangeDone earlier, as RFC mandates, by forming its reply
before deciding whether both sides are done, avoids a
needless round of empty DD packet exchanges at the end of
Exchange, hence speeding up ExchangeDone.
(ospf_db_desc) use UNSET_FLAG macro.
2006-07-27 Andrew J. Schorr <ajschorr@alumni.princeton.edu> 2006-07-27 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospfd.c: (ospf_router_id_update) Fix and document the algorithm for * ospfd.c: (ospf_router_id_update) Fix and document the algorithm for

61
ospfd/ospf_packet.c
View File

@ -1055,11 +1055,11 @@ ospf_db_desc_proc (struct stream *s, struct ospf_interface *oi,
if (IS_SET_DD_MS (nbr->dd_flags)) if (IS_SET_DD_MS (nbr->dd_flags))
{ {
nbr->dd_seqnum++; nbr->dd_seqnum++;
/* Entire DD packet sent. */
/* Both sides have no More, then we're done with Exchange */
if (!IS_SET_DD_M (dd->flags) && !IS_SET_DD_M (nbr->dd_flags)) if (!IS_SET_DD_M (dd->flags) && !IS_SET_DD_M (nbr->dd_flags))
OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_ExchangeDone); OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_ExchangeDone);
else else
/* Send new DD packet. */
ospf_db_desc_send (nbr); ospf_db_desc_send (nbr);
} }
/* Slave */ /* Slave */
@ -1067,17 +1067,21 @@ ospf_db_desc_proc (struct stream *s, struct ospf_interface *oi,
{ {
nbr->dd_seqnum = ntohl (dd->dd_seqnum); nbr->dd_seqnum = ntohl (dd->dd_seqnum);
/* When master's more flags is not set. */ /* Send DD packet in reply.
if (!IS_SET_DD_M (dd->flags) && ospf_db_summary_isempty (nbr)) *
{ * Must be done to acknowledge the Master's DD, regardless of
nbr->dd_flags &= ~(OSPF_DD_FLAG_M); * whether we have more LSAs ourselves to describe.
OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_ExchangeDone); *
} * This function will clear the 'More' bit, if after this DD
* we have no more LSAs to describe to the master..
/* Send DD packet in reply. */ */
ospf_db_desc_send (nbr); ospf_db_desc_send (nbr);
/* Slave can raise ExchangeDone now, if master is also done */
if (!IS_SET_DD_M (dd->flags) && !IS_SET_DD_M (nbr->dd_flags))
OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_ExchangeDone);
} }
/* Save received neighbor values from DD. */ /* Save received neighbor values from DD. */
ospf_db_desc_save_current (nbr, dd); ospf_db_desc_save_current (nbr, dd);
} }
@ -1200,7 +1204,9 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh,
zlog_info ("Packet[DD]: Neighbor %s Negotiation done (Slave).", zlog_info ("Packet[DD]: Neighbor %s Negotiation done (Slave).",
inet_ntoa(nbr->router_id)); inet_ntoa(nbr->router_id));
nbr->dd_seqnum = ntohl (dd->dd_seqnum); nbr->dd_seqnum = ntohl (dd->dd_seqnum);
nbr->dd_flags &= ~(OSPF_DD_FLAG_MS|OSPF_DD_FLAG_I); /* Reset I/MS */
/* Reset I/MS */
UNSET_FLAG (nbr->dd_flags, (OSPF_DD_FLAG_MS|OSPF_DD_FLAG_I));
} }
else else
{ {
@ -1217,7 +1223,8 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh,
{ {
zlog_info ("Packet[DD]: Neighbor %s Negotiation done (Master).", zlog_info ("Packet[DD]: Neighbor %s Negotiation done (Master).",
inet_ntoa(nbr->router_id)); inet_ntoa(nbr->router_id));
nbr->dd_flags &= ~OSPF_DD_FLAG_I; /* Reset I, leaving MS */
UNSET_FLAG (nbr->dd_flags, OSPF_DD_FLAG_I);
} }
else else
{ {
@ -2676,7 +2683,7 @@ ospf_make_db_desc (struct ospf_interface *oi, struct ospf_neighbor *nbr,
#endif /* HAVE_OPAQUE_LSA */ #endif /* HAVE_OPAQUE_LSA */
stream_putc (s, options); stream_putc (s, options);
/* Keep pointer to flags. */ /* DD flags */
pp = stream_get_endp (s); pp = stream_get_endp (s);
stream_putc (s, nbr->dd_flags); stream_putc (s, nbr->dd_flags);
@ -2685,12 +2692,21 @@ ospf_make_db_desc (struct ospf_interface *oi, struct ospf_neighbor *nbr,
if (ospf_db_summary_isempty (nbr)) if (ospf_db_summary_isempty (nbr))
{ {
/* Sanity check:
*
* Must be here either:
* - Initial DBD (ospf_nsm.c)
* - M must be set
* or
* - finishing Exchange, and DB-Summary list empty
* - from ospf_db_desc_proc()
* - M must not be set
*/
if (nbr->state >= NSM_Exchange) if (nbr->state >= NSM_Exchange)
{ assert (!IS_SET_DD_M(nbr->dd_flags));
nbr->dd_flags &= ~OSPF_DD_FLAG_M; else
/* Set DD flags again */ assert (IS_SET_DD_M(nbr->dd_flags));
stream_putc_at (s, pp, nbr->dd_flags);
}
return length; return length;
} }
@ -2744,6 +2760,13 @@ ospf_make_db_desc (struct ospf_interface *oi, struct ospf_neighbor *nbr,
} }
} }
/* Update 'More' bit */
if (ospf_db_summary_isempty (nbr))
{
UNSET_FLAG (nbr->dd_flags, OSPF_DD_FLAG_M);
/* Rewrite DD flags */
stream_putc_at (s, pp, nbr->dd_flags);
}
return length; return length;
} }