more ssld ipc improvements from 3.6
This commit is contained in:
parent
987fa43982
commit
18244e32f3
2 changed files with 2 additions and 6 deletions
|
@ -80,7 +80,7 @@ mr_starttls(struct Client *client_p, struct Client *source_p, int parc, const ch
|
||||||
sendto_one_numeric(client_p, RPL_STARTTLS, form_str(RPL_STARTTLS));
|
sendto_one_numeric(client_p, RPL_STARTTLS, form_str(RPL_STARTTLS));
|
||||||
send_queued(client_p);
|
send_queued(client_p);
|
||||||
|
|
||||||
ctl = start_ssld_accept(client_p->localClient->F, F[1], rb_get_fd(F[0]));
|
ctl = start_ssld_accept(client_p->localClient->F, F[1], client_p->localClient->connid);
|
||||||
if (ctl != NULL)
|
if (ctl != NULL)
|
||||||
{
|
{
|
||||||
client_p->localClient->F = F[0];
|
client_p->localClient->F = F[0];
|
||||||
|
|
|
@ -785,7 +785,7 @@ start_zlib_session(void *data)
|
||||||
buf = rb_malloc(len);
|
buf = rb_malloc(len);
|
||||||
level = ConfigFileEntry.compression_level;
|
level = ConfigFileEntry.compression_level;
|
||||||
|
|
||||||
uint32_to_buf(&buf[1], rb_get_fd(server->localClient->F));
|
uint32_to_buf(&buf[1], server->localClient->zconnid);
|
||||||
buf[5] = (char) level;
|
buf[5] = (char) level;
|
||||||
|
|
||||||
recvq_start = &buf[6];
|
recvq_start = &buf[6];
|
||||||
|
@ -814,11 +814,7 @@ start_zlib_session(void *data)
|
||||||
|
|
||||||
F[0] = server->localClient->F;
|
F[0] = server->localClient->F;
|
||||||
F[1] = xF1;
|
F[1] = xF1;
|
||||||
del_from_cli_connid_hash(server);
|
|
||||||
server->localClient->F = xF2;
|
server->localClient->F = xF2;
|
||||||
/* need to redo as what we did before isn't valid now */
|
|
||||||
uint32_to_buf(&buf[1], rb_get_fd(server->localClient->F));
|
|
||||||
add_to_cli_connid_hash(server);
|
|
||||||
|
|
||||||
server->localClient->z_ctl = which_ssld();
|
server->localClient->z_ctl = which_ssld();
|
||||||
server->localClient->z_ctl->cli_count++;
|
server->localClient->z_ctl->cli_count++;
|
||||||
|
|
Loading…
Reference in a new issue