Add optional error callback.

Author: seemk

Wu.cpp

@@ -54,6 +54,16 @@ const char* WuClientStateString(WuClientState state) {
   }
 }
 
+void WuHandleError(WuHost* wu, const char* description) {
+  wu->errorHandler(description, wu->errorHandlerData);
+}
+
+void WuHandleErrno(WuHost* wu, const char* description) {
+  snprintf(wu->errBuf, sizeof(wu->errBuf), "%s: %s", description,
+           strerror(errno));
+  WuHandleError(wu, wu->errBuf);
+}
+
 struct WuConnectionBuffer {
   size_t size = 0;
   int fd = -1;
@@ -204,7 +214,7 @@ void WuHandleHttpRequest(WuHost* wu, WuConnectionBuffer* conn) {
                          kMaxHttpRequestLength - conn->size);
     if (count == -1) {
       if (errno != EAGAIN) {
-        perror("read");
+        WuHandleErrno(wu, "failed to read from TCP socket");
         close(conn->fd);
         wu->bufferPool->Reclaim(conn);
       }
@@ -660,13 +670,19 @@ int32_t WuCryptoInit(WuHost* wu, const WuConf* conf) {
 }
 
 int32_t WuInit(WuHost* wu, const WuConf* conf) {
+  memset(wu, 0, sizeof(WuHost));
   wu->arena = (WuArena*)calloc(1, sizeof(WuArena));
   WuArenaInit(wu->arena, 1 << 20);
   wu->time = MsNow() * 0.001;
   wu->dt = 0.0;
 
+  wu->errorHandler =
+      conf->errorHandler ? conf->errorHandler : [](const char*, void*) {};
+  wu->errorHandlerData = conf->errorHandlerData;
+
   wu->port = atoi(conf->port);
   if (!WuCryptoInit(wu, conf)) {
+    WuHandleError(wu, "failed to init crypto");
     return 0;
   }
 
@@ -683,7 +699,7 @@ int32_t WuInit(WuHost* wu, const WuConf* conf) {
 
   s = listen(wu->tcpfd, SOMAXCONN);
   if (s == -1) {
-    perror("listen");
+    WuHandleErrno(wu, "tcp listen failed");
     return 0;
   }
 
@@ -700,7 +716,7 @@ int32_t WuInit(WuHost* wu, const WuConf* conf) {
 
   wu->epfd = epoll_create1(0);
   if (wu->epfd == -1) {
-    perror("epoll_create");
+    WuHandleErrno(wu, "epoll_create");
     return 0;
   }
 
@@ -721,14 +737,14 @@ int32_t WuInit(WuHost* wu, const WuConf* conf) {
 
   s = epoll_ctl(wu->epfd, EPOLL_CTL_ADD, wu->tcpfd, &event);
   if (s == -1) {
-    perror("epoll_ctl");
+    WuHandleErrno(wu, "EPOLL_CTL_ADD tcpfd");
     return 0;
   }
 
   event.data.ptr = udpBuf;
   s = epoll_ctl(wu->epfd, EPOLL_CTL_ADD, wu->udpfd, &event);
   if (s == -1) {
-    perror("epoll_ctl");
+    WuHandleErrno(wu, "EPOLL_CTL_ADD udpfd");
     return 0;
   }
 
@@ -807,7 +823,7 @@ int32_t WuServe(WuHost* wu, WuEvent* evt) {
           if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) {
             break;
           } else {
-            perror("accept");
+            WuHandleErrno(wu, "tcp accept");
             break;
           }
         }
@@ -826,7 +842,7 @@ int32_t WuServe(WuHost* wu, WuEvent* evt) {
           event.data.ptr = conn;
           if (epoll_ctl(wu->epfd, EPOLL_CTL_ADD, infd, &event) == -1) {
             close(infd);
-            perror("epoll_ctl");
+            WuHandleErrno(wu, "EPOLL_CTL_ADD infd");
           }
         } else {
           close(infd);

Wu.h

@@ -29,9 +29,13 @@ struct WuEvent {
   } as;
 };
 
+typedef void (*WuErrorFn)(const char* err, void* userData);
+
 struct WuConf {
   const char* host;
   const char* port;
+  WuErrorFn errorHandler;
+  void* errorHandlerData;
 };
 
 struct WuHost {
@@ -56,6 +60,10 @@ struct WuHost {
   ssl_ctx_st* sslCtx;
 
   const WuConf* conf;
+
+  char errBuf[512];
+  void* errorHandlerData;
+  WuErrorFn errorHandler;
 };
 
 int32_t WuInit(WuHost* wu, const WuConf* conf);

WuNetwork.cpp

@@ -24,7 +24,6 @@ ssize_t SocketWrite(int fd, const uint8_t* buf, size_t len) {
     ssize_t r = write(fd, buf + written, towrite - written);
     if (r == 0) return written;
     if (r == -1) {
-      perror("socketwrite");
       return -1;
     }
 
@@ -41,15 +40,13 @@ ssize_t SocketWrite(int fd, const char* buf, size_t len) {
 int MakeNonBlocking(int sfd) {
   int flags = fcntl(sfd, F_GETFL, 0);
   if (flags == -1) {
-    perror("fcntl");
     return -1;
   }
 
   flags |= O_NONBLOCK;
 
   int s = fcntl(sfd, F_SETFL, flags);
   if (s == -1) {
-    perror("set fcntl");
     return -1;
   }
 
@@ -68,7 +65,6 @@ int CreateSocket(const char* port, SocketType type) {
   int s = getaddrinfo(NULL, port, &hints, &result);
 
   if (s != 0) {
-    printf("getaddrinfo: %s\n", gai_strerror(s));
     return -1;
   }
 
@@ -82,9 +78,7 @@ int CreateSocket(const char* port, SocketType type) {
     }
 
     int enable = 1;
-    if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)) < 0) {
-      fprintf(stderr, "setsockopt(SO_REUSEADDR) failed");
-    }
+    setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
 
     s = bind(sfd, rp->ai_addr, rp->ai_addrlen);
     if (s == 0) {
@@ -97,7 +91,6 @@ int CreateSocket(const char* port, SocketType type) {
   freeaddrinfo(result);
 
   if (rp == NULL) {
-    printf("Failed to bind\n");
     return -1;
   }
 

examples/EchoServer.cpp

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <chrono>
 #include <thread>
 #include "../Wu.h"
@@ -8,6 +9,7 @@ int main(int argc, char** argv) {
   WuHost wu;
 
   WuConf conf;
+  memset(&conf, 0, sizeof(conf));
 
   if (argc > 2) {
     conf.host = argv[1];
@@ -17,6 +19,8 @@ int main(int argc, char** argv) {
     conf.port = "9555";
   }
 
+  conf.errorHandler = [](const char* e, void*) { printf("%s\n", e); };
+
   if (!WuInit(&wu, &conf)) {
     printf("init fail\n");
     return 1;