proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-28 23:11:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bfdd: move bfd_ses_[xx] to bfd_sess_[xx] like other routines

Browse Source 
this is a change to be more consistent with function naming convention
in bfd. a small change for 3 functions.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2019-04-11 10:25:55 +02:00
parent 1ac865e7d4
commit bc50bcc83c
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bfdd/bfd.c
View File

@ -291,7 +291,7 @@ void ptm_bfd_echo_start(struct bfd_session *bfd)
ptm_bfd_echo_xmt_TO(bfd);
}
void ptm_bfd_ses_up(struct bfd_session *bfd)
void ptm_bfd_sess_up(struct bfd_session *bfd)
{
int old_state = bfd->ses_state;
@ -315,7 +315,7 @@ void ptm_bfd_ses_up(struct bfd_session *bfd)
}
}
void ptm_bfd_ses_dn(struct bfd_session *bfd, uint8_t diag)
void ptm_bfd_sess_dn(struct bfd_session *bfd, uint8_t diag)
{
int old_state = bfd->ses_state;
@ -432,7 +432,7 @@ int bfd_recvtimer_cb(struct thread *t)
switch (bs->ses_state) {
case PTM_BFD_INIT:
case PTM_BFD_UP:
ptm_bfd_ses_dn(bs, BD_CONTROL_EXPIRED);
ptm_bfd_sess_dn(bs, BD_CONTROL_EXPIRED);
bfd_recvtimer_update(bs);
break;
@ -455,7 +455,7 @@ int bfd_echo_recvtimer_cb(struct thread *t)
switch (bs->ses_state) {
case PTM_BFD_INIT:
case PTM_BFD_UP:
ptm_bfd_ses_dn(bs, BD_ECHO_FAILED);
ptm_bfd_sess_dn(bs, BD_ECHO_FAILED);
break;
}
@ -725,7 +725,7 @@ struct bfd_session *ptm_bfd_sess_new(struct bfd_peer_cfg *bpc)
return bfd;
}
int ptm_bfd_ses_del(struct bfd_peer_cfg *bpc)
int ptm_bfd_sess_del(struct bfd_peer_cfg *bpc)
{
struct bfd_session *bs;
@ -805,7 +805,7 @@ static void bs_down_handler(struct bfd_session *bs, int nstate)
* Remote peer told us his path is up, lets turn
* activate the session.
*/
ptm_bfd_ses_up(bs);
ptm_bfd_sess_up(bs);
break;
default:
@ -832,7 +832,7 @@ static void bs_init_handler(struct bfd_session *bs, int nstate)
case PTM_BFD_INIT:
case PTM_BFD_UP:
/* We agreed on the settings and the path is up. */
ptm_bfd_ses_up(bs);
ptm_bfd_sess_up(bs);
break;
default:
@ -847,7 +847,7 @@ static void bs_up_handler(struct bfd_session *bs, int nstate)
case PTM_BFD_ADM_DOWN:
case PTM_BFD_DOWN:
/* Peer lost or asked to shutdown connection. */
ptm_bfd_ses_dn(bs, BD_NEIGHBOR_DOWN);
ptm_bfd_sess_dn(bs, BD_NEIGHBOR_DOWN);
break;
case PTM_BFD_INIT:

6
bfdd/bfd.h
View File

@ -505,9 +505,9 @@ void bfd_echo_xmttimer_assign(struct bfd_session *bs, bfd_ev_cb cb);
int bfd_session_enable(struct bfd_session *bs);
void bfd_session_disable(struct bfd_session *bs);
struct bfd_session *ptm_bfd_sess_new(struct bfd_peer_cfg *bpc);
int ptm_bfd_ses_del(struct bfd_peer_cfg *bpc);
void ptm_bfd_ses_dn(struct bfd_session *bfd, uint8_t diag);
void ptm_bfd_ses_up(struct bfd_session *bfd);
int ptm_bfd_sess_del(struct bfd_peer_cfg *bpc);
void ptm_bfd_sess_dn(struct bfd_session *bfd, uint8_t diag);
void ptm_bfd_sess_up(struct bfd_session *bfd);
void ptm_bfd_echo_stop(struct bfd_session *bfd);
void ptm_bfd_echo_start(struct bfd_session *bfd);
void ptm_bfd_xmt_TO(struct bfd_session *bfd, int fbit);

2
bfdd/bfdd_vty.c
View File

@ -360,7 +360,7 @@ DEFPY(bfd_no_peer, bfd_no_peer_cmd,
return CMD_WARNING_CONFIG_FAILED;
}
if (ptm_bfd_ses_del(&bpc) != 0) {
if (ptm_bfd_sess_del(&bpc) != 0) {
vty_out(vty, "%% Failed to remove peer.\n");
return CMD_WARNING_CONFIG_FAILED;
}

2
bfdd/config.c
View File

@ -68,7 +68,7 @@ static int config_add(struct bfd_peer_cfg *bpc,
static int config_del(struct bfd_peer_cfg *bpc,
void *arg __attribute__((unused)))
{
return ptm_bfd_ses_del(bpc) != 0;
return ptm_bfd_sess_del(bpc) != 0;
}
static int parse_config_json(struct json_object *jo, bpc_handle h, void *arg)

2
bfdd/ptm_adapter.c
View File

@ -434,7 +434,7 @@ static void bfdd_dest_deregister(struct stream *msg)
if (bs->refcount ||
BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG))
return;
ptm_bfd_ses_del(&bpc);
ptm_bfd_sess_del(&bpc);
}
/*