matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

2005-11-03 Paul Jakma <paul.jakma@sun.com>

Browse source 
* ospf_packet.c: Change level of some warnings to
	  informational.
This commit is contained in:
paul 2005-11-03 11:15:44 +00:00
parent 9c4f1c6f10
commit 6d45276f0c
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ospfd/ChangeLog
View file

@ -4,6 +4,8 @@
* ospf_packet.c: include checksum.h, remove the in_cksum extern * ospf_packet.c: include checksum.h, remove the in_cksum extern
* prototypes. * prototypes.
* ospf_te.h: Add braces, quell warning. * ospf_te.h: Add braces, quell warning.
* ospf_packet.c: Change level of some warnings to
informational.
2005-10-29 Paul Jakma <paul.jakma@sun.com> 2005-10-29 Paul Jakma <paul.jakma@sun.com>

22
ospfd/ospf_packet.c
View file

@ -755,8 +755,8 @@ ospf_hello (struct ip *iph, struct ospf_header *ospfh,
/* If incoming interface is passive one, ignore Hello. */ /* If incoming interface is passive one, ignore Hello. */
if (OSPF_IF_PARAM (oi, passive_interface) == OSPF_IF_PASSIVE) { if (OSPF_IF_PARAM (oi, passive_interface) == OSPF_IF_PASSIVE) {
char buf[3][INET_ADDRSTRLEN]; char buf[3][INET_ADDRSTRLEN];
zlog_warn("Warning: ignoring HELLO from router %s sent to %s; we " zlog_debug ("ignoring HELLO from router %s sent to %s, "
"should not receive hellos on passive interface %s!", "received on a passive interface, %s",
inet_ntop(AF_INET, &ospfh->router_id, buf[0], sizeof(buf[0])), inet_ntop(AF_INET, &ospfh->router_id, buf[0], sizeof(buf[0])),
inet_ntop(AF_INET, &iph->ip_dst, buf[1], sizeof(buf[1])), inet_ntop(AF_INET, &iph->ip_dst, buf[1], sizeof(buf[1])),
inet_ntop(AF_INET, &oi->address->u.prefix4, inet_ntop(AF_INET, &oi->address->u.prefix4,
@ -1200,7 +1200,7 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh,
else else
{ {
/* We're Master, ignore the initial DBD from Slave */ /* We're Master, ignore the initial DBD from Slave */
zlog_warn ("Packet[DD]: Neighbor %s: Initial DBD from Slave, " zlog_info ("Packet[DD]: Neighbor %s: Initial DBD from Slave, "
"ignoring.", inet_ntoa(nbr->router_id)); "ignoring.", inet_ntoa(nbr->router_id));
break; break;
} }
@ -1235,7 +1235,10 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh,
if (! CHECK_FLAG (nbr->options, OSPF_OPTION_O) if (! CHECK_FLAG (nbr->options, OSPF_OPTION_O)
&& IPV4_ADDR_SAME (&DR (oi), &nbr->address.u.prefix4)) && IPV4_ADDR_SAME (&DR (oi), &nbr->address.u.prefix4))
{ {
zlog_warn ("DR-neighbor[%s] is NOT opaque-capable; Opaque-LSAs cannot be reliably advertised in this network.", inet_ntoa (nbr->router_id)); zlog_warn ("DR-neighbor[%s] is NOT opaque-capable; "
"Opaque-LSAs cannot be reliably advertised "
"in this network.",
inet_ntoa (nbr->router_id));
/* This situation is undesirable, but not a real error. */ /* This situation is undesirable, but not a real error. */
} }
} }
@ -1251,12 +1254,12 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh,
{ {
if (IS_SET_DD_MS (nbr->dd_flags)) if (IS_SET_DD_MS (nbr->dd_flags))
/* Master: discard duplicated DD packet. */ /* Master: discard duplicated DD packet. */
zlog_warn ("Packet[DD] (Master): Neighbor %s packet duplicated.", zlog_info ("Packet[DD] (Master): Neighbor %s packet duplicated.",
inet_ntoa (nbr->router_id)); inet_ntoa (nbr->router_id));
else else
/* Slave: cause to retransmit the last Database Description. */ /* Slave: cause to retransmit the last Database Description. */
{ {
zlog_warn ("Packet[DD] [Slave]: Neighbor %s packet duplicated.", zlog_info ("Packet[DD] [Slave]: Neighbor %s packet duplicated.",
inet_ntoa (nbr->router_id)); inet_ntoa (nbr->router_id));
ospf_db_desc_resend (nbr); ospf_db_desc_resend (nbr);
} }
@ -1279,7 +1282,7 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh,
/* Check initialize bit is set. */ /* Check initialize bit is set. */
if (IS_SET_DD_I (dd->flags)) if (IS_SET_DD_I (dd->flags))
{ {
zlog_warn ("Packet[DD]: Neighbor %s I-bit set.", zlog_info ("Packet[DD]: Neighbor %s I-bit set.",
inet_ntoa(nbr->router_id)); inet_ntoa(nbr->router_id));
OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_SeqNumberMismatch); OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_SeqNumberMismatch);
break; break;
@ -1320,7 +1323,8 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh,
if (IS_SET_DD_MS (nbr->dd_flags)) if (IS_SET_DD_MS (nbr->dd_flags))
{ {
/* Master should discard duplicate DD packet. */ /* Master should discard duplicate DD packet. */
zlog_warn("Packet[DD]: Neighbor %s duplicated, packet discarded.", zlog_info ("Packet[DD]: Neighbor %s duplicated, "
"packet discarded.",
inet_ntoa(nbr->router_id)); inet_ntoa(nbr->router_id));
break; break;
} }
@ -1723,7 +1727,7 @@ ospf_ls_upd (struct ip *iph, struct ospf_header *ospfh,
ospf_ls_ack_send (nbr, lsa); ospf_ls_ack_send (nbr, lsa);
/* Discard LSA. */ /* Discard LSA. */
zlog_warn("Link State Update[%s]: LS age is equal to MaxAge.", zlog_info ("Link State Update[%s]: LS age is equal to MaxAge.",
dump_lsa_key(lsa)); dump_lsa_key(lsa));
DISCARD_LSA (lsa, 3); DISCARD_LSA (lsa, 3);
} }