From d0fc4336be9df89a2d1ba441f64344a5116bd178 Mon Sep 17 00:00:00 2001 From: Niel Nielsen Date: Wed, 26 Aug 2026 12:55:56 +0200 Subject: [PATCH] Add files via upload Signed-off-by: Niel Nielsen --- client/src/uart/uart_posix.c | 54 ++++++++++++++++++++++++++++++++++ client/src/uart/uart_win32.c | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/client/src/uart/uart_posix.c b/client/src/uart/uart_posix.c index 05c0952b5..9576ac7f6 100644 --- a/client/src/uart/uart_posix.c +++ b/client/src/uart/uart_posix.c @@ -208,6 +208,60 @@ serial_port uart_open(const char *pcPortName, uint32_t speed, bool slient) { } int sfd; + + // --wait on a tcp: port -> act as a server: bind, listen, accept one client. + if (isTCP && g_conn.listen_for_incoming) { + int lfd = -1; + for (rp = addr; rp != NULL; rp = rp->ai_next) { + lfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + if (lfd == -1) { + continue; + } + int one = 1; + setsockopt(lfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); + if (bind(lfd, rp->ai_addr, rp->ai_addrlen) == 0) { + break; // bound + } + close(lfd); + lfd = -1; + } + + freeaddrinfo(addr); + free(addrPortStr); + + if (lfd == -1) { + PrintAndLogEx(ERR, "error: could not bind for --wait listen"); + free(sp); + return INVALID_SERIAL_PORT; + } + if (listen(lfd, 1) != 0) { + PrintAndLogEx(ERR, "error: listen() failed. errno: %d", errno); + close(lfd); + free(sp); + return INVALID_SERIAL_PORT; + } + + // blocking accept; interruptible with Ctrl-C + int cfd = accept(lfd, NULL, NULL); + close(lfd); + if (cfd == -1) { + if (slient == false) { + PrintAndLogEx(ERR, "error: accept() failed. errno: %d", errno); + } + free(sp); + return INVALID_SERIAL_PORT; + } + + sp->fd = cfd; + int one = 1; + if (setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one)) != 0) { + close(cfd); + free(sp); + return INVALID_SERIAL_PORT; + } + return sp; + } + for (rp = addr; rp != NULL; rp = rp->ai_next) { sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); diff --git a/client/src/uart/uart_win32.c b/client/src/uart/uart_win32.c index 41dd6f732..75bd156c7 100644 --- a/client/src/uart/uart_win32.c +++ b/client/src/uart/uart_win32.c @@ -214,6 +214,63 @@ serial_port uart_open(const char *pcPortName, uint32_t speed, bool slient) { } SOCKET hSocket = INVALID_SOCKET; + + // --wait on a tcp: port -> act as a server: bind, listen, accept one client. + if (isTCP && g_conn.listen_for_incoming) { + SOCKET lsock = INVALID_SOCKET; + for (rp = addr; rp != NULL; rp = rp->ai_next) { + lsock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + if (lsock == INVALID_SOCKET) { + continue; + } + int one = 1; + setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)); + if (bind(lsock, rp->ai_addr, (int)rp->ai_addrlen) == 0) { + break; // bound + } + closesocket(lsock); + lsock = INVALID_SOCKET; + } + + freeaddrinfo(addr); + free(addrPortStr); + + if (lsock == INVALID_SOCKET) { + PrintAndLogEx(ERR, "error: could not bind for --wait listen. error: %u", WSAGetLastError()); + WSACleanup(); + free(sp); + return INVALID_SERIAL_PORT; + } + if (listen(lsock, 1) != 0) { + PrintAndLogEx(ERR, "error: listen() failed. error: %u", WSAGetLastError()); + closesocket(lsock); + WSACleanup(); + free(sp); + return INVALID_SERIAL_PORT; + } + + SOCKET csock = accept(lsock, NULL, NULL); + closesocket(lsock); + if (csock == INVALID_SOCKET) { + if (slient == false) { + PrintAndLogEx(ERR, "error: accept() failed. error: %u", WSAGetLastError()); + } + WSACleanup(); + free(sp); + return INVALID_SERIAL_PORT; + } + + sp->hSocket = csock; + int one = 1; + if (setsockopt(sp->hSocket, IPPROTO_TCP, TCP_NODELAY, (char *)&one, sizeof(one)) != 0) { + closesocket(csock); + WSACleanup(); + free(sp); + return INVALID_SERIAL_PORT; + } + return sp; + } + for (rp = addr; rp != NULL; rp = rp->ai_next) { hSocket = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);