From d61aefe2fc4d8549f459bdfc2749c9f163449ebc Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Sat, 24 Oct 2026 17:23:32 +0200 Subject: Replace libowfat's ip scanner and formatters with own own --- proxy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'proxy.c') diff --git a/proxy.c b/proxy.c index 19a084a..784e2a1 100644 --- a/proxy.c +++ b/proxy.c @@ -19,13 +19,13 @@ /* Libowfat */ #include "io.h" #include "iob.h" -#include "ip6.h" #include "socket.h" /* Opentracker */ +#include "ot_ip.h" #include "ot_mutex.h" -#include "ot_scan.h" #include "ot_random.h" +#include "ot_scan.h" #include "ot_stats.h" #include "ot_vector.h" #include "trackerlogic.h" @@ -92,7 +92,7 @@ void livesync_bind_mcast(ot_ip6 ip, uint16_t port) { char tmpip[4] = {0, 0, 0, 0}; char *v4ip; - if (!ip6_isv4mapped(ip)) + if (!ip_is_v4mapped(ip)) exerr("v6 mcast support not yet available."); v4ip = ip + 12; @@ -539,14 +539,14 @@ static int scan_ip6_port(const char *src, ot_ip6 ip, uint16_t *port) { ++s; if (*s == '[') ++s, ++bracket; /* for v6 style notation */ - if (!(off = scan_ip6(s, ip))) + if (!(off = ip_scan(s, ip))) return 0; s += off; if (*s == 0 || isspace(*s)) return s - src; if (*s == ']' && bracket) ++s; - if (!ip6_isv4mapped(ip)) { + if (!ip_is_v4mapped(ip)) { if ((bracket && *(s) != ':') || (*(s) != '.')) return 0; s++; -- cgit v1.3