MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 16:22:35 +01:00
Code Issues Releases Wiki Activity

ircd: Handle which_ssld failure

Browse source 
It's possible for which_ssld to fail and return NULL, handle this in
start_ssld_connect and start_ssld_accept by returning NULL. The NULL
return value is already handled in all calls to start_ssld_accept,
so handle this for start_ssld_connect by reporting an error connecting.

Handle it in start_zlib_session by exiting the client.
This commit is contained in:
Simon Arlott 2016-02-10 22:25:23 +00:00
parent b9ff4868a9
commit 5e270e7d89
No known key found for this signature in database
GPG key ID: BAFFFF5FF5FFAAAF
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ircd/s_serv.c
View file

@ -1157,6 +1157,11 @@ serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
add_to_cli_connid_hash(client_p); add_to_cli_connid_hash(client_p);
client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0])); client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0]));
if(!client_p->localClient->ssl_ctl)
{
serv_connect_callback(client_p->localClient->F, RB_ERROR, data);
return;
}
SetSSL(client_p); SetSSL(client_p);
serv_connect_callback(client_p->localClient->F, RB_OK, client_p); serv_connect_callback(client_p->localClient->F, RB_OK, client_p);
} }

10
ircd/sslproc.c
View file

@ -703,6 +703,8 @@ start_ssld_accept(rb_fde_t * sslF, rb_fde_t * plainF, uint32_t id)
buf[0] = 'A'; buf[0] = 'A';
uint32_to_buf(&buf[1], id); uint32_to_buf(&buf[1], id);
ctl = which_ssld(); ctl = which_ssld();
if(!ctl)
return NULL;
ctl->cli_count++; ctl->cli_count++;
ssl_cmd_write_queue(ctl, F, 2, buf, sizeof(buf)); ssl_cmd_write_queue(ctl, F, 2, buf, sizeof(buf));
return ctl; return ctl;
@ -721,6 +723,8 @@ start_ssld_connect(rb_fde_t * sslF, rb_fde_t * plainF, uint32_t id)
uint32_to_buf(&buf[1], id); uint32_to_buf(&buf[1], id);
ctl = which_ssld(); ctl = which_ssld();
if(!ctl)
return NULL;
ctl->cli_count++; ctl->cli_count++;
ssl_cmd_write_queue(ctl, F, 2, buf, sizeof(buf)); ssl_cmd_write_queue(ctl, F, 2, buf, sizeof(buf));
return ctl; return ctl;
@ -832,6 +836,12 @@ start_zlib_session(void *data)
add_to_cli_connid_hash(server); add_to_cli_connid_hash(server);
server->localClient->z_ctl = which_ssld(); server->localClient->z_ctl = which_ssld();
if(!server->localClient->z_ctl)
{
exit_client(server, server, server, "Error finding available ssld");
rb_free(buf);
return;
}
server->localClient->z_ctl->cli_count++; server->localClient->z_ctl->cli_count++;
ssl_cmd_write_queue(server->localClient->z_ctl, F, 2, buf, len); ssl_cmd_write_queue(server->localClient->z_ctl, F, 2, buf, len);
rb_free(buf); rb_free(buf);