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

SID is no longer being randomized in main.

Browse Source 
This was unecessary as it is now being set (and generated) by sec-mod.
This commit is contained in:
Nikos Mavrogiannopoulos
2014-06-02 09:28:34 +02:00
parent af7e967063
commit 6f3c07ca2d
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.c
View File

@@ -661,7 +661,7 @@ time_t now;
if (buffer[0] != 22) { if (buffer[0] != 22) {
mslog(s, NULL, LOG_INFO, "unexpected DTLS content type: %u", (unsigned int)buffer[0]); mslog(s, NULL, LOG_INFO, "unexpected DTLS content type: %u", (unsigned int)buffer[0]);
/* Here we received a non-client hello packet. It may be that /* Here we received a non-client hello packet. It may be that
* the client's NAT changed it's UDP source port and the previous * the client's NAT changed its UDP source port and the previous
* connection is invalidated. Try to see if we can simply match * connection is invalidated. Try to see if we can simply match
* the IP address and forward the socket. * the IP address and forward the socket.
*/ */
@@ -700,7 +700,7 @@ time_t now;
} }
if (now - proc_to_send->udp_fd_receive_time <= UDP_FD_RESEND_TIME) { if (now - proc_to_send->udp_fd_receive_time <= UDP_FD_RESEND_TIME) {
mslog(s, proc_to_send, LOG_INFO, "received UDP connection too soon"); mslog(s, proc_to_send, LOG_DEBUG, "received UDP connection too soon");
goto fail; goto fail;
} }
@@ -750,7 +750,7 @@ static void check_other_work(main_server_st *s)
unsigned total = 10; unsigned total = 10;
if (reload_conf != 0) { if (reload_conf != 0) {
mslog(s, NULL, LOG_INFO, "reloading configuration"); mslog(s, NULL, LOG_DEBUG, "reloading configuration");
reload_cfg_file(s->main_pool, s->config); reload_cfg_file(s->main_pool, s->config);
tls_reload_crl(s, s->creds); tls_reload_crl(s, s->creds);
reload_conf = 0; reload_conf = 0;
@@ -1031,13 +1031,6 @@ int main(int argc, char** argv)
} }
set_cloexec_flag (fd, 1); set_cloexec_flag (fd, 1);
ret = gnutls_rnd(GNUTLS_RND_RANDOM, ws->sid, sizeof(ws->sid));
if (ret < 0) {
close(fd);
mslog(s, NULL, LOG_ERR, "Error generating SID");
break;
}
if (s->config->max_clients > 0 && s->active_clients >= s->config->max_clients) { if (s->config->max_clients > 0 && s->active_clients >= s->config->max_clients) {
close(fd); close(fd);
mslog(s, NULL, LOG_INFO, "Reached maximum client limit (active: %u)", s->active_clients); mslog(s, NULL, LOG_INFO, "Reached maximum client limit (active: %u)", s->active_clients);