merge: 合入网络 fd 失效值契约(含 104 目录重构解冲突)
把 dsh-204f318c-38b4 的网络 fd 契约工作流合入主树:NET_FD_INVALID 单一契约 + 静态门禁 + 回归测试 + 全仓审计 + 最小加固。 解冲突与集成修复: - 5 个数值快照(RAM 文档/tsv/size_attestation/report.json)两侧各自 过时,取主线重构后结构,合并后用权威 Keil 构建(0/0)重新回填: Code=365896 RO=48336 RW=2736 ZI=173104,IRAM1 90.3% / CCM 87.9%。 - iec104_net_mcu.c 的 net_fd 改动随主树 104 目录重构 App/protocol/ → App/iec60870/ 自动迁移,路径正确。 - net-handle 豁免面从旧路径 App/protocol/iec60870/ 对齐到主树重构后的 App/iec60870/(大写 IEC104_* 上游代码暂免检,小写 iec104_* 自研 适配层仍受检),消除 read_socket 布尔标志的误报。 验证:net-handle 0 违规/493 文件 + selftest 42 PASS;size-gate 同码 PASS;mem 双区 <92%;本次 6 文档链接 PASS;主机套件全绿。 预存红项(ioboard_di.c / IEC60870-Slave 第三方文档)不在本次提交。
This commit is contained in:
@@ -79,6 +79,7 @@ static net_fake_stats_t stats;
|
||||
|
||||
static fake_fd_t *fd_at(int fd)
|
||||
{
|
||||
/* 测试代码:假对象域校验用裸区间判据(契约 C4/C6 允许),生产判据不得照抄 */
|
||||
if (fd < 0 || fd >= FAKE_MAX_FD) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -95,7 +96,7 @@ static int alloc_fd(void)
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
return NET_FD_INVALID; /* 契约 C5:分配失败返回失效值(不是随便一个负号) */
|
||||
}
|
||||
|
||||
void net_fake_reset(void)
|
||||
@@ -147,7 +148,7 @@ int net_fake_session_fd(void)
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
return NET_FD_INVALID; /* 契约 C5:无会话 = 失效值 */
|
||||
}
|
||||
|
||||
int net_fake_listen_fd(void)
|
||||
@@ -158,13 +159,13 @@ int net_fake_listen_fd(void)
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
|
||||
int net_fake_listener_armed(void)
|
||||
{
|
||||
int fd = net_fake_listen_fd();
|
||||
return (fd >= 0 && net_listener_armed(fd) != 0) ? 1 : 0;
|
||||
return (fd != NET_FD_INVALID && net_listener_armed(fd) != 0) ? 1 : 0;
|
||||
}
|
||||
|
||||
int net_fake_push_rx(const void *data, int len)
|
||||
@@ -357,6 +358,7 @@ net_sock_t *net_get_sock(int sockfd)
|
||||
|
||||
net_sock_t *net_sock_raw(int sockfd)
|
||||
{
|
||||
/* 测试代码:假对象域校验用裸区间判据(契约 C4),不是生产判据 */
|
||||
if (sockfd < 0 || sockfd >= FAKE_MAX_FD) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -542,7 +544,7 @@ int net_fake_copy_tx(uint8_t *data, int capacity)
|
||||
{
|
||||
int fd = net_fake_session_fd();
|
||||
int n;
|
||||
if (fd < 0) {
|
||||
if (fd == NET_FD_INVALID) {
|
||||
return -1;
|
||||
}
|
||||
n = fds[fd].tx_pending;
|
||||
@@ -572,10 +574,10 @@ int net_socket(int domain, int type)
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
fd = alloc_fd();
|
||||
if (fd >= 0) {
|
||||
if (fd != NET_FD_INVALID) {
|
||||
sync_sock(fd);
|
||||
}
|
||||
return fd;
|
||||
@@ -769,7 +771,8 @@ int net_close(int sockfd)
|
||||
++stats.close_calls;
|
||||
++stats.hardware_calls;
|
||||
if (f == NULL) {
|
||||
return -1;
|
||||
/* 契约 C6:越界 / 未分配 fd 的关闭必须失败 */
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
if (f->is_listener) {
|
||||
/* 真实板端:单连接模型下对监听 fd 调 net_close 会连监听一起毁掉。
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"scope": "REAL backend App/iec60870/104/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware",
|
||||
"backend_sha256": "1bcb602946485156ce04b49343ece9525e8ed50f5d5ee0c1d580982e8d77ecd9",
|
||||
"backend_sha256": "34ff04ff0eaded7da6a6b73156829e84869dc4aad6ac710254039a9b0247a3bf",
|
||||
"sources": {
|
||||
"MATRIX.md": "67126a0b92a832dd15710c3ce611d111e35f66c94d514d14939fdac7bd0ab314",
|
||||
"net_socket_fake.h": "c7c712256b5ac4b5162fd445319296dd32ada4abc6efa0384e65e2635bba38c9",
|
||||
"net_socket_fake.c": "f86ecd73bae57daad7d5d9506a0a8b7158344ba0e01f0e1d16af0ebdbdac3578",
|
||||
"net_socket_fake.c": "3dbf75dcaf1d5159480a41c2783644bbf4892f102694de57f9816c1b9d402dd5",
|
||||
"netmcu_test.c": "a0b2b3b7719e7e355376ffd49755ebb116bcd072722075c0728c7ba37b2cacb4",
|
||||
"check_static.py": "21fdcf1f67c959232b7dcdcdf4ec1c86b3ac75d632aabef480303487f7ab5448"
|
||||
},
|
||||
|
||||
@@ -121,6 +121,21 @@ typedef struct {
|
||||
|
||||
static lftp_net_t g_n;
|
||||
|
||||
/* 假 inet 层的 fd 分配集合(契约 C5/C6/C7):与生产同域的 0 基句柄,
|
||||
* 未分配 / 越界的 lftpd_inet_close 必须失败(返回 NET_FD_INVALID)。 */
|
||||
#define LFTP_FAKE_MAX_FD 8
|
||||
static int g_n_fd_used[LFTP_FAKE_MAX_FD];
|
||||
|
||||
static int lftp_fake_fd_alloc(int fd)
|
||||
{
|
||||
/* 测试代码:假对象域校验用的裸区间判据(契约 C6),非生产判据 */
|
||||
if (fd < 0 || fd >= LFTP_FAKE_MAX_FD || g_n_fd_used[fd] != 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
g_n_fd_used[fd] = 1;
|
||||
return fd;
|
||||
}
|
||||
|
||||
int lftpd_inet_read_line(int socket, char *buffer, size_t buffer_len)
|
||||
{
|
||||
(void)socket;
|
||||
@@ -168,7 +183,10 @@ int lftpd_inet_listen(int port)
|
||||
{
|
||||
(void)port;
|
||||
g_n.listen_calls++;
|
||||
return g_n.listen_rc;
|
||||
if (g_n.listen_rc < 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
return lftp_fake_fd_alloc(g_n.listen_rc);
|
||||
}
|
||||
|
||||
int lftpd_inet_get_socket_port(int socket)
|
||||
@@ -188,13 +206,20 @@ int lftpd_inet_accept_timeout(int socket, int timeout_ms)
|
||||
(void)socket;
|
||||
(void)timeout_ms;
|
||||
g_n.accept_calls++;
|
||||
return g_n.accept_to_rc;
|
||||
if (g_n.accept_to_rc < 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
return lftp_fake_fd_alloc(g_n.accept_to_rc);
|
||||
}
|
||||
|
||||
int lftpd_inet_close(int socket)
|
||||
{
|
||||
(void)socket;
|
||||
g_n.close_calls++;
|
||||
/* 契约 C6:越界 / 未分配一律失败(假对象复刻生产主人语义) */
|
||||
if (socket < 0 || socket >= LFTP_FAKE_MAX_FD || g_n_fd_used[socket] == 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
g_n_fd_used[socket] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -379,11 +404,12 @@ static lftpd_client_t g_cli;
|
||||
static void reset_all(void)
|
||||
{
|
||||
(void)memset(&g_n, 0, sizeof(g_n));
|
||||
(void)memset(g_n_fd_used, 0, sizeof(g_n_fd_used));
|
||||
(void)memset(&g_io, 0, sizeof(g_io));
|
||||
g_n.string_rc = 0;
|
||||
g_n.listen_rc = 20;
|
||||
g_n.listen_rc = 1; /* 假 fd 域与生产对齐:0 基(契约 C5/C7) */
|
||||
g_n.port = 5000;
|
||||
g_n.accept_to_rc = 21; /* 默认数据通道能连上 */
|
||||
g_n.accept_to_rc = 2; /* 默认数据通道能连上 */
|
||||
g_n.data_write_rc = 0;
|
||||
g_io.stat_rc = 0;
|
||||
g_io.is_dir = 1;
|
||||
@@ -408,8 +434,8 @@ static void reset_all(void)
|
||||
g_sockname_rc = 0;
|
||||
(void)memset(&g_cli, 0, sizeof(g_cli));
|
||||
(void)strcpy(g_cli.directory, "/");
|
||||
g_cli.socket = 10;
|
||||
g_cli.data_socket = -1;
|
||||
g_cli.socket = 0;
|
||||
g_cli.data_socket = NET_FD_INVALID;
|
||||
/* 不写死字段名:认证状态的结构由 lftpd_auth.h 定义,本模块只把它当黑盒清零
|
||||
(口令/锁定逻辑有 test/host/ftp_auth 的 10 条专测,这里不重复验)。 */
|
||||
(void)memset(&s_auth_state, 0, sizeof(s_auth_state));
|
||||
@@ -479,10 +505,11 @@ static void tc_gates(void)
|
||||
"TC-LFTPD-005 if the welcome never got through (peer already gone) finish straight away instead of spinning on reads; that trace really is INFO");
|
||||
|
||||
reset_all();
|
||||
g_cli.data_socket = 33; /* 被动模式已开但客户端直接跑了 */
|
||||
g_cli.data_socket = 1; /* 被动模式已开但客户端直接跑了(假对象域内、已分配) */
|
||||
g_n_fd_used[1] = 1;
|
||||
feed("QUIT", NULL, NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((g_n.close_calls == 1) && (g_cli.data_socket == -1),
|
||||
CHECK((g_n.close_calls == 1) && (g_cli.data_socket == NET_FD_INVALID),
|
||||
"TC-LFTPD-006 on exit the still-open data listener must be released (a single-socket chip must not be left with a dangling socket)");
|
||||
|
||||
reset_all();
|
||||
@@ -495,7 +522,7 @@ static void tc_gates(void)
|
||||
g_cli.auth_logged_in = 1;
|
||||
g_io.opendir_rc = 0;
|
||||
g_io.readdir_n = 0;
|
||||
g_n.listen_rc = 20;
|
||||
g_n.listen_rc = 1;
|
||||
feed("LIST", NULL, NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((rep_has("425 ") == 1) && (g_n.accept_calls == 0),
|
||||
@@ -513,7 +540,7 @@ static void tc_passive(void)
|
||||
关掉(那正是 TC-LFTPD-006 要验的行为),这里要看的是 PASV 自己留下的状态。 */
|
||||
(void)cmd_pasv(&g_cli, NULL);
|
||||
CHECK((strcmp(rep(0), "227 Entering Passive Mode (192,168,31,1,19,136).\r\n") == 0) &&
|
||||
(g_cli.data_socket == 20) && (g_n.listen_calls == 1),
|
||||
(g_cli.data_socket == 1) && (g_n.listen_calls == 1),
|
||||
"TC-LFTPD-011 the 227 tuple: ip through htonl then high byte to low byte (dotted order), port high/low, and the passive listen handle is recorded");
|
||||
|
||||
reset_all();
|
||||
@@ -522,7 +549,7 @@ static void tc_passive(void)
|
||||
feed("PASV", NULL, NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((rep_has("425 ") == 1) && (g_n.close_calls == 1) &&
|
||||
(g_cli.data_socket == -1),
|
||||
(g_cli.data_socket == NET_FD_INVALID),
|
||||
"TC-LFTPD-012 when the local ip is unavailable the listener just created must be closed (no half-passive mode left behind)");
|
||||
|
||||
reset_all();
|
||||
@@ -534,12 +561,12 @@ static void tc_passive(void)
|
||||
|
||||
reset_all();
|
||||
g_cli.auth_logged_in = 1;
|
||||
g_n.listen_rc = 20;
|
||||
g_n.listen_rc = 1;
|
||||
g_n.accept_to_rc = -1; /* 对端一直不开数据通道 */
|
||||
feed("PASV", "LIST", NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((rep_has("150 ") == 1) && (rep_has("425 ") == 1) &&
|
||||
(g_cli.data_socket == -1) && (g_n.close_calls == 1),
|
||||
(g_cli.data_socket == NET_FD_INVALID) && (g_n.close_calls == 1),
|
||||
"TC-LFTPD-014 a failed data accept reports 425 and closes and resets the listener instead of leaving it to the next command");
|
||||
|
||||
reset_all();
|
||||
@@ -593,7 +620,7 @@ static void tc_transfer(void)
|
||||
reset_all();
|
||||
g_cli.auth_logged_in = 1;
|
||||
g_cfg.write_en = 0u;
|
||||
g_n.listen_rc = 20;
|
||||
g_n.listen_rc = 1;
|
||||
feed("PASV", "STOR up.bin", NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((rep_has("550 ") == 1) && (g_n.accept_calls == 0) &&
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
#include "FreeRTOS.h"
|
||||
#include "task.h"
|
||||
|
||||
|
||||
@@ -62,6 +62,10 @@ int g_lfi_debug_count;
|
||||
|
||||
/* ===================== 可控 socket 层 ===================== */
|
||||
|
||||
/* 假 fd 域与生产对齐(契约 C5/C6/C7):0 基 + 已分配集合;
|
||||
* net_close 对越界 / 未分配 fd 必须失败(返回 NET_FD_INVALID 并把 errno 置 BADF)。 */
|
||||
#define LFI_FAKE_MAX_FD 8
|
||||
|
||||
typedef struct {
|
||||
int socket_rc;
|
||||
int bind_rc;
|
||||
@@ -100,11 +104,13 @@ typedef struct {
|
||||
} lfi_net_t;
|
||||
|
||||
static lfi_net_t g_net;
|
||||
static int lfi_fd_used[LFI_FAKE_MAX_FD]; /* 1 = 该 fd 已由假 net_socket/accept 分配 */
|
||||
|
||||
static void net_reset(void)
|
||||
{
|
||||
(void)memset(&g_net, 0, sizeof(g_net));
|
||||
g_net.socket_rc = 3;
|
||||
(void)memset(lfi_fd_used, 0, sizeof(lfi_fd_used));
|
||||
g_net.socket_rc = 0; /* 契约 C5:首个成功 fd 是 0 */
|
||||
g_net.bind_rc = 0;
|
||||
g_net.listen_rc = 0;
|
||||
g_net.getsock_rc = 0;
|
||||
@@ -131,6 +137,10 @@ int net_socket(int domain, int type)
|
||||
g_net.socket_calls++;
|
||||
g_net.last_domain = domain;
|
||||
g_net.last_type = type;
|
||||
/* 测试代码:裸字面量判据属"假对象域校验"语义(契约 C6),非生产判据 */
|
||||
if (g_net.socket_rc >= 0 && g_net.socket_rc < LFI_FAKE_MAX_FD) {
|
||||
lfi_fd_used[g_net.socket_rc] = 1;
|
||||
}
|
||||
return g_net.socket_rc;
|
||||
}
|
||||
|
||||
@@ -154,8 +164,12 @@ int net_listen(int sockfd)
|
||||
|
||||
int net_close(int sockfd)
|
||||
{
|
||||
(void)sockfd;
|
||||
g_net.close_calls++;
|
||||
/* 测试代码:假对象域校验(契约 C6)——越界 / 未分配一律失败 */
|
||||
if (sockfd < 0 || sockfd >= LFI_FAKE_MAX_FD || lfi_fd_used[sockfd] == 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
lfi_fd_used[sockfd] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -275,18 +289,18 @@ static void tc_listen(void)
|
||||
(g_lfi_error_count == 1), "TC-LFTINET-003 a listen failure also closes the socket and logs it");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
CHECK((lftpd_inet_listen(21) == 3) && (g_net.last_domain == NET_AF_INET) &&
|
||||
CHECK((lftpd_inet_listen(21) == 0) && (g_net.last_domain == NET_AF_INET) &&
|
||||
(g_net.last_type == NET_SOCK_STREAM) &&
|
||||
(g_net.last_bind_port_net == net_htons(21u)) && (g_net.listen_calls == 1),
|
||||
"TC-LFTINET-004 a stream listener whose port went through htons (sin_port is network order)");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.getsock_rc = -1;
|
||||
CHECK((lftpd_inet_get_socket_port(3) == -1) && (g_lfi_error_count == 1),
|
||||
CHECK((lftpd_inet_get_socket_port(0) == -1) && (g_lfi_error_count == 1),
|
||||
"TC-LFTINET-005 a failing getsockname returns -1 (never report a stale port as the result)");
|
||||
net_reset(); logs_clear();
|
||||
g_net.getsock_port_net = net_htons(8888u);
|
||||
CHECK(lftpd_inet_get_socket_port(3) == 8888,
|
||||
CHECK(lftpd_inet_get_socket_port(0) == 8888,
|
||||
"TC-LFTINET-006 the port comes back through ntohs into host order");
|
||||
}
|
||||
|
||||
@@ -296,14 +310,14 @@ static void tc_accept(void)
|
||||
{
|
||||
printf("-- TC-LFTINET-010..012 / 020..022 accept --\n");
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = 9; g_net.accept_n = 1;
|
||||
CHECK((lftpd_inet_accept(3) == 9) && (g_net.delay_calls == 0),
|
||||
g_net.accept_seq[0] = 1; g_net.accept_n = 1;
|
||||
CHECK((lftpd_inet_accept(0) == 1) && (g_net.delay_calls == 0),
|
||||
"TC-LFTINET-010 an immediate hit neither sleeps nor waits");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = -1; g_net.accept_seq[2] = 9;
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = -1; g_net.accept_seq[2] = 1;
|
||||
g_net.accept_n = 3;
|
||||
CHECK((lftpd_inet_accept(3) == 9) && (g_net.delay_calls == 2) &&
|
||||
CHECK((lftpd_inet_accept(0) == 1) && (g_net.delay_calls == 2) &&
|
||||
(g_lfi_info_count == 0),
|
||||
"TC-LFTINET-011 every failed round yields the CPU (and feeds the watchdog in the same block) until it succeeds");
|
||||
|
||||
@@ -311,25 +325,25 @@ static void tc_accept(void)
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = -1; g_net.accept_seq[2] = -1;
|
||||
g_net.accept_n = 3;
|
||||
g_net.gen_flip_after = 3; /* 第 3 轮时网络重建 */
|
||||
CHECK((lftpd_inet_accept(3) == -1) && (g_lfi_info_count == 1) &&
|
||||
CHECK((lftpd_inet_accept(0) == -1) && (g_lfi_info_count == 1) &&
|
||||
(g_net.accept_calls == 3),
|
||||
"TC-LFTINET-012 a generation change aborts accept immediately (otherwise the listener stays on the old generation after the new IP takes effect)");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = 9; g_net.accept_n = 2;
|
||||
CHECK((lftpd_inet_accept_timeout(3, 5000) == 9) && (g_net.delay_calls == 1),
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = 1; g_net.accept_n = 2;
|
||||
CHECK((lftpd_inet_accept_timeout(0, 5000) == 1) && (g_net.delay_calls == 1),
|
||||
"TC-LFTINET-020 the data channel is accepted inside the timeout window");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = -1; g_net.accept_n = 2;
|
||||
g_net.armed = 0; /* 监听门被撤(会话已放弃) */
|
||||
CHECK((lftpd_inet_accept_timeout(3, 5000) == -1) && (g_net.accept_calls == 1) &&
|
||||
CHECK((lftpd_inet_accept_timeout(0, 5000) == -1) && (g_net.accept_calls == 1) &&
|
||||
(g_lfi_error_count == 1),
|
||||
"TC-LFTINET-021 lowering the listener gate gives up at once instead of burning the full 5 s on a dead listener");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = -1; g_net.accept_n = 1;
|
||||
CHECK((lftpd_inet_accept_timeout(3, 300) == -1) && (g_net.delay_calls == 3) &&
|
||||
CHECK((lftpd_inet_accept_timeout(0, 300) == -1) && (g_net.delay_calls == 3) &&
|
||||
(g_lfi_info_count == 1),
|
||||
"TC-LFTINET-022 the peer never opens the data channel: step by 100ms to the limit and finish as INFO");
|
||||
}
|
||||
@@ -437,8 +451,13 @@ static void tc_write_read(void)
|
||||
"TC-LFTINET-062 other negative values keep waiting until the 30 s budget is exhausted");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
CHECK((lftpd_inet_close(3) == 0) && (g_net.close_calls == 1),
|
||||
"TC-LFTINET-070 close only forwards to net_close");
|
||||
lfi_fd_used[0] = 1; /* 假对象:fd 0 已由假 net_socket 分配(与生产同域,0 基) */
|
||||
CHECK((lftpd_inet_close(0) == 0) && (g_net.close_calls == 1),
|
||||
"TC-LFTINET-070 close only forwards to net_close (an allocated fd)");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
CHECK((lftpd_inet_close(0) == NET_FD_INVALID) && (g_net.close_calls == 1),
|
||||
"TC-LFTINET-071 closing an unallocated fd must fail (fake mirrors the owner semantics)");
|
||||
}
|
||||
|
||||
int main(void)
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
/* 真实 net_socket.h 会把 FreeRTOS.h / task.h 一起带给调用方,
|
||||
* lftpd_inet.c 正是靠那条链拿 TickType_t / vTaskDelay / pdMS_TO_TICKS,
|
||||
* 所以桩必须照做同样的 include(少一行就是 C2065 未声明)。 */
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
#include "net_types.h"
|
||||
|
||||
net_sock_t *net_get_sock(int sockfd);
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
#include "net_types.h"
|
||||
|
||||
net_sock_t *net_get_sock(int sockfd);
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
#include "net_types.h"
|
||||
|
||||
int net_set_errno(int err);
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
#include "net_types.h"
|
||||
|
||||
const net_sock_t *net_get_sock(int sockfd);
|
||||
|
||||
@@ -346,8 +346,8 @@ static void tc_104_socket_no_inherit(void)
|
||||
p->session_dead == 0U && p->readable == 0U && p->send_ready == 1U &&
|
||||
p->event_cb == NULL,
|
||||
"TC-NETSOCK-104j reusing the slot: no leftover field may carry over");
|
||||
/* 地址族不支持 → INVAL(在 alloc 之前,不占槽) */
|
||||
CHECK(net_socket(NET_AF_INET6, NET_SOCK_STREAM) == -1 &&
|
||||
/* 地址族不支持 → INVAL(在 alloc 之前,不占槽);返回值是契约失效值(C5) */
|
||||
CHECK(net_socket(NET_AF_INET6, NET_SOCK_STREAM) == NET_FD_INVALID &&
|
||||
net_get_errno() == NET_ERR_INVAL && s_net_socks[1].in_use == 0U,
|
||||
"TC-NETSOCK-104k non-INET address family -> INVAL and no slot taken");
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ BUILD = TestBuild(
|
||||
os.path.join(ROOT, "App", "sync"),
|
||||
os.path.join(ROOT, "App", "cfg"),
|
||||
os.path.join(ROOT, "Drivers", "BSP", "NETCFG"),
|
||||
os.path.join(ROOT, "Drivers", "BSP", "NET"), # net_fd.h(stub 先命中,仅补零依赖契约头)
|
||||
os.path.join(ROOT, "Lib", "coreSNTP"),
|
||||
os.path.join(ROOT, "Lib", "coreSNTP", "include"),
|
||||
HERE,
|
||||
|
||||
@@ -50,13 +50,16 @@ static syslog_id_t g_syslog_last_id;
|
||||
/* ---- net fake ---- */
|
||||
#define SNTP_T_NET_SEND_MAX 8
|
||||
#define SNTP_T_NET_RECV_MAX 8
|
||||
/* 假 fd 域与生产对齐(契约 C5/C7):0 基、上限 8,失效值 NET_FD_INVALID */
|
||||
#define SNTP_T_NET_MAX_FD 8
|
||||
#define SNTP_T_NET_IP(o1,o2,o3,o4) { (o1), (o2), (o3), (o4) }
|
||||
|
||||
static uint32_t g_gen;
|
||||
static int g_sock_next_fd = 100;
|
||||
/* 已分配 fd 集合(1 = 已分配)。net_close 对未分配 fd 必须失败——复刻生产 C6 */
|
||||
static int g_fd_alloc[SNTP_T_NET_MAX_FD];
|
||||
static int g_sock_opens;
|
||||
static int g_sock_close_calls;
|
||||
static int g_last_close_fd = -1;
|
||||
static int g_sock_close_calls; /* "关闭企图"次数(含对未分配 fd 的失败企图) */
|
||||
static int g_last_close_fd = NET_FD_INVALID;
|
||||
static int g_bind_calls;
|
||||
static int g_bind_ret; /* 脚本:0 成功 / -1 失败 */
|
||||
static int g_errno_val;
|
||||
@@ -121,10 +124,10 @@ void syslog_post_quiet(syslog_id_t id, const char *desc)
|
||||
/* ---- net fake 实现 ---- */
|
||||
static void sntp_t_net_reset(void)
|
||||
{
|
||||
g_sock_next_fd = 100;
|
||||
memset(g_fd_alloc, 0, sizeof(g_fd_alloc)); /* 假 fd 域:0 基,重置为空闲 */
|
||||
g_sock_opens = 0;
|
||||
g_sock_close_calls = 0;
|
||||
g_last_close_fd = -1;
|
||||
g_last_close_fd = NET_FD_INVALID;
|
||||
g_bind_calls = 0;
|
||||
g_bind_ret = 0;
|
||||
g_errno_val = 0;
|
||||
@@ -164,10 +167,19 @@ static void sntp_t_push_recv(int kind, const uint8_t *data, int len,
|
||||
|
||||
int net_socket(int domain, int type)
|
||||
{
|
||||
int fd;
|
||||
|
||||
(void)domain;
|
||||
(void)type;
|
||||
g_sock_opens++;
|
||||
return g_sock_next_fd++;
|
||||
/* 与生产同域:最小空闲槽、0 基;全满返回契约失效值(不是"随便给个号") */
|
||||
for (fd = 0; fd < SNTP_T_NET_MAX_FD; fd++) {
|
||||
if (g_fd_alloc[fd] == 0) {
|
||||
g_fd_alloc[fd] = 1;
|
||||
return fd;
|
||||
}
|
||||
}
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
|
||||
int net_bind(int sockfd, const struct net_sockaddr *addr, int addrlen)
|
||||
@@ -230,8 +242,16 @@ int net_recvfrom_to(int sockfd, void *buf, int len, uint32_t timeout_ms,
|
||||
|
||||
int net_close(int sockfd)
|
||||
{
|
||||
/* 无条件计数"关闭企图":旧实现(零初始化 fd=0)会来关未分配的 fd 0,
|
||||
* 只有计数包含失败企图,回归用例才能看见这个动作(契约 C6 的另一面) */
|
||||
g_sock_close_calls++;
|
||||
g_last_close_fd = sockfd;
|
||||
/* 复刻生产语义:越界 / 未分配一律失败(测试代码,故与常量比较) */
|
||||
if ((sockfd < 0) || (sockfd >= SNTP_T_NET_MAX_FD) || (g_fd_alloc[sockfd] == 0)) {
|
||||
g_errno_val = NET_ERR_BADF;
|
||||
return -1;
|
||||
}
|
||||
g_fd_alloc[sockfd] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -741,7 +761,7 @@ static void tc_recv_err_deadfd(void)
|
||||
g_errno_val = NET_ERR_CONNRESET;
|
||||
g_tick += 200u;
|
||||
time_sntp_run(g_gen);
|
||||
CHECK(g_last_close_fd >= 100 && s_ctx.fd == -1, "recverr: dead fd closed");
|
||||
CHECK(g_last_close_fd == 0 && s_ctx.fd == NET_FD_INVALID, "recverr: dead fd closed");
|
||||
CHECK(s_ctx.state == SNTP_ST_WAIT_DUE, "recverr: backoff");
|
||||
/* 下一轮到点自动重开 socket */
|
||||
for (t = 0; t < 12000u; t += 200u) {
|
||||
@@ -932,12 +952,36 @@ static void tc_offset_math(void)
|
||||
CHECK(exp == 5000LL, "off: (T2-T1+T3-T4)/2 == 5000ms exact");
|
||||
}
|
||||
|
||||
/*
|
||||
* 回归用例:冷启动 + 网络代次变化不得产生任何关闭企图的 net_close。
|
||||
* 抓的是板端 104 连不上的真因:s_ctx 是文件作用域 static,旧实现零初始化 →
|
||||
* fd == 0(0 是合法 fd!),s_socket_close() 判据 `fd >= 0` 成立 → 对 fd 0 发
|
||||
* net_close,把别的服务(实测 FTP 监听槽 0)关掉。
|
||||
*
|
||||
* 顺序要求(不可改用 s_case_reset):必须先清"关闭企图"计数,再让代次跳变;
|
||||
* s_case_reset 把 g_gen++ 放在计数清零之前,会把这个证据擦掉。
|
||||
*/
|
||||
static void tc_cold_start_gen_change_no_close(void)
|
||||
{
|
||||
CHECK(s_ctx.fd == NET_FD_INVALID,
|
||||
"coldstart: fd 显式初始化为 NET_FD_INVALID(0 是合法 fd)");
|
||||
|
||||
g_sock_close_calls = 0;
|
||||
g_gen++; /* 冷启动首轮代次变化(等价上电后网卡就绪) */
|
||||
time_sntp_run(g_gen);
|
||||
|
||||
CHECK(g_sock_close_calls == 0,
|
||||
"coldstart: 代次变化不得产生 net_close 企图(旧实现会关未分配的 fd 0)");
|
||||
CHECK(s_ctx.fd == NET_FD_INVALID, "coldstart: 代次变化后仍无持有 fd");
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
setvbuf(stdout, NULL, _IONBF, 0);
|
||||
printf("=== SNTP Client Tests ===\n");
|
||||
|
||||
#define TC(fn) do { printf("[" #fn "]\n"); fn(); } while (0)
|
||||
TC(tc_cold_start_gen_change_no_close);
|
||||
TC(tc_poll_clamp);
|
||||
TC(tc_disabled_silent);
|
||||
TC(tc_first_send_window);
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
* 载荷/源地址/返回值由测试脚本注入(sntp_test.c 的 fake 实现)。 */
|
||||
#ifndef SNTP_TEST_NET_SOCKET_H
|
||||
#define SNTP_TEST_NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
#include "task.h"
|
||||
#include "net_types.h"
|
||||
|
||||
|
||||
@@ -48,6 +48,7 @@ BUILD = TestBuild(
|
||||
os.path.join(HERE, "stub"),
|
||||
os.path.join(ROOT, "App", "util"),
|
||||
os.path.join(ROOT, "App", "sync"),
|
||||
os.path.join(ROOT, "Drivers", "BSP", "NET"), # net_fd.h(stub 先命中,仅补零依赖契约头)
|
||||
HERE,
|
||||
],
|
||||
summary_marker="=== Time Sync Tests:",
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "FreeRTOS.h"
|
||||
|
||||
@@ -40,6 +40,7 @@ BUILD = TestBuild(
|
||||
include_dirs=[
|
||||
os.path.join(HERE, "stub"),
|
||||
os.path.join(ROOT, "Drivers", "BSP", "UI"),
|
||||
os.path.join(ROOT, "Drivers", "BSP", "NET"), # net_fd.h(stub 先命中,仅补零依赖契约头)
|
||||
HERE,
|
||||
],
|
||||
summary_marker="=== UI Sink Tests:",
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
/*
|
||||
* 主机侧桩(test/host/ui_sink):镜像真实 Drivers/BSP/NET/net_socket.h 中
|
||||
* ui_net_sink.c 用到的 API 面(签名逐字一致),实现由测试文件提供假件。
|
||||
@@ -11,6 +13,7 @@
|
||||
#define NET_SOCK_STREAM 1
|
||||
#define NET_INADDR_ANY 0u
|
||||
#define NET_ERR_WOULDBLOCK 11
|
||||
#define NET_ERR_BADF (-2) /* 与生产 net_types.h 同值:假 net_close 未分配关闭用 */
|
||||
|
||||
struct net_sockaddr {
|
||||
unsigned short sa_family;
|
||||
|
||||
@@ -18,6 +18,10 @@
|
||||
int g_uisink_err_count = 0;
|
||||
|
||||
/* ===================== 假件:net 层 ===================== */
|
||||
/* 假 fd 域与生产对齐(契约 C5/C7):0 基、上限 8;net_close 复刻 C6 的
|
||||
* "越界 / 未分配必须失败",未分配关闭返回 -1 并置 BADF。 */
|
||||
#define UI_SINK_FAKE_MAX_FD 8
|
||||
static int f_fd_used[UI_SINK_FAKE_MAX_FD]; /* 1 = 该 fd 已分配 */
|
||||
static int f_rpc; /* 本轮已发生的 net RPC 次数 */
|
||||
static int f_closes;
|
||||
static int f_accepts;
|
||||
@@ -39,7 +43,7 @@ static int rxq_len, rxq_pos;
|
||||
|
||||
uint32_t net_get_generation(void) { return f_gen; }
|
||||
uint16_t net_htons(uint16_t v) { return (uint16_t)((v << 8) | (v >> 8)); }
|
||||
int net_socket(int d, int t) { (void)d; (void)t; f_rpc++; return f_next_fd; }
|
||||
int net_socket(int d, int t) { (void)d; (void)t; f_rpc++; if (f_next_fd >= 0 && f_next_fd < UI_SINK_FAKE_MAX_FD) { f_fd_used[f_next_fd] = 1; } return f_next_fd; }
|
||||
int net_bind(int fd, const struct net_sockaddr *a, int l) { (void)fd; (void)a; (void)l; f_rpc++; return 0; }
|
||||
int net_listen(int fd) { (void)fd; f_rpc++; return 0; }
|
||||
int net_accept(int fd, struct net_sockaddr *a, int *l) {
|
||||
@@ -48,6 +52,7 @@ int net_accept(int fd, struct net_sockaddr *a, int *l) {
|
||||
if (f_accept_next >= 0) {
|
||||
int c = f_accept_next;
|
||||
f_accept_next = -1;
|
||||
if (c < UI_SINK_FAKE_MAX_FD) { f_fd_used[c] = 1; }
|
||||
return c;
|
||||
}
|
||||
f_errno_v = NET_ERR_WOULDBLOCK;
|
||||
@@ -75,7 +80,16 @@ int net_recv_nb(int fd, void *b, int n) {
|
||||
rxq_pos += take;
|
||||
return take;
|
||||
}
|
||||
int net_close(int fd) { (void)fd; f_rpc++; f_closes++; return 0; }
|
||||
int net_close(int fd) {
|
||||
f_rpc++; f_closes++;
|
||||
/* 测试代码:裸字面量判据在此是"假对象域校验"语义,非生产判据(契约 C6) */
|
||||
if (fd < 0 || fd >= UI_SINK_FAKE_MAX_FD || f_fd_used[fd] == 0) {
|
||||
f_errno_v = NET_ERR_BADF;
|
||||
return -1;
|
||||
}
|
||||
f_fd_used[fd] = 0;
|
||||
return 0;
|
||||
}
|
||||
int net_get_errno(void) { return f_errno_v; }
|
||||
void *net_get_sock(int fd) { (void)fd; return f_sock_alive ? (void *)&f_gen : (void *)0; }
|
||||
|
||||
@@ -144,9 +158,10 @@ static void fresh(int hook) {
|
||||
memset(rxq, 0, sizeof(rxq));
|
||||
rxq_len = rxq_pos = 0;
|
||||
f_rpc = 0; f_closes = 0; f_accepts = 0;
|
||||
memset(f_fd_used, 0, sizeof(f_fd_used));
|
||||
f_armed = 0; f_can_read = 0; f_accept_next = -1;
|
||||
f_recv_mode = 1; f_gen = 1; f_errno_v = 0;
|
||||
f_next_fd = 3; f_sock_alive = 1;
|
||||
f_next_fd = 0; f_sock_alive = 1;
|
||||
s_key_n = 0; s_lcdmem_calls = 0;
|
||||
g_uisink_err_count = 0; s_last_tx_len = 0;
|
||||
ui_net_sink_set_beat_cb(hook != 0 ? beat_cb : (void (*)(void))0);
|
||||
@@ -172,7 +187,7 @@ static void qframe(uint8_t cmd, const uint8_t *d, int len) {
|
||||
static void case_null_hook_full_protocol(void) {
|
||||
printf("case: unregistered hook runs the whole protocol path unchanged\n");
|
||||
fresh(0);
|
||||
f_armed = 1; f_accept_next = 3; /* MCU 单连接模型:client fd = listen fd */
|
||||
f_armed = 1; f_accept_next = 0; /* MCU 单连接模型:client fd = listen fd */
|
||||
ui_net_sink_poll(); /* accept -> g_client=3 */
|
||||
CHECK(s_beats == 0, "no hook: zero beat side effects");
|
||||
f_armed = 0; /* 已建连后不再走 accept */
|
||||
@@ -197,7 +212,7 @@ static void case_gated_zero_rpc(void) {
|
||||
fresh(1);
|
||||
for (int i = 0; i < 5; i++) { ui_net_sink_poll(); } /* armed=0,无监听活 */
|
||||
CHECK(f_rpc == 0 && s_beats == 0, "listener unarmed: 5 rounds no RPC no beat");
|
||||
f_armed = 1; f_accept_next = 3;
|
||||
f_armed = 1; f_accept_next = 0;
|
||||
ui_net_sink_poll(); /* 建连(1 RPC + 1 心跳) */
|
||||
f_armed = 0;
|
||||
int b0 = s_beats;
|
||||
@@ -231,10 +246,10 @@ static void case_storm_chain_beats(void) {
|
||||
static void case_rebuild_beats(void) {
|
||||
printf("case: generation rebuild feeds after close pair and after re-listen\n");
|
||||
fresh(1);
|
||||
f_armed = 1; f_accept_next = 3;
|
||||
f_armed = 1; f_accept_next = 0;
|
||||
ui_net_sink_poll(); /* client=3=listen */
|
||||
int r0 = f_rpc; int b0 = s_beats;
|
||||
f_gen = 2; f_next_fd = 9;
|
||||
f_gen = 2; f_next_fd = 1;
|
||||
ui_net_sink_poll(); /* 代次变化:close+start */
|
||||
CHECK(f_closes == 1 && f_rpc == r0 + 4,
|
||||
"rebuild does close x1 (client==listen guard) + socket/bind/listen");
|
||||
@@ -247,7 +262,7 @@ static void case_rebuild_beats(void) {
|
||||
static void case_eof_keepalive(void) {
|
||||
printf("case: EOF (MCU model, client==listen) never closes the listen fd\n");
|
||||
fresh(1);
|
||||
f_armed = 1; f_accept_next = 3;
|
||||
f_armed = 1; f_accept_next = 0;
|
||||
ui_net_sink_poll();
|
||||
f_armed = 0; /* EOF 后无 accept 通路的静默形态 */
|
||||
f_recv_mode = 2; f_can_read = 1;
|
||||
|
||||
Reference in New Issue
Block a user