Skip to content

TEST#493

Draft
Bepartofyou wants to merge 25 commits into
lanthora:masterfrom
MeshVPN:master
Draft

TEST#493
Bepartofyou wants to merge 25 commits into
lanthora:masterfrom
MeshVPN:master

Conversation

@Bepartofyou

Copy link
Copy Markdown

No description provided.

Comment thread candy/src/tun/tun.cc
}

// kernel 模式:剥掉 IPIP 外层后写内核 tun。
msg.data.erase(0, sizeof(IP4Header));

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这段逻辑的最佳实现是只保留一个 erase 和 write。其他的逻辑用于判定状态后,执行一次到 Netstack 的转发,现在有好几个地方在执行 erase 和 write

Comment thread candy-cli/src/config.cc Outdated
Comment thread candy/src/core/client.cc Outdated
Comment thread candy/src/core/client.cc Outdated
Comment thread candy/src/core/client.cc Outdated
Comment thread candy/CMakeLists.txt Outdated
Comment thread cmake/lwip.cmake Outdated
Comment thread cmake/lwip.cmake
Comment thread .gitignore Outdated
Comment thread .gitignore Outdated
@Bepartofyou Bepartofyou force-pushed the master branch 4 times, most recently from a585385 to 06d5a27 Compare July 6, 2026 06:50
@lanthora lanthora marked this pull request as draft July 8, 2026 08:05
rebase 到已完成 spdlog→Poco 迁移的上游后,netstack 模块(本次 UDP
全锥形改造新增)仍停留在 spdlog API,导致 CANDY_NETSTACK=ON 编译失败
(spdlog/spdlog.h 头缺失)。

将 6 个 netstack 文件的日志统一迁移到项目 Poco 封装:
- spdlog::{debug,warn,error,critical,info} -> candy::logger().{debug,warning,error,fatal,information}
- 格式化从 spdlog 的 "{}" 改为 Poco::format 的 printf 风格占位符
- 按参数类型精确匹配格式符(%s/%hu/%zu/%d),bool 与 tcp_sndbuf
  返回值用 (int) 显式转换,指针用 (void*)+%p,避免 Poco::format
  运行时类型不匹配([ERRFMT])
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants