From 6836063414b6e67e0a50cf8460456da53cdc6d5a Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Mon, 31 Oct 2022 18:00:01 +0000 Subject: [PATCH] - removed duplicate code in socket_linux.c (LIB61850-360) --- hal/socket/linux/socket_linux.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/hal/socket/linux/socket_linux.c b/hal/socket/linux/socket_linux.c index 3da1afc9..d53ed419 100644 --- a/hal/socket/linux/socket_linux.c +++ b/hal/socket/linux/socket_linux.c @@ -917,32 +917,6 @@ UdpSocket_receiveFrom(UdpSocket self, char* address, int maxAddrSize, uint8_t* m printf("SOCKET: failed to receive UDP message (errno=%i)\n", errno); } - if (address) { - bool isIPv6; - char addrString[INET6_ADDRSTRLEN + 7]; - int port; - - if (remoteAddress.ss_family == AF_INET) { - struct sockaddr_in* ipv4Addr = (struct sockaddr_in*) &remoteAddress; - port = ntohs(ipv4Addr->sin_port); - inet_ntop(AF_INET, &(ipv4Addr->sin_addr), addrString, INET_ADDRSTRLEN); - isIPv6 = false; - } - else if (remoteAddress.ss_family == AF_INET6) { - struct sockaddr_in6* ipv6Addr = (struct sockaddr_in6*) &remoteAddress; - port = ntohs(ipv6Addr->sin6_port); - inet_ntop(AF_INET6, &(ipv6Addr->sin6_addr), addrString, INET6_ADDRSTRLEN); - isIPv6 = true; - } - else - return -1; - - if (isIPv6) - snprintf(address, maxAddrSize, "[%s]:%i", addrString, port); - else - snprintf(address, maxAddrSize, "%s:%i", addrString, port); - } - if (address) { bool isIPv6; char addrString[INET6_ADDRSTRLEN + 7];