summaryrefslogtreecommitdiff
path: root/bgpd/bgp_nexthop.c
diff options
context:
space:
mode:
authorhasso <hasso>2005-02-01 20:13:16 +0000
committerhasso <hasso>2005-02-01 20:13:16 +0000
commitf418446bb767d79438e2df689c5bf9563c54b317 (patch)
treea1c7322c8b54e46a09bf2f402537277fff59c1c3 /bgpd/bgp_nexthop.c
parent6a52d0d155fc8b892e30cdb5e3fbe4c2779bd4cd (diff)
* bgp_nexthop.c: Improve debug.
* bgpd.[ch], bgp_nexthop.c, bgp_snmp.c: Remove useless bgp_get_master() function. * bgp_packet.c: MP AFI_IP update and withdraw parsing. * bgp_fsm.c: Reset peer synctime in bgp_stop(). bgp_fsm_change_status() is better place to log about peer status change than bgp_event(). Log in bgp_connect_success(). * bgp_vty.c: Fix typo in comment. * bgp_attr.c: Better log about unknown attribute. [merge from GNU Zebra]
Diffstat (limited to 'bgpd/bgp_nexthop.c')
-rw-r--r--bgpd/bgp_nexthop.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index c368eba5..76c1c2a1 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -507,6 +507,14 @@ bgp_scan (afi_t afi, safi_t safi)
bgp_nexthop_cache_reset (cache2_table[afi]);
else
bgp_nexthop_cache_reset (cache1_table[afi]);
+
+ if (BGP_DEBUG (events, EVENTS))
+ {
+ if (afi == AFI_IP)
+ zlog_debug ("scanning IPv4 Unicast routing tables");
+ else if (afi == AFI_IP6)
+ zlog_debug ("scanning IPv6 Unicast routing tables");
+ }
}
/* BGP scan thread. This thread check nexthop reachability. */
@@ -516,7 +524,7 @@ bgp_scan_timer (struct thread *t)
bgp_scan_thread =
thread_add_timer (master, bgp_scan_timer, NULL, bgp_scan_interval);
- if (BGP_DEBUG (normal, NORMAL))
+ if (BGP_DEBUG (events, EVENTS))
zlog_debug ("Performing BGP general scanning");
bgp_scan (AFI_IP, SAFI_UNICAST);
@@ -1022,7 +1030,6 @@ bgp_import_check (struct prefix *p, u_int32_t *igpmetric, struct in_addr *igpnex
int
bgp_import (struct thread *t)
{
- struct bgp_master *bm;
struct bgp *bgp;
struct bgp_node *rn;
struct bgp_static *bgp_static;
@@ -1036,9 +1043,8 @@ bgp_import (struct thread *t)
bgp_import_thread =
thread_add_timer (master, bgp_import, NULL, bgp_import_interval);
- bm = bgp_get_master ();
- if (! bm)
- return 0;
+ if (BGP_DEBUG (events, EVENTS))
+ zlog_debug ("Import timer expired.");
LIST_LOOP (bm->bgp, bgp, nn)
{