修复未设置 MacOS Tun 非阻塞导致的进程退出异常

lanthora · Dec 19, 2023 · eb6fabe · eb6fabe
1 parent e524bab
commit eb6fabe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/posix.cc b/src/main/posix.cc
@@ -152,7 +152,7 @@ struct argp config = {
 };
 
 volatile int exitCode = 0;
-bool running = true;
+volatile bool running = true;
 std::mutex mutex;
 std::condition_variable condition;
 

diff --git a/src/tun/darwin.cc b/src/tun/darwin.cc
@@ -58,6 +58,16 @@ class DarwinTun {
             spdlog::critical("create socket failed: {}", strerror(errno));
             return -1;
         }
+        int flags = fcntl(this->tunFd, F_GETFL, 0);
+        if (flags < 0) {
+            spdlog::error("get tun flags failed: {}", strerror(errno));
+            return -1;
+        }
+        flags |= O_NONBLOCK;
+        if (fcntl(this->tunFd, F_SETFL, flags) < 0) {
+            spdlog::error("set non-blocking tun failed: {}", strerror(errno));
+            return -1;
+        }
 
         struct ctl_info info;
         memset(&info, 0, sizeof(info));