diff options
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_aspath.c | 6 | ||||
| -rw-r--r-- | bgpd/bgp_ecommunity.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_routemap.c | 6 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 20 |
4 files changed, 18 insertions, 16 deletions
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c index e703941d..a7c72a9d 100644 --- a/bgpd/bgp_aspath.c +++ b/bgpd/bgp_aspath.c @@ -559,7 +559,7 @@ aspath_make_str_count (struct aspath *as) if (seg->type != AS_SEQUENCE) { - str_buf = aspath_expand(str_buf, &str_size, len, 1); + str_buf = aspath_expand(str_buf, &str_size, len, 1); /* %c */ len += snprintf (str_buf + len, str_size - len, "%c", aspath_delimiter_char (seg->type, AS_SEG_START)); @@ -1743,8 +1743,8 @@ aspath_key_make (void *p) static int aspath_cmp (const void *arg1, const void *arg2) { - const struct assegment *seg1 = ((struct aspath *)arg1)->segments; - const struct assegment *seg2 = ((struct aspath *)arg2)->segments; + const struct assegment *seg1 = ((const struct aspath *)arg1)->segments; + const struct assegment *seg2 = ((const struct aspath *)arg2)->segments; while (seg1 || seg2) { diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c index d1aa0767..6152a1db 100644 --- a/bgpd/bgp_ecommunity.c +++ b/bgpd/bgp_ecommunity.c @@ -97,7 +97,7 @@ ecommunity_add_val (struct ecommunity *ecom, struct ecommunity_val *eval) /* This function takes pointer to Extended Communites strucutre then create a new Extended Communities structure by uniq and sort each - Exteneded Communities value. */ + Extended Communities value. */ static struct ecommunity * ecommunity_uniq_sort (struct ecommunity *ecom) { diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index 1ecf4d0a..30e40a1a 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -3316,7 +3316,7 @@ DEFUN (set_ecommunity_rt, "set extcommunity rt .ASN:nn_or_IP-address:nn", SET_STR "BGP extended community attribute\n" - "Route Target extened communityt\n" + "Route Target extended community\n" "VPN extended community\n") { int ret; @@ -3335,7 +3335,7 @@ DEFUN (no_set_ecommunity_rt, NO_STR SET_STR "BGP extended community attribute\n" - "Route Target extened communityt\n") + "Route Target extended community\n") { return bgp_route_set_delete (vty, vty->index, "extcommunity rt", NULL); } @@ -3346,7 +3346,7 @@ ALIAS (no_set_ecommunity_rt, NO_STR SET_STR "BGP extended community attribute\n" - "Route Target extened communityt\n" + "Route Target extended community\n" "VPN extended community\n") DEFUN (set_ecommunity_soo, diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 630f0c22..4157a8d6 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -5090,13 +5090,15 @@ bgp_terminate (void) BGP_NOTIFY_CEASE_PEER_UNCONFIG); bgp_cleanup_routes (); - if (bm->process_main_queue) { - work_queue_free (bm->process_main_queue); - bm->process_main_queue = NULL; - } - if (bm->process_rsclient_queue) { - work_queue_free (bm->process_rsclient_queue); - bm->process_rsclient_queue = NULL; - } + + if (bm->process_main_queue) + { + work_queue_free (bm->process_main_queue); + bm->process_main_queue = NULL; + } + if (bm->process_rsclient_queue) + { + work_queue_free (bm->process_rsclient_queue); + bm->process_rsclient_queue = NULL; + } } - |