fix

daemon/main.cpp

@@ -154,9 +154,9 @@ main(int argc, char *argv[])
     code = llarp_main_run(ctx);
     llarp_main_free(ctx);
   }
-  exit(code);
 #ifdef _WIN32
   ::WSACleanup();
 #endif
+  exit(code);
   return code;
 }

llarp/ev.hpp

@@ -48,11 +48,11 @@ namespace llarp
     do_write(void* data, size_t sz)
     {
 #ifndef _WIN32
-		return write(fd, data, sz) != -1;
+      return write(fd, data, sz) != -1;
 #else
-return WriteFile((void*)fd, data, sz, nullptr, nullptr);
+      return WriteFile((void*)fd, data, sz, nullptr, nullptr);
 #endif
-}
+    }
 
 /// called in event loop when fd is ready for writing
 /// requeues anything not written
@@ -61,14 +61,9 @@ virtual void
 flush_write()
 {
   m_writeq.Process([&](WriteBuffer& buffer) {
-  // todo: wtf???
-#ifndef _WIN32
     do_write(buffer.buf, buffer.bufsz);
     // if we would block we save the entries for later
     // discard entry
-#else
-    WriteFile((void*)fd, buffer.buf, buffer.bufsz, nullptr, nullptr);
-#endif
   });
   /// reset errno
   errno = 0;

llarp/ev_win32.hpp

@@ -119,10 +119,9 @@ namespace llarp
     read(void* buf, size_t sz)
     {
       ssize_t ret = tuntap_read(tunif, buf, sz);
-      if(ret > 0 && t->recvpkt)
-      {
-        t->recvpkt(t, buf, ret);
-      }
+      if(ret > 4 && t->recvpkt)
+        // should have pktinfo
+        t->recvpkt(t, ((byte_t*)buf) + 4, ret - 4);
       return ret;
     }