From 74985eba8b5f41d49c4b4e13418bb7fc2125654b Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 31 Aug 2021 21:38:11 +0200 Subject: Wg-user: debug --- sysdep/unix/wg_user.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sysdep/unix/wg_user.c b/sysdep/unix/wg_user.c index df2dafa6..73ca0e20 100644 --- a/sysdep/unix/wg_user.c +++ b/sysdep/unix/wg_user.c @@ -1,8 +1,11 @@ +#define LOCAL_DEBUG + #include #include #include #include #include +#include #include "lib/lists.h" #include "lib/ip.h" #include "lib/socket.h" @@ -42,6 +45,7 @@ bool wg_has_userspace(const char *ifname) else { DBG(L_TRACE "WG: no socket %s", tmp); + log(L_TRACE "WG: no socket %s", tmp); return false; } } @@ -50,7 +54,9 @@ bool wg_has_userspace(const char *ifname) static int user_rx_hook(struct birdsock *sk UNUSED, uint size UNUSED) { - DBG(L_TRACE "WG: RX %p %d", sk, size); + char buf[1024]=""; + strncpy(buf, sk->rbuf, size); + log(L_TRACE "WG: RX %p %d '%s'", sk, size, buf); rfree(sk); return 1; } @@ -58,7 +64,7 @@ int user_rx_hook(struct birdsock *sk UNUSED, uint size UNUSED) static void user_tx_hook(struct birdsock *bs) { - DBG(L_TRACE "WG: TX %p %d", bs, bs->tpos - bs->ttx); + log(L_TRACE "WG: TX %p %d", bs, bs->tpos - bs->ttx); uint size = (uintptr_t)bs->data; @@ -263,7 +269,7 @@ wg_user_set_device(struct pool *pool, uint size = tbsize; int len = user_put_device(dev, &pos, &size); - DBG(L_TRACE "WG: put %d %s", size, sock->tbuf); + log(L_TRACE "WG: put %d %d %s", len, size, sock->tbuf); if (len < 0) { @@ -274,6 +280,7 @@ wg_user_set_device(struct pool *pool, sock->data = (void*)(uintptr_t)size; int res = sk_connect_unix(sock, path, pathlen); + log(L_TRACE "WG: socket %s %d %d %d %s %d %s %d", res<0?strerror(errno):NULL, res, res<0?errno:0, sock->fd, ifname, path[0], path + 1, pathlen); DBG(L_TRACE "WG: socket %d %d %s", res, sock->fd, path); if (res < 0) { -- cgit v1.2.3