9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re-enable ziplinks + ssl

Browse source
This commit is contained in:
Aaron Sethman 2008-12-13 23:20:59 +03:00
parent 5cb843c6a5
commit a4165b42bf
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/client.c
View file

@ -238,7 +238,11 @@ free_local_client(struct Client *client_p)
if (client_p->localClient->privset) if (client_p->localClient->privset)
privilegeset_unref(client_p->localClient->privset); privilegeset_unref(client_p->localClient->privset);
ssld_decrement_clicount(client_p->localClient->ssl_ctl); if(IsSSL(client_p))
ssld_decrement_clicount(client_p->localClient->ssl_ctl);
if(IsCapable(client_p, CAP_ZIP))
ssld_decrement_clicount(client_p->localClient->z_ctl);
rb_bh_free(lclient_heap, client_p->localClient); rb_bh_free(lclient_heap, client_p->localClient);
client_p->localClient = NULL; client_p->localClient = NULL;

7
src/newconf.c
View file

@ -1243,13 +1243,6 @@ conf_end_connect(struct TopConf *tc)
yy_server->flags &= ~SERVER_COMPRESSED; yy_server->flags &= ~SERVER_COMPRESSED;
} }
#endif #endif
if(ServerConfCompressed(yy_server) && ServerConfSSL(yy_server))
{
conf_report_error("Ignoring compressed for connect block %s -- "
"ssl and compressed are mutually exclusive (OpenSSL does its own compression)",
yy_server->name);
yy_server->flags &= ~SERVER_COMPRESSED;
}
add_server_conf(yy_server); add_server_conf(yy_server);
rb_dlinkAdd(yy_server, &yy_server->node, &server_conf_list); rb_dlinkAdd(yy_server, &yy_server->node, &server_conf_list);

9
src/sslproc.c
View file

@ -766,9 +766,10 @@ start_zlib_session(void *data)
/* need to redo as what we did before isn't valid now */ /* need to redo as what we did before isn't valid now */
int32_to_buf(&buf[1], rb_get_fd(server->localClient->F)); int32_to_buf(&buf[1], rb_get_fd(server->localClient->F));
add_to_cli_fd_hash(server); add_to_cli_fd_hash(server);
server->localClient->ssl_ctl = which_ssld();
server->localClient->ssl_ctl->cli_count++; server->localClient->z_ctl = which_ssld();
ssl_cmd_write_queue(server->localClient->ssl_ctl, F, 2, buf, len); server->localClient->z_ctl->cli_count++;
ssl_cmd_write_queue(server->localClient->z_ctl, F, 2, buf, len);
rb_free(buf); rb_free(buf);
} }
@ -796,7 +797,7 @@ collect_zipstats(void *unused)
int32_to_buf(&buf[1], rb_get_fd(target_p->localClient->F)); int32_to_buf(&buf[1], rb_get_fd(target_p->localClient->F));
rb_strlcpy(odata, target_p->name, (sizeof(buf) - len)); rb_strlcpy(odata, target_p->name, (sizeof(buf) - len));
len += strlen(odata) + 1; /* Get the \0 as well */ len += strlen(odata) + 1; /* Get the \0 as well */
ssl_cmd_write_queue(target_p->localClient->ssl_ctl, NULL, 0, buf, len); ssl_cmd_write_queue(target_p->localClient->z_ctl, NULL, 0, buf, len);
} }
} }
} }