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

Allow worker to received asynchronous commands from main.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-01-30 22:21:08 +01:00
parent 014d54e235
commit 995d310694
2 changed files with 89 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/worker-auth.h
View File

@@ -12,8 +12,9 @@
typedef enum {
AUTH_REQ = 1,
AUTH_COOKIE_REQ = 2,
AUTH_REP = 3,
AUTH_COOKIE_REQ,
AUTH_REP,
CMD_TERMINATE,
} cmd_request_t;
typedef enum {
@@ -37,6 +38,14 @@ struct __attribute__ ((__packed__)) cmd_auth_req_st {
char cert_user[MAX_USERNAME_SIZE];
};
struct __attribute__ ((__packed__)) cmd_udp_fd_st {
uint8_t user_pass_present;
char user[MAX_USERNAME_SIZE];
char pass[MAX_PASSWORD_SIZE];
uint8_t tls_auth_ok;
char cert_user[MAX_USERNAME_SIZE];
};
/* AUTH_REP */
struct __attribute__ ((__packed__)) cmd_auth_reply_st {
uint8_t reply;

84
src/worker-vpn.c
View File

@@ -48,6 +48,8 @@
/* HTTP requests prior to disconnection */
#define MAX_HTTP_REQUESTS 8
static int handle_worker_commands(struct worker_st *ws);
static void handle_alarm(int signo)
{
exit(1);
@@ -462,13 +464,13 @@ int ret;
struct req_data_st *req = ws->parser->data;
char buf[256];
fd_set rfds;
int l, pktlen;
int l, pktlen, e;
int tls_fd, max;
unsigned i;
struct vpn_st vinfo;
char* buffer;
unsigned int buffer_size;
int tls_pending;
if (req->cookie_set == 0) {
oclog(ws, LOG_INFO, "Connect request without authentication");
@@ -564,6 +566,7 @@ unsigned int buffer_size;
tls_fd = (long)gnutls_transport_get_ptr(ws->session);
for(;;) {
tls_pending = 0;
FD_ZERO(&rfds);
FD_SET(tls_fd, &rfds);
@@ -572,14 +575,27 @@ unsigned int buffer_size;
max = MAX(ws->cmd_fd,tls_fd);
max = MAX(max,ws->tun_fd);
if (gnutls_record_check_pending(ws->session) == 0) {
tls_pending = gnutls_record_check_pending(ws->session);
if (tls_pending == 0) {
ret = select(max + 1, &rfds, NULL, NULL, NULL);
if (ret <= 0)
break;
}
if (FD_ISSET(ws->cmd_fd, &rfds)) {
ret = handle_worker_commands(ws);
if (ret < 0) {
exit(1);
}
}
if (FD_ISSET(ws->tun_fd, &rfds)) {
int l = read(ws->tun_fd, buf + 8, sizeof(buf) - 8);
l = read(ws->tun_fd, buf + 8, sizeof(buf) - 8);
if (l <= 0) {
e = errno;
oclog(ws, LOG_ERR, "Received corrupt data from tun (%d): %s", l, strerror(e));
exit(1);
}
buf[0] = 'S';
buf[1] = 'T';
buf[2] = 'F';
@@ -593,7 +609,7 @@ unsigned int buffer_size;
GNUTLS_FATAL_ERR(ret);
}
if (FD_ISSET(tls_fd, &rfds) || gnutls_record_check_pending(ws->session)) {
if (FD_ISSET(tls_fd, &rfds) || tls_pending != 0) {
l = tls_recv(ws->session, buf, sizeof(buf));
GNUTLS_FATAL_ERR(l);
@@ -630,7 +646,17 @@ unsigned int buffer_size;
break;
case AC_PKT_DATA:
write(ws->tun_fd, buf + 8, pktlen);
l = write(ws->tun_fd, buf + 8, pktlen);
if (l == -1) {
e = errno;
oclog(ws, LOG_ERR, "Could not write data to tun: %s", strerror(e));
exit(1);
}
if (l != pktlen) {
oclog(ws, LOG_ERR, "Could not write all data to tun");
exit(1);
}
break;
}
}
@@ -641,3 +667,49 @@ unsigned int buffer_size;
return 0;
}
static
int handle_worker_commands(struct worker_st *ws)
{
struct iovec iov[2];
uint8_t cmd;
struct msghdr hdr;
union {
char x[20];
} cmd_data;
int ret, cmd_data_len;
memset(&cmd_data, 0, sizeof(cmd_data));
iov[0].iov_base = &cmd;
iov[0].iov_len = 1;
iov[1].iov_base = &cmd_data;
iov[1].iov_len = sizeof(cmd_data);
memset(&hdr, 0, sizeof(hdr));
hdr.msg_iov = iov;
hdr.msg_iovlen = 2;
ret = recvmsg( ws->cmd_fd, &hdr, 0);
if (ret == -1) {
oclog(ws, LOG_ERR, "Cannot obtain data from command socket.");
exit(1);
}
if (ret == 0) {
exit(1);
}
cmd_data_len = ret - 1;
switch(cmd) {
case CMD_TERMINATE:
exit(0);
default:
oclog(ws, LOG_ERR, "Unknown CMD 0x%x.", (unsigned)cmd);
exit(1);
}
return 0;
}