- removed duplicate code in socket_linux.c (LIB61850-360)

v1.6_develop_rgoose_sntp
Michael Zillgith 3 years ago
parent cec871f2e3
commit 6836063414

@ -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); 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) { if (address) {
bool isIPv6; bool isIPv6;
char addrString[INET6_ADDRSTRLEN + 7]; char addrString[INET6_ADDRSTRLEN + 7];

Loading…
Cancel
Save