refactor: 收口为hub/peer/bridge 三程序并统一 支持 tcp/udp/kcp"

Makefile

@@ -14,79 +14,46 @@ BUILD_DIR ?= build
 CFLAGS ?= -O2 -g -Wall -Wextra -std=c11
 CPPFLAGS ?= -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L
 LDFLAGS ?=
-# 链接 pthread（apps 中有多线程）。
+# 链接 pthread。
 LDLIBS ?= -lpthread
 INCLUDES := -Iinclude
 
-# 所有二进制共享的核心源码（网络核心 + 协议实现 + ikcp）。
-COMMON_SRCS := \
-	src/core/network.c \
+# hub / peer / bridge 共用的核心源码。
+PEER_STACK_SRCS := \
 	src/core/logger.c \
-	src/protocols/tcp_impl.c \
-	src/protocols/udp_impl.c \
-	src/protocols/kcp_impl.c \
+	src/core/peer_transport.c \
 	src/protocols/ikcp.c
 
-# 各应用入口源文件。
-APP_TEST_SRC := src/apps/test_main.c
-APP_CLIENT_SRC := src/apps/client_main.c
-APP_SERVER_SRC := src/apps/server_main.c
-APP_RELAY_SRC := src/apps/relay_main.c
+# 当前保留的应用入口源文件。
 APP_HUB_SRC := src/apps/hub_main.c
 APP_PEER_SRC := src/apps/peer_main.c
 APP_BRIDGE_SRC := src/apps/bridge_main.c
 
 # 将源文件映射到 BUILD_DIR 下的对象文件路径。
-COMMON_OBJS := $(patsubst %.c,$(BUILD_DIR)/%.o,$(COMMON_SRCS))
-TEST_OBJ := $(patsubst %.c,$(BUILD_DIR)/%.o,$(APP_TEST_SRC))
-CLIENT_OBJ := $(patsubst %.c,$(BUILD_DIR)/%.o,$(APP_CLIENT_SRC))
-SERVER_OBJ := $(patsubst %.c,$(BUILD_DIR)/%.o,$(APP_SERVER_SRC))
-RELAY_OBJ := $(patsubst %.c,$(BUILD_DIR)/%.o,$(APP_RELAY_SRC))
+PEER_STACK_OBJS := $(patsubst %.c,$(BUILD_DIR)/%.o,$(PEER_STACK_SRCS))
 HUB_OBJ := $(patsubst %.c,$(BUILD_DIR)/%.o,$(APP_HUB_SRC))
 PEER_OBJ := $(patsubst %.c,$(BUILD_DIR)/%.o,$(APP_PEER_SRC))
 BRIDGE_OBJ := $(patsubst %.c,$(BUILD_DIR)/%.o,$(APP_BRIDGE_SRC))
 
-# 按目标清理时，仅删除对应可执行文件与专属入口对象，避免影响其它产物。
-CLIENT_CLEAN_FILES := $(BUILD_DIR)/omni_client $(CLIENT_OBJ)
-ARM64_BUILD_DIR ?= build/arm64
-ARM64_CLIENT_OBJ := $(patsubst %.c,$(ARM64_BUILD_DIR)/%.o,$(APP_CLIENT_SRC))
-ARM64_CLIENT_CLEAN_FILES := $(ARM64_BUILD_DIR)/omni_client $(ARM64_CLIENT_OBJ)
-
-# 默认构建目标：4 个可执行程序。
+# 默认构建目标：仅保留 hub / peer / bridge。
 TARGETS := \
-	$(BUILD_DIR)/omni_test \
-	$(BUILD_DIR)/omni_client \
-	$(BUILD_DIR)/omni_server \
-	$(BUILD_DIR)/omni_relay \
 	$(BUILD_DIR)/omni_hub \
 	$(BUILD_DIR)/omni_peer \
 	$(BUILD_DIR)/omni_bridge
 
-.PHONY: all arm arm64 clean clean-client clean-arm64-client help
+.PHONY: all arm arm64 clean help
 
 # 本机构建入口。
 all: $(TARGETS)
 
 # 各可执行程序链接规则。
-$(BUILD_DIR)/omni_test: $(COMMON_OBJS) $(TEST_OBJ)
+$(BUILD_DIR)/omni_hub: $(PEER_STACK_OBJS) $(HUB_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
-$(BUILD_DIR)/omni_client: $(COMMON_OBJS) $(CLIENT_OBJ)
+$(BUILD_DIR)/omni_peer: $(PEER_STACK_OBJS) $(PEER_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
-$(BUILD_DIR)/omni_server: $(COMMON_OBJS) $(SERVER_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-$(BUILD_DIR)/omni_relay: $(COMMON_OBJS) $(RELAY_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-$(BUILD_DIR)/omni_hub: $(BUILD_DIR)/src/core/logger.o $(HUB_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-$(BUILD_DIR)/omni_peer: $(BUILD_DIR)/src/core/logger.o $(PEER_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-$(BUILD_DIR)/omni_bridge: $(BUILD_DIR)/src/core/logger.o $(BRIDGE_OBJ)
+$(BUILD_DIR)/omni_bridge: $(PEER_STACK_OBJS) $(BRIDGE_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 # 通用编译规则：
@@ -104,14 +71,6 @@ arm:
 arm64:
 	$(MAKE) BUILD_DIR=build/arm64 CC=$(ARM64_CC) all
 
-# 仅清理当前 BUILD_DIR 下的 omni_client 与其入口对象。
-clean-client:
-	rm -f $(CLIENT_CLEAN_FILES)
-
-# 仅清理 build/arm64 下的 omni_client 与其入口对象。
-clean-arm64-client:
-	rm -f $(ARM64_CLIENT_CLEAN_FILES)
-
 # 清理构建目录。
 clean:
 	rm -rf build
@@ -121,7 +80,5 @@ help:
 	@echo "make        -> build native binaries in build/"
 	@echo "make arm    -> build ARM binaries in build/arm (arm-linux-gnueabihf-gcc)"
 	@echo "make arm64  -> build ARM64 binaries in build/arm64 (aarch64-linux-gnu-gcc)"
-	@echo "generated binaries: omni_test omni_client omni_server omni_relay omni_hub omni_peer omni_bridge"
-	@echo "make clean-client       -> remove omni_client and client_main.o in BUILD_DIR"
-	@echo "make clean-arm64-client -> remove omni_client and client_main.o in build/arm64"
+	@echo "generated binaries: omni_hub omni_peer omni_bridge"
 	@echo "make clean  -> remove build artifacts"