From 4de1068b57ff27142a1e6695c69580a835394c7b Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 6 Feb 2019 23:34:26 -0800 Subject: [PATCH] Moved lwIP initialization from tap to zts_start for faster startup --- src/Controls.cpp | 2 ++ src/VirtualTap.cpp | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Controls.cpp b/src/Controls.cpp index b41375a..7531d23 100644 --- a/src/Controls.cpp +++ b/src/Controls.cpp @@ -42,6 +42,7 @@ #include "concurrentqueue.h" #include "libzt.h" +#include "lwipDriver.hpp" #if defined(_WIN32) WSADATA wsaData; @@ -413,6 +414,7 @@ zts_err_t zts_deorbit(uint64_t moonWorldId) zts_err_t zts_start(const char *path, void (*callback)(uint64_t, int), int port) { Mutex::Lock _l(_service_lock); + lwip_driver_init(); if (service || _run_service) { // Service is already initialized return ZTS_ERR_INVALID_OP; diff --git a/src/VirtualTap.cpp b/src/VirtualTap.cpp index e5c7cea..fac4b10 100644 --- a/src/VirtualTap.cpp +++ b/src/VirtualTap.cpp @@ -82,7 +82,6 @@ VirtualTap::VirtualTap( snprintf(vtap_full_name, sizeof(vtap_full_name), "libzt%llx", (unsigned long long)_nwid); _dev = vtap_full_name; ::pipe(_shutdownSignalPipe); - lwip_driver_init(); // Start virtual tap thread and stack I/O loops _thread = Thread::start(this); }