stv0g/libiec61850
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- now uses getaddrinfo in socket_linux.c

Browse source
This commit is contained in:
Michael Zillgith 2015-02-04 08:47:25 +01:00
parent c1c60b6a24
commit f9d673dcf3
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/hal/socket/linux/socket_linux.c
View file

@ -135,24 +135,35 @@ activateKeepAlive(int sd)
static bool
prepareServerAddress(const char* address, int port, struct sockaddr_in* sockaddr)
{
bool retVal = true;
memset((char *) sockaddr , 0, sizeof(struct sockaddr_in));
memset((char *) sockaddr, 0, sizeof(struct sockaddr_in));
if (address != NULL) {
struct hostent *server;
server = gethostbyname(address);
if (address != NULL) {
struct addrinfo addr_hints;
struct addrinfo *lookup_result;
int result;
if (server == NULL) return false;
memset(&addr_hints, 0, sizeof(struct addrinfo));
addr_hints.ai_family = AF_INET;
result = getaddrinfo(address, NULL, &addr_hints, &lookup_result);
memcpy((char *) &sockaddr->sin_addr.s_addr, (char *) server->h_addr, server->h_length);
}
else
sockaddr->sin_addr.s_addr = htonl(INADDR_ANY);
if (result != 0) {
retVal = false;
goto exit_function;
}
memcpy(sockaddr, lookup_result->ai_addr, sizeof(struct sockaddr_in));
freeaddrinfo(lookup_result);
}
else
sockaddr->sin_addr.s_addr = htonl(INADDR_ANY);
sockaddr->sin_family = AF_INET;
sockaddr->sin_port = htons(port);
return true;
exit_function:
return retVal;
}
static void

2
src/mms/iso_mms/server/mms_named_variable_list_service.c
View file

@ -541,8 +541,6 @@ mmsServer_handleGetNamedVariableListAttributesRequest(
StringUtils_createStringFromBufferInBuffer(listName, request->choice.aaspecific.buf,
request->choice.aaspecific.size);
MmsDevice* mmsDevice = MmsServer_getDevice(connection->server);
MmsNamedVariableList varList = MmsServerConnection_getNamedVariableList(connection, listName);
if (varList != NULL)