From 2ca152f43f2805e1394e2e2ba26fb06bdf2d4cc9 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sat, 27 Oct 2018 16:02:37 -0400 Subject: [PATCH] make tun work on kqueue --- llarp/ev.hpp | 6 +++--- llarp/ev_kqueue.hpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/llarp/ev.hpp b/llarp/ev.hpp index 5c932e425..121e32318 100644 --- a/llarp/ev.hpp +++ b/llarp/ev.hpp @@ -133,7 +133,7 @@ namespace llarp }; /// used for tun interface and tcp conn - ssize_t + virtual ssize_t do_write(void* data, size_t sz) { #ifndef _WIN32 @@ -234,8 +234,8 @@ namespace llarp delete tcp; } - virtual int - do_write(const void* buf, size_t sz) + virtual ssize_t + do_write(void* buf, size_t sz) { if(_shouldClose) return -1; diff --git a/llarp/ev_kqueue.hpp b/llarp/ev_kqueue.hpp index 663f36531..c1669391e 100644 --- a/llarp/ev_kqueue.hpp +++ b/llarp/ev_kqueue.hpp @@ -110,7 +110,7 @@ namespace llarp return -1; } - bool + virtual ssize_t do_write(void* buf, size_t sz) { iovec vecs[2]; @@ -120,7 +120,7 @@ namespace llarp vecs[0].iov_len = sizeof(t); vecs[1].iov_base = buf; vecs[1].iov_len = sz; - return writev(fd, vecs, 2) != -1; + return writev(fd, vecs, 2); } void