Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If connect fails let other side accept connection and come back #29

Closed
wants to merge 1 commit into from
Closed

If connect fails let other side accept connection and come back #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions server-unixsock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@


static size_t max_unixsock_dev_strlen(void);
static int connect_unixsock_obj_int(obj_t *unixsock, int reset_delay);
static int connect_unixsock_obj(obj_t *unixsock);
static int disconnect_unixsock_obj(obj_t *unixsock);
static int open_unixsock_obj_reset_delay(obj_t *unixsock);
static void reset_unixsock_delay(obj_t *unixsock);

extern tpoll_t tp_global; /* defined in server.c */
Expand Down Expand Up @@ -147,7 +149,7 @@ obj_t * create_unixsock_obj(server_conf_t *conf, char *name, char *dev,
list_append(conf->objs, unixsock);

rv = inevent_add(unixsock->aux.unixsock.dev,
(inevent_cb_f) open_unixsock_obj, unixsock);
(inevent_cb_f) open_unixsock_obj_reset_delay, unixsock);
if (rv < 0) {
log_msg(LOG_INFO,
"Console [%s] unable to register device \"%s\" for inotify events",
Expand All @@ -157,7 +159,7 @@ obj_t * create_unixsock_obj(server_conf_t *conf, char *name, char *dev,
}


int open_unixsock_obj(obj_t *unixsock)
static int open_unixsock_obj_int(obj_t *unixsock, int reset_delay)
{
/* (Re)opens the specified 'unixsock' obj.
* Returns 0 if the console is successfully opened; o/w, returns -1.
Expand All @@ -171,11 +173,18 @@ int open_unixsock_obj(obj_t *unixsock)
rc = disconnect_unixsock_obj(unixsock);
}
else {
rc = connect_unixsock_obj(unixsock);
rc = connect_unixsock_obj_int(unixsock, reset_delay);
}
return(rc);
}

int open_unixsock_obj(obj_t *unixsock) {
return open_unixsock_obj_int(unixsock, 0);
}

int open_unixsock_obj_reset_delay(obj_t *unixsock) {
return open_unixsock_obj_int(unixsock, 1);
}

static size_t max_unixsock_dev_strlen(void)
{
Expand All @@ -193,7 +202,7 @@ static size_t max_unixsock_dev_strlen(void)
}


static int connect_unixsock_obj(obj_t *unixsock)
static int connect_unixsock_obj_int(obj_t *unixsock, int reset_delay)
{
/* Opens a connection to the specified (unixsock) obj.
* Returns 0 if the connection is successfully completed; o/w, returns -1.
Expand Down Expand Up @@ -257,6 +266,8 @@ static int connect_unixsock_obj(obj_t *unixsock)
(struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
log_msg(LOG_INFO, "Console [%s] cannot connect to device \"%s\": %s",
unixsock->name, auxp->dev, strerror(errno));
if (reset_delay)
reset_unixsock_delay(unixsock);
return(disconnect_unixsock_obj(unixsock));
}
/* Write-locking the unix domain socket appears ineffective. But since
Expand Down Expand Up @@ -284,6 +295,9 @@ static int connect_unixsock_obj(obj_t *unixsock)
return(0);
}

static int connect_unixsock_obj(obj_t *unixsock) {
return connect_unixsock_obj_int(unixsock, 0);
}

static int disconnect_unixsock_obj(obj_t *unixsock)
{
Expand Down