X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/d2c470fb4e2a7fe6d1d0313a1398f216ae83ec80..0247ea133b707931ce7e33516332dbcfcf6dadb7:/bgp.c?ds=sidebyside diff --git a/bgp.c b/bgp.c index 5d7c578..cf8ab7e 100644 --- a/bgp.c +++ b/bgp.c @@ -10,7 +10,7 @@ * nor RFC2385 (which requires a kernel patch on 2.4 kernels). */ -char const *cvs_id_bgp = "$Id: bgp.c,v 1.5 2004/11/05 04:55:26 bodea Exp $"; +char const *cvs_id_bgp = "$Id: bgp.c,v 1.8 2004/11/29 02:17:17 bodea Exp $"; #include #include @@ -34,7 +34,6 @@ static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head, struct bgp_route_list *new); static void bgp_free_routes(struct bgp_route_list *routes); -static char const *bgp_state_str(enum bgp_state state); static char const *bgp_msg_type_str(u8 type); static int bgp_connect(struct bgp_peer *peer); static int bgp_handle_connect(struct bgp_peer *peer); @@ -47,6 +46,10 @@ static int bgp_send_update(struct bgp_peer *peer); static int bgp_send_notification(struct bgp_peer *peer, u8 code, u8 subcode); static u16 our_as; +static struct bgp_route_list *bgp_routes = 0; + +int bgp_configured = 0; +struct bgp_peer *bgp_peers = 0; /* prepare peer structure, globals */ int bgp_setup(int as) @@ -66,7 +69,7 @@ int bgp_setup(int as) if (!((peer->outbuf = malloc(sizeof(*peer->outbuf))) && (peer->inbuf = malloc(sizeof(*peer->inbuf))))) { - LOG(0, 0, 0, 0, "Can't allocate buffers for bgp peer (%s)\n", + LOG(0, 0, 0, "Can't allocate buffers for bgp peer (%s)\n", strerror(errno)); return 0; @@ -86,7 +89,7 @@ int bgp_setup(int as) } /* start connection with a peer */ -int bgp_start(struct bgp_peer *peer, char *name, int as, int enable) +int bgp_start(struct bgp_peer *peer, char *name, int as, int keepalive, int hold, int enable) { struct hostent *h; int ibgp; @@ -108,7 +111,7 @@ int bgp_start(struct bgp_peer *peer, char *name, int as, int enable) if (!(h = gethostbyname(name)) || h->h_addrtype != AF_INET) { - LOG(0, 0, 0, 0, "Can't get address for BGP peer %s (%s)\n", + LOG(0, 0, 0, "Can't get address for BGP peer %s (%s)\n", name, h ? "no address" : hstrerror(h_errno)); return 0; @@ -118,6 +121,16 @@ int bgp_start(struct bgp_peer *peer, char *name, int as, int enable) peer->as = as > 0 ? as : our_as; ibgp = peer->as == our_as; + /* set initial timer values */ + peer->init_keepalive = keepalive == -1 ? BGP_KEEPALIVE_TIME : keepalive; + peer->init_hold = hold == -1 ? BGP_HOLD_TIME : hold; + + if (peer->init_hold < 3) + peer->init_hold = 3; + + if (peer->init_keepalive * 3 > peer->init_hold) + peer->init_keepalive = peer->init_hold / 3; + /* clear buffers, go to Idle state */ peer->next_state = Idle; bgp_clear(peer); @@ -212,7 +225,7 @@ int bgp_start(struct bgp_peer *peer, char *name, int as, int enable) if (!(peer->path_attrs = malloc(peer->path_attr_len))) { - LOG(0, 0, 0, 0, "Can't allocate path_attrs for %s (%s)\n", + LOG(0, 0, 0, "Can't allocate path_attrs for %s (%s)\n", name, strerror(errno)); return 0; @@ -220,7 +233,7 @@ int bgp_start(struct bgp_peer *peer, char *name, int as, int enable) memcpy(peer->path_attrs, path_attrs, peer->path_attr_len); - LOG(4, 0, 0, 0, "Initiating BGP connection to %s (routing %s)\n", + LOG(4, 0, 0, "Initiating BGP connection to %s (routing %s)\n", name, enable ? "enabled" : "suspended"); /* we have at least one peer configured */ @@ -241,9 +254,11 @@ static void bgp_clear(struct bgp_peer *peer) } peer->keepalive_time = 0; - peer->hold = 0; peer->expire_time = 0; + peer->keepalive = peer->init_keepalive; + peer->hold = peer->init_hold; + bgp_free_routes(peer->routes); peer->routes = 0; @@ -259,7 +274,7 @@ static void bgp_clear(struct bgp_peer *peer) peer->state = peer->next_state; peer->state_time = time_now; - LOG(4, 0, 0, 0, "BGP peer %s: state %s\n", peer->name, + LOG(4, 0, 0, "BGP peer %s: state %s\n", peer->name, bgp_state_str(peer->next_state)); } } @@ -267,14 +282,14 @@ static void bgp_clear(struct bgp_peer *peer) /* initiate a clean shutdown */ void bgp_stop(struct bgp_peer *peer) { - LOG(4, 0, 0, 0, "Terminating BGP connection to %s\n", peer->name); + LOG(4, 0, 0, "Terminating BGP connection to %s\n", peer->name); bgp_send_notification(peer, BGP_ERR_CEASE, 0); } /* drop connection (if any) and set state to Disabled */ void bgp_halt(struct bgp_peer *peer) { - LOG(4, 0, 0, 0, "Aborting BGP connection to %s\n", peer->name); + LOG(4, 0, 0, "Aborting BGP connection to %s\n", peer->name); peer->next_state = Disabled; bgp_clear(peer); } @@ -384,8 +399,8 @@ int bgp_add_route(in_addr_t ip, in_addr_t mask) /* insert into route list; sorted */ if (!(r = malloc(sizeof(*r)))) { - LOG(0, 0, 0, 0, "Can't allocate route for %s/%d (%s)\n", - inet_toa(add.dest.prefix), add.dest.len, strerror(errno)); + LOG(0, 0, 0, "Can't allocate route for %s/%d (%s)\n", + fmtaddr(add.dest.prefix, 0), add.dest.len, strerror(errno)); return 0; } @@ -398,8 +413,8 @@ int bgp_add_route(in_addr_t ip, in_addr_t mask) if (bgp_peers[i].state == Established) bgp_peers[i].update_routes = 1; - LOG(4, 0, 0, 0, "Registered BGP route %s/%d\n", inet_toa(add.dest.prefix), - add.dest.len); + LOG(4, 0, 0, "Registered BGP route %s/%d\n", + fmtaddr(add.dest.prefix, 0), add.dest.len); return 1; } @@ -447,8 +462,8 @@ int bgp_del_route(in_addr_t ip, in_addr_t mask) if (bgp_peers[i].state == Established) bgp_peers[i].update_routes = 1; - LOG(4, 0, 0, 0, "Removed BGP route %s/%d\n", inet_toa(del.dest.prefix), - del.dest.len); + LOG(4, 0, 0, "Removed BGP route %s/%d\n", + fmtaddr(del.dest.prefix, 0), del.dest.len); return 1; } @@ -467,7 +482,7 @@ void bgp_enable_routing(int enable) bgp_peers[i].update_routes = 1; } - LOG(4, 0, 0, 0, "%s BGP routing\n", enable ? "Enabled" : "Suspended"); + LOG(4, 0, 0, "%s BGP routing\n", enable ? "Enabled" : "Suspended"); } /* return a bitmask indicating if the socket should be added to the @@ -573,7 +588,7 @@ int bgp_process(struct bgp_peer *peer, int readable, int writable) { if (time_now > peer->expire_time) { - LOG(1, 0, 0, 0, "No message from BGP peer %s in %ds\n", + LOG(1, 0, 0, "No message from BGP peer %s in %ds\n", peer->name, peer->hold); bgp_send_notification(peer, BGP_ERR_HOLD_TIMER_EXP, 0); @@ -588,9 +603,9 @@ int bgp_process(struct bgp_peer *peer, int readable, int writable) if (time_now > peer->retry_time) return bgp_connect(peer); } - else if (time_now > peer->state_time + BGP_KEEPALIVE_TIME) + else if (time_now > peer->state_time + BGP_STATE_TIME) { - LOG(1, 0, 0, 0, "%s timer expired for BGP peer %s\n", + LOG(1, 0, 0, "%s timer expired for BGP peer %s\n", bgp_state_str(peer->state), peer->name); return bgp_restart(peer); @@ -610,7 +625,7 @@ static void bgp_free_routes(struct bgp_route_list *routes) } } -static char const *bgp_state_str(enum bgp_state state) +char const *bgp_state_str(enum bgp_state state) { switch (state) { @@ -650,7 +665,7 @@ static int bgp_connect(struct bgp_peer *peer) struct servent *serv; if (!(serv = getservbyname("bgp", "tcp"))) { - LOG(0, 0, 0, 0, "Can't get bgp service (%s)\n", strerror(errno)); + LOG(0, 0, 0, "Can't get bgp service (%s)\n", strerror(errno)); return 0; } @@ -659,7 +674,7 @@ static int bgp_connect(struct bgp_peer *peer) if ((peer->sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { - LOG(0, 0, 0, 0, "Can't create a socket for BGP peer %s (%s)\n", + LOG(0, 0, 0, "Can't create a socket for BGP peer %s (%s)\n", peer->name, strerror(errno)); peer->state = peer->next_state = Disabled; @@ -682,7 +697,7 @@ static int bgp_connect(struct bgp_peer *peer) if (errno != EINPROGRESS) { - LOG(1, 0, 0, 0, "Can't connect to BGP peer %s (%s)\n", + LOG(1, 0, 0, "Can't connect to BGP peer %s (%s)\n", inet_ntoa(addr.sin_addr), strerror(errno)); bgp_set_retry(peer); @@ -692,7 +707,7 @@ static int bgp_connect(struct bgp_peer *peer) peer->state = Connect; peer->state_time = time_now; - LOG(4, 0, 0, 0, "BGP peer %s: state Connect\n", peer->name); + LOG(4, 0, 0, "BGP peer %s: state Connect\n", peer->name); return 1; } @@ -700,7 +715,7 @@ static int bgp_connect(struct bgp_peer *peer) peer->state_time = time_now; peer->retry_time = peer->retry_count = 0; - LOG(4, 0, 0, 0, "BGP peer %s: state Active\n", inet_ntoa(addr.sin_addr)); + LOG(4, 0, 0, "BGP peer %s: state Active\n", inet_ntoa(addr.sin_addr)); return bgp_send_open(peer); } @@ -713,7 +728,7 @@ static int bgp_handle_connect(struct bgp_peer *peer) getsockopt(peer->sock, SOL_SOCKET, SO_ERROR, &err, &len); if (err) { - LOG(1, 0, 0, 0, "Can't connect to BGP peer %s (%s)\n", peer->name, + LOG(1, 0, 0, "Can't connect to BGP peer %s (%s)\n", peer->name, strerror(err)); bgp_set_retry(peer); @@ -723,7 +738,7 @@ static int bgp_handle_connect(struct bgp_peer *peer) peer->state = Active; peer->state_time = time_now; - LOG(4, 0, 0, 0, "BGP peer %s: state Active\n", peer->name); + LOG(4, 0, 0, "BGP peer %s: state Active\n", peer->name); return bgp_send_open(peer); } @@ -744,9 +759,9 @@ static int bgp_write(struct bgp_peer *peer) return 1; if (errno == EPIPE) - LOG(1, 0, 0, 0, "Connection to BGP peer %s closed\n", peer->name); + LOG(1, 0, 0, "Connection to BGP peer %s closed\n", peer->name); else - LOG(1, 0, 0, 0, "Can't write to BGP peer %s (%s)\n", peer->name, + LOG(1, 0, 0, "Can't write to BGP peer %s (%s)\n", peer->name, strerror(errno)); bgp_set_retry(peer); @@ -759,14 +774,14 @@ static int bgp_write(struct bgp_peer *peer) return 1; } - LOG(4, 0, 0, 0, "Sent %s to BGP peer %s\n", + LOG(4, 0, 0, "Sent %s to BGP peer %s\n", bgp_msg_type_str(peer->outbuf->packet.header.type), peer->name); peer->outbuf->packet.header.len = 0; peer->outbuf->done = 0; if (peer->state == Established) - peer->keepalive_time = time_now + BGP_KEEPALIVE_TIME; + peer->keepalive_time = time_now + peer->keepalive; if (peer->state != peer->next_state) { @@ -779,7 +794,7 @@ static int bgp_write(struct bgp_peer *peer) peer->state = peer->next_state; peer->state_time = time_now; - LOG(4, 0, 0, 0, "BGP peer %s: state %s\n", peer->name, + LOG(4, 0, 0, "BGP peer %s: state %s\n", peer->name, bgp_state_str(peer->state)); } @@ -796,7 +811,7 @@ static int bgp_read(struct bgp_peer *peer) { if (!r) { - LOG(1, 0, 0, 0, "Connection to BGP peer %s closed\n", peer->name); + LOG(1, 0, 0, "Connection to BGP peer %s closed\n", peer->name); } else { @@ -806,7 +821,7 @@ static int bgp_read(struct bgp_peer *peer) if (errno == EAGAIN) return 1; - LOG(1, 0, 0, 0, "Can't read from BGP peer %s (%s)\n", peer->name, + LOG(1, 0, 0, "Can't read from BGP peer %s (%s)\n", peer->name, strerror(errno)); } @@ -826,7 +841,7 @@ static int bgp_handle_input(struct bgp_peer *peer) if (len > BGP_MAX_PACKET_SIZE) { - LOG(1, 0, 0, 0, "Bad header length from BGP %s\n", peer->name); + LOG(1, 0, 0, "Bad header length from BGP %s\n", peer->name); bgp_send_notification(peer, BGP_ERR_HEADER, BGP_ERR_HDR_BAD_LEN); return 0; } @@ -834,7 +849,7 @@ static int bgp_handle_input(struct bgp_peer *peer) if (peer->inbuf->done < len) return 0; - LOG(4, 0, 0, 0, "Received %s from BGP peer %s\n", + LOG(4, 0, 0, "Received %s from BGP peer %s\n", bgp_msg_type_str(p->header.type), peer->name); switch (p->header.type) @@ -842,13 +857,14 @@ static int bgp_handle_input(struct bgp_peer *peer) case BGP_MSG_OPEN: { struct bgp_data_open data; + int hold; int i; for (i = 0; i < sizeof(p->header.marker); i++) { if ((unsigned char) p->header.marker[i] != 0xff) { - LOG(1, 0, 0, 0, "Invalid marker from BGP peer %s\n", + LOG(1, 0, 0, "Invalid marker from BGP peer %s\n", peer->name); bgp_send_notification(peer, BGP_ERR_HEADER, @@ -860,7 +876,7 @@ static int bgp_handle_input(struct bgp_peer *peer) if (peer->state != OpenSent) { - LOG(1, 0, 0, 0, "OPEN from BGP peer %s in %s state\n", + LOG(1, 0, 0, "OPEN from BGP peer %s in %s state\n", peer->name, bgp_state_str(peer->state)); bgp_send_notification(peer, BGP_ERR_FSM, 0); @@ -871,7 +887,7 @@ static int bgp_handle_input(struct bgp_peer *peer) if (data.version != BGP_VERSION) { - LOG(1, 0, 0, 0, "Bad version (%d) sent by BGP peer %s\n", + LOG(1, 0, 0, "Bad version (%d) sent by BGP peer %s\n", (int) data.version, peer->name); bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_VERSION); @@ -880,7 +896,7 @@ static int bgp_handle_input(struct bgp_peer *peer) if (ntohs(data.as) != peer->as) { - LOG(1, 0, 0, 0, "Bad AS sent by BGP peer %s (got %d, " + LOG(1, 0, 0, "Bad AS sent by BGP peer %s (got %d, " "expected %d)\n", peer->name, (int) htons(data.as), (int) peer->as); @@ -888,15 +904,23 @@ static int bgp_handle_input(struct bgp_peer *peer) return 0; } - if ((peer->hold = ntohs(data.hold_time)) < 10) + if ((hold = ntohs(data.hold_time)) < 3) { - LOG(1, 0, 0, 0, "Bad hold time (%d) from BGP peer %s\n", - peer->hold, peer->name); + LOG(1, 0, 0, "Bad hold time (%d) from BGP peer %s\n", + hold, peer->name); bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_HOLD_TIME); return 0; } + /* pick lowest hold time */ + if (hold < peer->hold) + peer->hold = hold; + + /* adjust our keepalive based on negotiated hold value */ + if (peer->keepalive * 3 > peer->hold) + peer->keepalive = peer->hold / 3; + /* next transition requires an exchange of keepalives */ bgp_send_keepalive(peer); @@ -910,12 +934,12 @@ static int bgp_handle_input(struct bgp_peer *peer) { peer->state = peer->next_state = Established; peer->state_time = time_now; - peer->keepalive_time = time_now + BGP_KEEPALIVE_TIME; + peer->keepalive_time = time_now + peer->keepalive; peer->update_routes = 1; peer->retry_count = 0; peer->retry_time = 0; - LOG(4, 0, 0, 0, "BGP peer %s: state Established\n", peer->name); + LOG(4, 0, 0, "BGP peer %s: state Established\n", peer->name); } break; @@ -928,13 +952,13 @@ static int bgp_handle_input(struct bgp_peer *peer) if (notification->error_code == BGP_ERR_CEASE) { - LOG(4, 0, 0, 0, "BGP peer %s sent CEASE\n", peer->name); + LOG(4, 0, 0, "BGP peer %s sent CEASE\n", peer->name); bgp_halt(peer); return 0; } /* FIXME: should handle more notifications */ - LOG(4, 0, 0, 0, "BGP peer %s sent unhandled NOTIFICATION %d\n", + LOG(4, 0, 0, "BGP peer %s sent unhandled NOTIFICATION %d\n", peer->name, (int) notification->error_code); } @@ -972,7 +996,7 @@ static int bgp_send_open(struct bgp_peer *peer) data.version = BGP_VERSION; data.as = htons(our_as); - data.hold_time = htons(BGP_HOLD_TIME); + data.hold_time = htons(peer->hold); data.identifier = my_address; data.opt_len = 0; @@ -1053,8 +1077,8 @@ static int bgp_send_update(struct bgp_peer *peer) unf_len += s; len += s; - LOG(5, 0, 0, 0, "Withdrawing route %s/%d from BGP peer %s\n", - inet_toa(tmp->dest.prefix), tmp->dest.len, peer->name); + LOG(5, 0, 0, "Withdrawing route %s/%d from BGP peer %s\n", + fmtaddr(tmp->dest.prefix, 0), tmp->dest.len, peer->name); free(tmp); @@ -1103,8 +1127,8 @@ static int bgp_send_update(struct bgp_peer *peer) { if (!(e = malloc(sizeof(*e)))) { - LOG(0, 0, 0, 0, "Can't allocate route for %s/%d (%s)\n", - inet_toa(add->dest.prefix), add->dest.len, strerror(errno)); + LOG(0, 0, 0, "Can't allocate route for %s/%d (%s)\n", + fmtaddr(add->dest.prefix, 0), add->dest.len, strerror(errno)); return 0; } @@ -1127,8 +1151,8 @@ static int bgp_send_update(struct bgp_peer *peer) data += s; len += s; - LOG(5, 0, 0, 0, "Advertising route %s/%d to BGP peer %s\n", - inet_toa(add->dest.prefix), add->dest.len, peer->name); + LOG(5, 0, 0, "Advertising route %s/%d to BGP peer %s\n", + fmtaddr(add->dest.prefix, 0), add->dest.len, peer->name); } else { @@ -1174,159 +1198,3 @@ static int bgp_send_notification(struct bgp_peer *peer, u8 code, u8 subcode) return bgp_write(peer); } - -/* CLI stuff */ - -#include - -int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc) -{ - int i; - int hdr = 0; - char *addr; - - if (!bgp_configured) - return CLI_OK; - - if (CLI_HELP_REQUESTED) - return cli_arg_help(cli, 1, - "A.B.C.D", "BGP peer address", - "NAME", "BGP peer name", - NULL); - - cli_print(cli, "BGPv%d router identifier %s, local AS number %d, " - "hold time %ds", BGP_VERSION, inet_toa(my_address), (int) our_as, - BGP_HOLD_TIME); - - time(&time_now); - - for (i = 0; i < BGP_NUM_PEERS; i++) - { - if (!*bgp_peers[i].name) - continue; - - addr = inet_toa(bgp_peers[i].addr); - if (argc && strcmp(addr, argv[0]) && - strncmp(bgp_peers[i].name, argv[0], strlen(argv[0]))) - continue; - - if (!hdr++) - { - cli_print(cli, ""); - cli_print(cli, "Peer AS Address " - "State Retries Retry in Route Pend"); - cli_print(cli, "------------------ ----- --------------- " - "----------- ------- -------- ----- ----"); - } - - cli_print(cli, "%-18.18s %5d %15s %-11s %7d %7ds %5s %4s", - bgp_peers[i].name, - bgp_peers[i].as, - addr, - bgp_state_str(bgp_peers[i].state), - bgp_peers[i].retry_count, - bgp_peers[i].retry_time ? bgp_peers[i].retry_time - time_now : 0, - bgp_peers[i].routing ? "yes" : "no", - bgp_peers[i].update_routes ? "yes" : "no"); - } - - return CLI_OK; -} - -int cmd_suspend_bgp(struct cli_def *cli, char *command, char **argv, int argc) -{ - int i; - char *addr; - - if (!bgp_configured) - return CLI_OK; - - if (CLI_HELP_REQUESTED) - return cli_arg_help(cli, 1, - "A.B.C.D", "BGP peer address", - "NAME", "BGP peer name", - NULL); - - for (i = 0; i < BGP_NUM_PEERS; i++) - { - if (bgp_peers[i].state != Established) - continue; - - if (!bgp_peers[i].routing) - continue; - - addr = inet_toa(bgp_peers[i].addr); - if (argc && strcmp(addr, argv[0]) && strcmp(bgp_peers[i].name, argv[0])) - continue; - - bgp_peers[i].cli_flag = BGP_CLI_SUSPEND; - cli_print(cli, "Suspending peer %s", bgp_peers[i].name); - } - - return CLI_OK; -} - -int cmd_no_suspend_bgp(struct cli_def *cli, char *command, char **argv, int argc) -{ - int i; - char *addr; - - if (!bgp_configured) - return CLI_OK; - - if (CLI_HELP_REQUESTED) - return cli_arg_help(cli, 1, - "A.B.C.D", "BGP peer address", - "NAME", "BGP peer name", - NULL); - - for (i = 0; i < BGP_NUM_PEERS; i++) - { - if (bgp_peers[i].state != Established) - continue; - - if (bgp_peers[i].routing) - continue; - - addr = inet_toa(bgp_peers[i].addr); - if (argc && strcmp(addr, argv[0]) && - strncmp(bgp_peers[i].name, argv[0], strlen(argv[0]))) - continue; - - bgp_peers[i].cli_flag = BGP_CLI_ENABLE; - cli_print(cli, "Un-suspending peer %s", bgp_peers[i].name); - } - - return CLI_OK; -} - -int cmd_restart_bgp(struct cli_def *cli, char *command, char **argv, int argc) -{ - int i; - char *addr; - - if (!bgp_configured) - return CLI_OK; - - if (CLI_HELP_REQUESTED) - return cli_arg_help(cli, 1, - "A.B.C.D", "BGP peer address", - "NAME", "BGP peer name", - NULL); - - for (i = 0; i < BGP_NUM_PEERS; i++) - { - if (!*bgp_peers[i].name) - continue; - - addr = inet_toa(bgp_peers[i].addr); - if (argc && strcmp(addr, argv[0]) && - strncmp(bgp_peers[i].name, argv[0], strlen(argv[0]))) - continue; - - bgp_peers[i].cli_flag = BGP_CLI_RESTART; - cli_print(cli, "Restarting peer %s", bgp_peers[i].name); - } - - return CLI_OK; -}