GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do a more graceful termination of the client if main server closes the CMD fd.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-06-01 13:00:33 +02:00
parent 48c2477d1f
commit 3db871bb43
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vpn.h
View File

@@ -82,6 +82,7 @@ extern int syslog_open;
#define ERR_EXEC -10 #define ERR_EXEC -10
#define ERR_PEER_TERMINATED -11 #define ERR_PEER_TERMINATED -11
#define ERR_CTL -12 #define ERR_CTL -12
#define ERR_NO_CMD_FD -13
#define ERR_WORKER_TERMINATED ERR_PEER_TERMINATED #define ERR_WORKER_TERMINATED ERR_PEER_TERMINATED

2
src/worker-misc.c
View File

@@ -93,7 +93,7 @@ int handle_worker_commands(struct worker_st *ws)
if (ret == 0) { if (ret == 0) {
oclog(ws, LOG_ERR, "parent terminated"); oclog(ws, LOG_ERR, "parent terminated");
exit(0); return ERR_NO_CMD_FD;
} }
if (length > ret - 3) { if (length > ret - 3) {

5
src/worker-vpn.c
View File

@@ -1860,6 +1860,7 @@ static int connect_handler(worker_st * ws)
} }
if (terminate != 0) { if (terminate != 0) {
terminate:
ws->buffer[0] = 'S'; ws->buffer[0] = 'S';
ws->buffer[1] = 'T'; ws->buffer[1] = 'T';
ws->buffer[2] = 'F'; ws->buffer[2] = 'F';
@@ -1936,6 +1937,10 @@ static int connect_handler(worker_st * ws)
/* read commands from command fd */ /* read commands from command fd */
if (FD_ISSET(ws->cmd_fd, &rfds)) { if (FD_ISSET(ws->cmd_fd, &rfds)) {
ret = handle_worker_commands(ws); ret = handle_worker_commands(ws);
if (ret == ERR_NO_CMD_FD) {
goto terminate;
}
if (ret < 0) { if (ret < 0) {
goto exit; goto exit;
} }