fix release

CMakeLists.txt

@@ -54,6 +54,9 @@ else()
 endif()
 
 set(SOURCE_FILES
+    base/debug.c
+    base/llog.c
+
     src/main.c
     src/packet.c
     src/arp.c

base/debug.c

@@ -0,0 +1,9 @@
+#include <base/llog.h>
+
+void rt_assert(int val, const char *exp)
+{
+    if (!val) {
+        LLOG(LLOG_ERROR, "assert failed: %s", exp);
+        exit(1);
+    }
+}

base/debug.h

@@ -135,8 +135,8 @@
     #define WARN_UNUSED
 #endif
 
-#define B_USE(expr) (void)(sizeof((expr)));
+#define RT_ASSERT(exp) rt_assert(exp, #exp);
 
-#define B_ASSERT_USE(expr) { ASSERT(expr) B_USE(expr) }
+void rt_assert(int val, const char *exp);
 
 #endif

base/llog.c

@@ -1,2 +1,17 @@
 #include <string.h>
 #include "llog.h"
+
+static char *llog_level_names[] = { NULL, "ERROR", "WARNING", "NOTICE", "INFO", "DEBUG" };
+void LLog_log(int level, const char *fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+
+  if (level <= LLOG_DISPLAY_LEVEL) {
+    fprintf(stderr, "[%s]: ", llog_level_names[level]);
+    vfprintf(stderr, fmt, ap);
+    fprintf(stderr, "\n");
+  }
+
+  va_end(ap);
+}

base/llog.h

@@ -20,19 +20,6 @@
 // #define LLOG(level, ...) ((level <= LLOG_DISPLAY_LEVEL) && fprintf(stderr, "[%s]%.0s: " FIRST(__VA_ARGS__) "\n", llog_level_names[level], __VA_ARGS__))
 #define LLOG(level, ...) LLog_log(level, __VA_ARGS__)
 
-static char *llog_level_names[] = { NULL, "ERROR", "WARNING", "NOTICE", "INFO", "DEBUG" };
-static void LLog_log(int level, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-
-  if (level <= LLOG_DISPLAY_LEVEL) {
-    fprintf(stderr, "[%s]: ", llog_level_names[level]);
-    vfprintf(stderr, fmt, ap);
-    fprintf(stderr, "\n");
-  }
-
-  va_end(ap);
-}
+void LLog_log(int level, const char *fmt, ...);
 
 #endif // _LOG_H_

src/gateway.c

@@ -262,7 +262,7 @@ int gateway_uvl_output(uvl_t *handle, const uv_buf_t bufs[], unsigned int nbufs)
     uint32_t len = 0;
 
     for (int i = 0; i < nbufs; i++) {
-        ASSERT(len + bufs[i].len < sizeof(buffer))
+        RT_ASSERT(len + bufs[i].len < sizeof(buffer))
         memcpy(buf, bufs[i].base, bufs[i].len);
         buf += bufs[i].len;
         len += bufs[i].len;
@@ -276,9 +276,9 @@ int gateway_init(struct gateway *gateway, struct packet_ctx *packet_ctx)
     gateway->loop = packet_ctx->arg->loop;
     gateway->packet_ctx = packet_ctx;
 
-    ASSERT(uvl_init(gateway->loop, &gateway->uvl) == 0);
-    ASSERT(uvl_bind(&gateway->uvl, gateway_uvl_output) == 0);
-    ASSERT(uvl_listen(&gateway->uvl, on_connect) == 0);
+    RT_ASSERT(uvl_init(gateway->loop, &gateway->uvl) == 0);
+    RT_ASSERT(uvl_bind(&gateway->uvl, gateway_uvl_output) == 0);
+    RT_ASSERT(uvl_listen(&gateway->uvl, on_connect) == 0);
     gateway->uvl.data = gateway;
     gateway->first_conn = NULL;
 

src/helper.c

@@ -303,14 +303,6 @@ int parse_addr(const char *str, struct sockaddr_in *addr)
     return 0;
 }
 
-void rt_assert(int val, const char *exp)
-{
-    if (!val) {
-        LLOG(LLOG_ERROR, "assert failed: %s", exp);
-        exit(1);
-    }
-}
-
 #if defined(_WIN32)
 static void win32_init_winsocket() __attribute__((constructor));
 static void win32_init_winsocket()

src/helper.h

@@ -26,13 +26,11 @@
 #define IS_BROADCAST(ip, net, mask) ( ((*(uint32_t*)net) | ( ~ *(uint32_t*)mask)) == *(uint32_t*)ip )
 #define PRINT_IP(ip) printf("%d.%d.%d.%d", *(uint8_t*)(ip), *(uint8_t*)((uint8_t*)ip + 1), *(uint8_t*)((uint8_t*)ip + 2), *(uint8_t*)((uint8_t*)ip + 3))
 #define PRINT_MAC(mac) printf("%x:%x:%x:%x:%x:%x", *(uint8_t*)(mac), *(uint8_t*)((uint8_t*)mac + 1), *(uint8_t*)((uint8_t*)mac + 2), *(uint8_t*)((uint8_t*)mac + 3), *(uint8_t*)((uint8_t*)mac + 4), *(uint8_t*)((uint8_t*)mac + 5))
-#define RT_ASSERT(exp) rt_assert(exp, #exp);
 
 const char *ip2str(void *ip);
 void *str2ip(const char *ip);
 void print_hex(const void *buf, int len);
 int set_immediate_mode(pcap_t *p);
 int get_mac_address(pcap_if_t *d, pcap_t *p, u_char mac_addr[6]);
 int parse_addr(const char *str, struct sockaddr_in *addr);
-void rt_assert(int val, const char *exp);
 #endif // _HELPER_H_

src/lan-play.h

@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <base/llog.h>
+#include <base/debug.h>
 #include <uv.h>
 
 struct lan_play;

src/uv_lwip.c

@@ -274,7 +274,7 @@ static err_t uvl_client_recv_func (void *arg, struct tcp_pcb *tpcb, struct pbuf
         }
 
         // LLOG(LLOG_DEBUG, "[+] recv_buf %d + %d / %d", buf->recv_used, p->tot_len, sizeof(buf->recv_buf));
-        ASSERT(pbuf_copy_partial(p, buf->recv_buf + buf->recv_used, p->tot_len, 0) == p->tot_len)
+        RT_ASSERT(pbuf_copy_partial(p, buf->recv_buf + buf->recv_used, p->tot_len, 0) == p->tot_len)
         buf->recv_used += p->tot_len;
 
         pbuf_free(p);