DoT

Author: zfl9

.vscode/c_cpp_properties.json

@@ -5,16 +5,13 @@
             "intelliSenseMode": "linux-clang-x64",
             "compilerPath": "/usr/bin/clang",
             "compilerArgs": [
-                "-I${workspaceFolder}/src/wolfssl",
-                "-I${workspaceFolder}/dep/wolfssl-5.7.0",
-                "-I${workspaceFolder}/dep/openssl-3.2.0@x86_64-linux-musl@x86_64+native@fast+lto/include",
+                "-I${workspaceFolder}/dep/wolfssl-5.7.0-stable",
                 "-I${workspaceFolder}/dep/mimalloc-2.1.2/include"
             ],
             "defines": [
                 "MUSL",
                 "TEST",
-                "BUILDING_WOLFSSL",
-                "WOLFSSL_USER_SETTINGS",
+                "ENABLE_WOLFSSL"
             ],
             "cStandard": "c11",
             "cppStandard": "c++17"

.vscode/settings.json

@@ -1,15 +1,8 @@
 {
     "files.associations": {
-        "*.config": "lua",
         "*.h": "c",
         "*.i": "c",
         "*.in": "c",
         "*.S": "c",
-        "*.inc": "c",
-        "chrono": "c",
-        "typeinfo": "c",
-        "complex": "c",
-        "format": "c",
-        "random": "c"
     },
 }

build.zig

@@ -141,6 +141,7 @@ fn option_lto() void {
         else => false,
     };
     _lto = _b.option(bool, "lto", "enable LTO, default to true if in fast/small/safe mode") orelse default;
+    _lto = false;
 }
 
 fn option_strip() void {
@@ -515,6 +516,7 @@ fn build_wolfssl() *Step {
         \\  zig_cache_dir='{s}'
         \\  is_musl='{s}'
         \\  lto='{s}'
+        \\  cwd="$PWD"
         \\
         \\  cd "$src_dir"
         \\
@@ -530,9 +532,23 @@ fn build_wolfssl() *Step {
         \\  [ "$target_triple" ] && host="--host=$target_triple" || host=""
         \\
         \\  ./autogen.sh
-        \\  ./configure $host --prefix="$install_dir" --enable-opensslall --enable-static --disable-shared \
-        \\      --enable-staticmemory --disable-crypttests --disable-benchmark --disable-examples \
-        \\      --enable-singlethreaded
+        \\  ./configure $host \
+        \\      --prefix="$install_dir" \
+        \\      --enable-static \
+        \\      --disable-shared \
+        \\      --disable-harden \
+        \\      --enable-staticmemory \
+        \\      --enable-singlethreaded \
+        \\      --disable-threadlocal \
+        \\      --disable-asyncthreads \
+        \\      --disable-error-queue-per-thread \
+        \\      --enable-openssl-compatible-defaults \
+        \\      --enable-opensslextra --enable-opensslall \
+        \\      --disable-dtls --disable-oldtls --enable-tls13 \
+        \\      --enable-chacha --enable-poly1305 --enable-aesgcm \
+        \\      --enable-ecc --enable-sni --enable-session-ticket \
+        \\      --disable-crypttests --disable-benchmark --disable-examples \
+        \\      EXTRA_CFLAGS="-include $cwd/src/wolfssl_opt.h"
         \\  make install
     ;
 
@@ -684,8 +700,10 @@ fn link_obj_chinadns(exe: *LibExeObjStep) void {
             obj.defineCMacroRaw("MUSL");
 
         // wolfssl lib
-        if (_enable_wolfssl)
+        if (_enable_wolfssl) {
+            obj.defineCMacroRaw("ENABLE_WOLFSSL");
             obj.addIncludePath(_dep_wolfssl.include_dir);
+        }
 
         // for log.h
         obj.defineCMacroRaw(fmt("LOG_FILENAME=\"{s}\"", .{file.name}));

src/EvLoop.zig

@@ -1,5 +1,6 @@
 const std = @import("std");
 const root = @import("root");
+const build_opts = @import("build_opts");
 const g = @import("g.zig");
 const c = @import("c.zig");
 const cc = @import("cc.zig");
@@ -482,7 +483,6 @@ pub fn recvfrom(self: *EvLoop, fdobj: *Fd, buf: []u8, flags: c_int, src_addr: *c
     }
 }
 
-/// length 0 means EOF
 pub fn recv(self: *EvLoop, fdobj: *Fd, buf: []u8, flags: c_int) ?usize {
     while (true) {
         return cc.recv(fdobj.fd, buf, flags) orelse {
@@ -498,15 +498,15 @@ pub fn recv(self: *EvLoop, fdobj: *Fd, buf: []u8, flags: c_int) ?usize {
     }
 }
 
-/// read exactly `buf.len` bytes (res:null and errno:0 means EOF)
-pub fn recv_exactly(self: *EvLoop, fdobj: *Fd, buf: []u8, flags: c_int) ?void {
+const ReadErr = error{ eof, other };
+
+pub fn recv_exactly(self: *EvLoop, fdobj: *Fd, buf: []u8, flags: c_int) ReadErr!void {
     var nread: usize = 0;
     while (nread < buf.len) {
-        const n = self.recv(fdobj, buf[nread..], flags) orelse return null;
-        if (n == 0) {
-            cc.set_errno(0); // EOF
-            return null;
-        }
+        const n = self.recv(fdobj, buf[nread..], flags) orelse
+            return ReadErr.other;
+        if (n == 0)
+            return ReadErr.eof;
         nread += n;
         // https://man7.org/linux/man-pages/man7/epoll.7.html
         if (nread < buf.len) {