Update

- Disable aki_packet_pool grow by default
- Improve socket error messages
- Use old winsock function for getting address

Signed-off-by: Andrew Opalach <andrew@akon.city>

4 files changed, 4 insertions, 9 deletions

diff --git a/src/packet_cache.h b/src/packet_cache.h
index 980c586..ff036b5 100644
--- a/src/packet_cache.h
+++ b/src/packet_cache.h
@@ -5,9 +5,6 @@
 #include "util/packet.h"
 #include "util/thread/thread.h"
 
-#include "loop.h"
-#include "evwrap.h"
-
 struct aki_packet_cache {
     array(struct aki_packet *) cache;
     struct aki_cond cond;
diff --git a/src/packet_pool.c b/src/packet_pool.c
index a49c5f5..683efcb 100644
--- a/src/packet_pool.c
+++ b/src/packet_pool.c
@@ -79,7 +79,7 @@ void aki_packet_pool_init_ex(struct aki_packet_pool *pool, u32 size, struct aki_
     init_internal(pool, size, loop, mode, callback, userdata);
 }
 
-static const bool grow = true;
+static const bool grow = false;
 
 struct aki_packet *aki_packet_pool_get(struct aki_packet_pool *pool)
 {
diff --git a/src/socket/socket_linux.c b/src/socket/socket_linux.c
index 4b2f56a..b442806 100644
--- a/src/socket/socket_linux.c
+++ b/src/socket/socket_linux.c
@@ -45,7 +45,7 @@ bool aki_socket_init(struct aki_socket *s)
     }
 
     if (s->sock < 0) {
-        al_log_error("socket", "Failed to create socket.");
+        al_log_error("socket", "socket() failed: %s (%d).", aki_strerror(errno), errno);
         return false;
     }
 
diff --git a/src/socket/socket_windows.c b/src/socket/socket_windows.c
index e19c16f..dcb7e08 100644
--- a/src/socket/socket_windows.c
+++ b/src/socket/socket_windows.c
@@ -17,7 +17,7 @@ bool aki_socket_init(struct aki_socket *s)
     }
 
     if (s->sock == INVALID_SOCKET) {
-        al_log_error("socket", "Failed to create socket.");
+        al_log_error("socket", "socket() failed: %d.", WSAGetLastError());
         return false;
     }
 
@@ -60,11 +60,9 @@ bool aki_socket_listen(struct aki_socket *s, str *addr, s32 port)
 bool aki_socket_accept(struct aki_socket *s, struct aki_socket *c)
 {
     c->type = s->type;
-
     if ((c->sock = accept(s->sock, NULL, NULL)) == INVALID_SOCKET) {
         return false;
     }
-
     return true;
 }
 
@@ -72,7 +70,7 @@ bool aki_socket_connect(struct aki_socket *s, str *addr, s32 port)
 {
     s->addr_in.sin_family = AF_INET;
     char *c_str = al_str_to_c_str(addr);
-    InetPton(AF_INET, c_str, &s->addr_in.sin_addr.s_addr);
+    s->addr_in.sin_addr.s_addr = inet_addr(c_str);
     al_free(c_str);
     s->addr_in.sin_port = aki_htons(port);
     al_memset(s->addr_in.sin_zero, '\0', 8);