external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few minor TLS fixes

Browse Source
This commit is contained in:
Jan Vidar Krey 2009-10-09 21:38:14 +02:00
parent 0c5d98c671
commit e6cc47070c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/probe.c
View File

@ -76,13 +76,21 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
if (probe->hub->config->tls_enable) if (probe->hub->config->tls_enable)
{ {
LOG_TRACE("Probed TLS %d.%d connection", (int) probe_recvbuf[1], (int) probe_recvbuf[2]); LOG_TRACE("Probed TLS %d.%d connection", (int) probe_recvbuf[1], (int) probe_recvbuf[2]);
if (user_create(probe->hub, probe->connection, &probe->addr))
{
probe->connection = 0;
}
net_con_ssl_handshake(con, NET_CON_SSL_MODE_SERVER); net_con_ssl_handshake(con, NET_CON_SSL_MODE_SERVER);
} }
else else
{ {
LOG_TRACE("Probed TLS %d.%d connection. TLS disabled in hub.", (int) probe_recvbuf[1], (int) probe_recvbuf[2]); LOG_TRACE("Probed TLS %d.%d connection. TLS disabled in hub.", (int) probe_recvbuf[1], (int) probe_recvbuf[2]);
probe_destroy(probe);
} }
probe_destroy(probe);
return;
}
else
{
return; return;
} }
#endif #endif

2
src/network/connection.c
View File

@ -103,7 +103,7 @@ static void net_con_event(int fd, short ev, void *arg)
net_con_flag_set(con, NET_PROCESSING_BUSY); net_con_flag_set(con, NET_PROCESSING_BUSY);
uhub_assert(net_con_flag_get(con, NET_EVENT_SET) != 0); // uhub_assert(net_con_flag_get(con, NET_EVENT_SET) != 0);
net_con_flag_unset(con, NET_EVENT_SET); net_con_flag_unset(con, NET_EVENT_SET);
LOG_MEMORY("EVT: process: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, (int) ev); LOG_MEMORY("EVT: process: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, (int) ev);