proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 18:04:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2272 from msablic/vtysh_reconnect

Browse Source 
vtysh: reconnect to daemons when connection lost
This commit is contained in:
Quentin Young 2018-05-25 14:09:44 -04:00 committed by GitHub
commit cfb3b1a37d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
vtysh/vtysh.c
View File

@ -86,6 +86,8 @@ struct vtysh_client vtysh_client[] = {
enum vtysh_write_integrated vtysh_write_integrated = enum vtysh_write_integrated vtysh_write_integrated =
WRITE_INTEGRATED_UNSPECIFIED; WRITE_INTEGRATED_UNSPECIFIED;
static int vtysh_reconnect(struct vtysh_client *vclient);
static void vclient_close(struct vtysh_client *vclient) static void vclient_close(struct vtysh_client *vclient)
{ {
if (vclient->fd >= 0) { if (vclient->fd >= 0) {
@ -93,7 +95,8 @@ static void vclient_close(struct vtysh_client *vclient)
"Warning: closing connection to %s because of an I/O error!\n", "Warning: closing connection to %s because of an I/O error!\n",
vclient->name); vclient->name);
close(vclient->fd); close(vclient->fd);
vclient->fd = -1; /* indicate as candidate for reconnect */
vclient->fd = VTYSH_WAS_ACTIVE;
} }
} }
@ -120,12 +123,28 @@ static int vtysh_client_run(struct vtysh_client *vclient, const char *line,
char *bufvalid, *end = NULL; char *bufvalid, *end = NULL;
char terminator[3] = {0, 0, 0}; char terminator[3] = {0, 0, 0};
/* vclinet was previously active, try to reconnect */
if (vclient->fd == VTYSH_WAS_ACTIVE) {
ret = vtysh_reconnect(vclient);
if (ret < 0)
goto out_err;
}
if (vclient->fd < 0) if (vclient->fd < 0)
return CMD_SUCCESS; return CMD_SUCCESS;
ret = write(vclient->fd, line, strlen(line) + 1); ret = write(vclient->fd, line, strlen(line) + 1);
if (ret <= 0) if (ret <= 0) {
goto out_err; /* close connection and try to reconnect */
vclient_close(vclient);
ret = vtysh_reconnect(vclient);
if (ret < 0)
goto out_err;
/* retry line */
ret = write(vclient->fd, line, strlen(line) + 1);
if (ret <= 0)
goto out_err;
}
bufvalid = buf; bufvalid = buf;
do { do {
@ -488,6 +507,13 @@ static int vtysh_execute_func(const char *line, int pager)
struct vtysh_client *vc; struct vtysh_client *vc;
for (i = 0; i < array_size(vtysh_client); i++) { for (i = 0; i < array_size(vtysh_client); i++) {
if (cmd->daemon & vtysh_client[i].flag) { if (cmd->daemon & vtysh_client[i].flag) {
if (vtysh_client[i].fd < 0
&& (cmd->daemon == vtysh_client[i].flag)) {
for (vc = &vtysh_client[i]; vc;
vc = vc->next)
if (vc->fd < 0)
vtysh_reconnect(vc);
}
if (vtysh_client[i].fd < 0 if (vtysh_client[i].fd < 0
&& (cmd->daemon == vtysh_client[i].flag)) { && (cmd->daemon == vtysh_client[i].flag)) {
bool any_inst = false; bool any_inst = false;
@ -3117,6 +3143,22 @@ static int vtysh_connect(struct vtysh_client *vclient)
return 0; return 0;
} }
static int vtysh_reconnect(struct vtysh_client *vclient)
{
int ret;
fprintf(stderr, "Warning: connecting to %s...", vclient->name);
ret = vtysh_connect(vclient);
if (ret < 0) {
fprintf(stderr, "failed!\n");
return ret;
}
fprintf(stderr, "success!\n");
if (vtysh_client_execute(vclient, "enable", NULL) < 0)
return -1;
return vtysh_execute_no_pager("end");
}
/* Return true if str ends with suffix, else return false */ /* Return true if str ends with suffix, else return false */
static int ends_with(const char *str, const char *suffix) static int ends_with(const char *str, const char *suffix)
{ {

2
vtysh/vtysh.h
View File

@ -40,6 +40,8 @@ DECLARE_MGROUP(MVTYSH)
#define VTYSH_SHARPD 0x2000 #define VTYSH_SHARPD 0x2000
#define VTYSH_PBRD 0x4000 #define VTYSH_PBRD 0x4000
#define VTYSH_WAS_ACTIVE (-2)
/* commands in REALLYALL are crucial to correct vtysh operation */ /* commands in REALLYALL are crucial to correct vtysh operation */
#define VTYSH_REALLYALL ~0U #define VTYSH_REALLYALL ~0U
/* watchfrr is not in ALL since library CLI functions should not be /* watchfrr is not in ALL since library CLI functions should not be