From e649847e631a6222b01ce229c29b800e8a8a0b41 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 11 Dec 2023 09:23:54 +0000 Subject: Fix socket_recvnb46 invocation (need latest skalibs) Signed-off-by: Laurent Bercot --- INSTALL | 2 +- doc/index.html | 2 +- src/server/shibari-server-udp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 5e2d943..00468b0 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.14.0.1 or later: https://skarnet.org/software/skalibs/ + - skalibs version 2.14.1.0 or later: https://skarnet.org/software/skalibs/ - s6 version 2.12.0.2 or later: https://skarnet.org/software/s6/ - for now: s6-dns version 2.3.7.0 or later: https://skarnet.org/software/s6-dns/ diff --git a/doc/index.html b/doc/index.html index fd59558..be2cc5a 100644 --- a/doc/index.html +++ b/doc/index.html @@ -48,7 +48,7 @@ binding. shibari aims to be the most pleasant of all DNS software.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.14.0.1 or later. It's a build-time requirement. It's also a run-time +2.14.1.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.
  • s6 version 2.12.0.2 or later. It's a build-time requirement. It's also a run-time diff --git a/src/server/shibari-server-udp.c b/src/server/shibari-server-udp.c index 82796dd..87f0118 100644 --- a/src/server/shibari-server-udp.c +++ b/src/server/shibari-server-udp.c @@ -200,7 +200,7 @@ int main (int argc, char const *const *argv) if (x[0].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with selfpipe") ; if (x[0].revents & IOPAUSE_READ) { handle_signals() ; continue ; } - r = sanitize_read(socket_recv46(x[1].fd, buf, 512, &remoteip, &remoteport)) ; + r = sanitize_read(socket_recv46(x[1].fd, buf, 512, &remoteip, &remoteport, ip46_is6(&localip))) ; if (!r) continue ; if (r == -1) strerr_diefu1sys(111, "recv from socket") ; if (rulestype && !check_rules(&remoteip, ¶ms, &loc)) continue ; -- cgit v1.3.1