Commit 30e0805b052a36fdbac8c3ab73baf67c1ad99bc6

Authored by Georg Hopp
1 parent a62879f7

last few fixes to make the new socket code work.

... ... @@ -41,7 +41,6 @@ serverCtor(void * _this, va_list * params)
41 41 {
42 42 Server this = _this;
43 43 in_port_t port;
44   - unsigned int backlog;
45 44
46 45 this->max_fds = sysconf(_SC_OPEN_MAX);
47 46 if (this->max_fds <= 10) { // reserve 10 handles for internal use.
... ... @@ -55,7 +54,6 @@ serverCtor(void * _this, va_list * params)
55 54 this->logger = va_arg(* params, TR_Logger);
56 55 this->worker = va_arg(* params, void *);
57 56 port = va_arg(* params, int);
58   - backlog = va_arg(* params, unsigned int);
59 57
60 58 TR_loggerLog(this->logger,
61 59 TR_LOGGER_INFO,
... ... @@ -66,12 +64,12 @@ serverCtor(void * _this, va_list * params)
66 64 this->conns = TR_calloc(sizeof(struct conns), this->max_fds);
67 65
68 66 this->sock = TR_new(TR_TcpSocket, this->logger, "0.0.0.0", port, 0);
69   - TR_socketNonblock(this->sock);
70 67 TR_socketBind((TR_Socket)this->sock);
  68 + TR_socketNonblock(this->sock);
71 69
72 70 this->sockSSL = TR_new(TR_TcpSocket, this->logger, "0.0.0.0", port+1, 0);
73   - TR_socketNonblock(this->sockSSL);
74 71 TR_socketBind((TR_Socket)this->sockSSL);
  72 + TR_socketNonblock(this->sockSSL);
75 73
76 74 SSL_library_init();
77 75 OpenSSL_add_all_algorithms();
... ...
... ... @@ -226,8 +226,7 @@ main()
226 226 Server,
227 227 logger,
228 228 worker,
229   - (int)(port->value).number,
230   - SOMAXCONN);
  229 + (int)(port->value).number);
231 230
232 231 if (NULL != server && !doShutdown) {
233 232 serverRun(server);
... ...
Please register or login to post a comment