diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/api/sockets.c b/Ubiquitous/XiZi_AIoT/services/net/net_server/api/sockets.c index 5f458d8f0..597be55fe 100644 --- a/Ubiquitous/XiZi_AIoT/services/net/net_server/api/sockets.c +++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/api/sockets.c @@ -64,7 +64,7 @@ #endif #include - +#include "libserial.h" #ifdef LWIP_HOOK_FILENAME #include LWIP_HOOK_FILENAME #endif @@ -640,7 +640,7 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d)...\n", s)); sock = get_socket(s); if (!sock) { - KPrintf("sock = get_socket(s);\n"); + printf("sock = get_socket(s);\n"); return -1; } @@ -656,7 +656,7 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) sock_set_errno(sock, err_to_errno(err)); } done_socket(sock); - KPrintf("err = netconn_accept(sock->conn, &newconn);\n"); + printf("err = netconn_accept(sock->conn, &newconn);\n"); return -1; } LWIP_ASSERT("newconn != NULL", newconn != NULL); @@ -666,7 +666,7 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) netconn_delete(newconn); sock_set_errno(sock, ENFILE); done_socket(sock); - KPrintf("newsock = alloc_socket(newconn, 1);\n"); + printf("newsock = alloc_socket(newconn, 1);\n"); return -1; } LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < NUM_SOCKETS + LWIP_SOCKET_OFFSET)); @@ -704,7 +704,7 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) free_socket(nsock, 1); sock_set_errno(sock, err_to_errno(err)); done_socket(sock); - KPrintf("err = netconn_peer(newconn, &naddr, &port);\n"); + printf("err = netconn_peer(newconn, &naddr, &port);\n"); return -1; } @@ -1246,7 +1246,7 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags, if (err != ERR_OK) { LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom[UDP/RAW](%d): buf == NULL, error is \"%s\"!\n", s, lwip_strerr(err))); - KPrintf("lwip_recvfrom[UDP/RAW](%d): buf == NULL, error is \"%s\"!\n", + printf("lwip_recvfrom[UDP/RAW](%d): buf == NULL, error is \"%s\"!\n", s, lwip_strerr(err)); sock_set_errno(sock, err_to_errno(err)); done_socket(sock); diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/lwipopts.h b/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/lwipopts.h index dc89a7c72..ce3be76ac 100644 --- a/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/lwipopts.h +++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/lwipopts.h @@ -200,7 +200,7 @@ /** * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c) */ - #define LWIP_SOCKET 0 + #define LWIP_SOCKET 1 /* --------------------------------- diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/include/lwip/sockets.h b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/lwip/sockets.h index 2edab7be8..8b267bea0 100644 --- a/Ubiquitous/XiZi_AIoT/services/net/net_server/include/lwip/sockets.h +++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/lwip/sockets.h @@ -520,13 +520,20 @@ struct pollfd #define LWIP_TIMEVAL_PRIVATE 1 #endif -#if defined(LWIP_TIMEVAL_PRIVATE) && defined(LIB_MUSLLIB) +#if defined(LWIP_TIMEVAL_PRIVATE) struct timeval { long tv_sec; /* seconds */ long tv_usec; /* and microseconds */ }; #endif /* LWIP_TIMEVAL_PRIVATE */ +// #if defined(LWIP_TIMEVAL_PRIVATE) && defined(LIB_MUSLLIB) +// struct timeval { +// long tv_sec; /* seconds */ +// long tv_usec; /* and microseconds */ +// }; +// #endif /* LWIP_TIMEVAL_PRIVATE */ + #define lwip_socket_init() /* Compatibility define, no init needed. */ void lwip_socket_thread_init(void); /* LWIP_NETCONN_SEM_PER_THREAD==1: initialize thread-local semaphore */ void lwip_socket_thread_cleanup(void); /* LWIP_NETCONN_SEM_PER_THREAD==1: destroy thread-local semaphore */