Browse Source

last few fixes to make the new socket code work.

next
Georg Hopp 12 years ago
parent
commit
a3ddcebff9
  1. 6
      src/server/server.c
  2. 3
      src/taskrambler.c

6
src/server/server.c

@ -41,7 +41,6 @@ serverCtor(void * _this, va_list * params)
{ {
Server this = _this; Server this = _this;
in_port_t port; in_port_t port;
unsigned int backlog;
this->max_fds = sysconf(_SC_OPEN_MAX); this->max_fds = sysconf(_SC_OPEN_MAX);
if (this->max_fds <= 10) { // reserve 10 handles for internal use. if (this->max_fds <= 10) { // reserve 10 handles for internal use.
@ -55,7 +54,6 @@ serverCtor(void * _this, va_list * params)
this->logger = va_arg(* params, TR_Logger); this->logger = va_arg(* params, TR_Logger);
this->worker = va_arg(* params, void *); this->worker = va_arg(* params, void *);
port = va_arg(* params, int); port = va_arg(* params, int);
backlog = va_arg(* params, unsigned int);
TR_loggerLog(this->logger, TR_loggerLog(this->logger,
TR_LOGGER_INFO, TR_LOGGER_INFO,
@ -66,12 +64,12 @@ serverCtor(void * _this, va_list * params)
this->conns = TR_calloc(sizeof(struct conns), this->max_fds); this->conns = TR_calloc(sizeof(struct conns), this->max_fds);
this->sock = TR_new(TR_TcpSocket, this->logger, "0.0.0.0", port, 0); this->sock = TR_new(TR_TcpSocket, this->logger, "0.0.0.0", port, 0);
TR_socketNonblock(this->sock);
TR_socketBind((TR_Socket)this->sock); TR_socketBind((TR_Socket)this->sock);
TR_socketNonblock(this->sock);
this->sockSSL = TR_new(TR_TcpSocket, this->logger, "0.0.0.0", port+1, 0); this->sockSSL = TR_new(TR_TcpSocket, this->logger, "0.0.0.0", port+1, 0);
TR_socketNonblock(this->sockSSL);
TR_socketBind((TR_Socket)this->sockSSL); TR_socketBind((TR_Socket)this->sockSSL);
TR_socketNonblock(this->sockSSL);
SSL_library_init(); SSL_library_init();
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();

3
src/taskrambler.c

@ -226,8 +226,7 @@ main()
Server, Server,
logger, logger,
worker, worker,
(int)(port->value).number,
SOMAXCONN);
(int)(port->value).number);
if (NULL != server && !doShutdown) { if (NULL != server && !doShutdown) {
serverRun(server); serverRun(server);

Loading…
Cancel
Save