Explorar o código

fix: network,调试tcpserver时的日志,需要清理一下

Wendal Chen hai 3 meses
pai
achega
6831f81be2

+ 2 - 2
components/network/adapter/luat_network_adapter.c

@@ -1645,7 +1645,7 @@ int network_socket_accept(network_ctrl_t *ctrl, network_ctrl_t *accept_ctrl)
 		DBG_ERR("adapter %d not support accept multiple", ctrl->adapter_index);
 		return -1;
 	}
-	DBG_ERR("执行accept操作 %p %p", adapter, accept_ctrl, adapter->opt->socket_accept);
+	DBG("do accept %p %p", adapter, accept_ctrl, adapter->opt->socket_accept);
 	accept_ctrl->socket_id = adapter->opt->socket_accept(ctrl->socket_id, 0, &accept_ctrl->remote_ip, &accept_ctrl->remote_port, accept_ctrl);
 	if (accept_ctrl->socket_id < 0)
 	{
@@ -1661,7 +1661,7 @@ int network_socket_accept(network_ctrl_t *ctrl, network_ctrl_t *accept_ctrl)
 		accept_ctrl->tcp_timeout_ms = ctrl->tcp_timeout_ms;
 		accept_ctrl->local_port = ctrl->local_port;
 		accept_ctrl->state = NW_STATE_ONLINE;
-		DBG_ERR("accept_ctrl %p tag: %llu", accept_ctrl, accept_ctrl->tag);
+		DBG("accept_ctrl %p tag: %llu", accept_ctrl, accept_ctrl->tag);
 		return 0;
 	}
 }

+ 2 - 2
components/network/adapter_lwip2/net_lwip2.c

@@ -203,7 +203,7 @@ static void net_lwip2_callback_to_nw_task(uint8_t adapter_index, uint32_t event_
 		prvlwip.socket_busy &= ~(1 << param1);
 		break;
 	}
-	LLOGD("socket_cb event_id %08X param.tag %d param3 %ld", event_id, param.tag, param3);
+	//LLOGD("socket_cb event_id %08X param.tag %d param3 %ld", event_id, param.tag, param3);
 	prvlwip.socket_cb(&event, &param);
 }
 
@@ -412,12 +412,12 @@ static err_t net_lwip2_tcp_fast_accept_cb(void *arg, struct tcp_pcb *newpcb, err
 {
 	int socket_id = ((uint32_t)arg) & 0x0000ffff;
 	uint8_t adapter_index = ((uint32_t)arg) >> 16;
-	LLOGD("adapter %d socket %d new client", adapter_index, socket_id);
 	if (err || !newpcb)
 	{
 		net_lwip2_tcp_error(adapter_index, socket_id);
 		return 0;
 	}
+	LLOGD("adapter %d socket %d new client from %s:%d", adapter_index, socket_id, ipaddr_ntoa(&newpcb->remote_ip), newpcb->remote_port);
 	if (prvlwip.socket[socket_id].pcb.tcp != NULL) {
 		LLOGE("accept fail, srv socket busy. from %s:%d", ipaddr_ntoa(&newpcb->remote_ip), newpcb->remote_port);
 		tcp_close(newpcb);