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

Merge to zebra.org CVS 20030203 16:30GMT

Browse Source
This commit is contained in:
paul 2003-02-03 18:40:56 +00:00
parent 7d7ddde299
commit 37163d6d0c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/ospfd.texi
View File

@ -67,11 +67,12 @@ behaviors implemented in Cisco and IBM routers."
@deffn {OSPF Command} {ospf rfc1583compatibility} {}
@deffnx {OSPF Command} {no ospf rfc1583compatibility} {}
This rfc2328, the sucessor to rfc1583, suggests according to section G.2
(changes) in section 16.4 a change to the path preference algorithm that
prevents possible routing loops that were possible in the old version of
OSPFv2. More specificly it demands that inter-area paths and intra-area path
are now of equal preference but still both preferred to external paths.
This rfc2328, the sucessor to rfc1583, suggests according to section
G.2 (changes) in section 16.4 a change to the path preference
algorithm that prevents possible routing loops that were possible in
the old version of OSPFv2. More specifically it demands that inter-area
paths and intra-area path are now of equal preference but still both
preferred to external paths.
@end deffn
@deffn {OSPF Command} {passive interface @var{interface}} {}

2
ospfd/ospf_lsa.c
View File

@ -2617,6 +2617,8 @@ ospf_lsa_maxage_walker_remover (struct ospf_lsa *lsa, void *p_arg, int int_arg)
switch (lsa->data->type)
{
#ifdef HAVE_OPAQUE_LSA
case OSPF_OPAQUE_LINK_LSA:
case OSPF_OPAQUE_AREA_LSA:
case OSPF_OPAQUE_AS_LSA:
case OSPF_OPAQUE_LINK_LSA:
case OSPF_OPAQUE_AREA_LSA:

11
ospfd/ospf_packet.c
View File

@ -226,10 +226,9 @@ ospf_packet_dup (struct ospf_packet *op)
{
struct ospf_packet *new;
if (stream_get_endp(op->s) != op->length) {
zlog_warn ("ospf_packet_dup stream %d ospf_packet %d size mismatch",
if (stream_get_endp(op->s) != op->length)
zlog_warn ("ospf_packet_dup stream %ld ospf_packet %d size mismatch",
STREAM_SIZE(op->s), op->length);
}
/* Reserve space for MD5 authentication that may be added later. */
new = ospf_packet_new (stream_get_endp(op->s) + OSPF_AUTH_MD5_SIZE);
@ -367,10 +366,8 @@ ospf_make_md5_digest (struct ospf_interface *oi, struct ospf_packet *op)
/* We do *NOT* increment the OSPF header length. */
op->length = ntohs (ospfh->length) + OSPF_AUTH_MD5_SIZE;
if (stream_get_endp(op->s) != op->length) {
zlog_warn("ospf_make_md5_digest: length mismatch stream %d ospf_packet %d",
stream_get_endp(op->s), op->length);
}
if (stream_get_endp(op->s) != op->length)
zlog_warn("ospf_make_md5_digest: length mismatch stream %ld ospf_packet %d", stream_get_endp(op->s), op->length);
return OSPF_AUTH_MD5_SIZE;
}