epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge branch 'fixUtils'

Browse Source
This commit is contained in:
Heinz Junkes
2020-08-19 16:38:05 +02:00
parent c6199d359a 7db4f94b8b
commit af550178e8
1 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/utils/inetAddressUtil.cpp
View File

@@ -13,6 +13,9 @@
#include <ellLib.h>
#include <errlog.h>
#ifdef HAVE_SYS_SOCKIO_H
#include <sys/sockio.h>
#endif
#include <pv/pvType.h>
#include <pv/byteBuffer.h>
#include <pv/epicsException.h>
@@ -164,35 +167,10 @@ void checkNode(ifaceNode& node)
}
}
#if !defined(_WIN32)
/*
* Determine the size of an ifreq structure
* Made difficult by the fact that addresses larger than the structure
* size may be returned from the kernel.
*/
static size_t ifreqSize ( struct ifreq *pifreq )
{
size_t size;
size = ifreq_size ( pifreq );
if ( size < sizeof ( *pifreq ) ) {
size = sizeof ( *pifreq );
}
return size;
}
/*
* Move to the next ifreq structure
*/
static struct ifreq * ifreqNext ( struct ifreq *pifreq )
{
struct ifreq *ifr;
ifr = ( struct ifreq * )( ifreqSize (pifreq) + ( char * ) pifreq );
return ifr;
}
int discoverInterfaces(IfaceNodeVector &list, SOCKET socket, const osiSockAddr *pMatchAddr)
{
static const unsigned nelem = 100;
@@ -203,7 +181,9 @@ int discoverInterfaces(IfaceNodeVector &list, SOCKET socket, const osiSockAddr *
struct ifreq *pifreq;
struct ifreq *pnextifreq;
int match;
#ifdef HAVE_SOCKADDR_SA_LEN
size_t n;
#endif
/*
* use pool so that we avoid using too much stack space
*
@@ -217,40 +197,43 @@ int discoverInterfaces(IfaceNodeVector &list, SOCKET socket, const osiSockAddr *
}
ifconf.ifc_len = nelem * sizeof(*pifreq);
ifconf.ifc_req = pIfreqList;
status = socket_ioctl (socket, SIOCGIFCONF, &ifconf);
if (status < 0 || ifconf.ifc_len == 0) {
errlogPrintf ("discoverInterfaces(): unable to fetch network interface configuration\n");
ifconf.ifc_buf = (caddr_t) pIfreqList;
status = socket_ioctl (socket, SIOCGIFCONF, (char *)&ifconf);
if (status < 0 || ifconf.ifc_len < (int)sizeof(struct ifreq)) {
if (errno == EINVAL)
errlogPrintf ("discoverInterfaces(): SIOCGIFCONF: ifreq struct to small (%zu bytes)\n",
sizeof(ifconf));
else
errlogPrintf ("discoverInterfaces(): SIOCGIFCONF: %s \n",
strerror(errno));
free (pIfreqList);
return -1;
}
pIfreqListEnd = (struct ifreq *) (ifconf.ifc_len + (char *) pIfreqList);
pIfreqListEnd--;
for ( pifreq = pIfreqList; pifreq <= pIfreqListEnd; pifreq = pnextifreq ) {
uint32_t current_ifreqsize;
/*
* find the next ifreq
*/
pnextifreq = ifreqNext (pifreq);
/* determine ifreq size */
current_ifreqsize = ifreqSize ( pifreq );
/* copy current ifreq to aligned bufferspace (to start of pIfreqList buffer) */
/* be careful as we re-use part of this space several times below.
* Any member other than ifr_name is invalidated by an ioctl() call
*/
memmove(pIfreqList, pifreq, current_ifreqsize);
//pIfreqListEnd--;
for ( pifreq = pIfreqList; pifreq < pIfreqListEnd; pifreq = pnextifreq ) {
// uint32_t current_ifreqsize;
#ifdef HAVE_SOCKADDR_SA_LEN // have to check for libbsd stack
n = pifreq->ifr_addr.sa_len + sizeof(pifreq->ifr_name);
if (n < sizeof(*pifreq)){
pnextifreq = pifreq + 1;
memmove(pIfreqList, pifreq, sizeof(*pifreq));
} else {
pnextifreq = (struct ifreq *)((char *)pifreq + n);
memmove(pIfreqList, pifreq, n);
}
#else
pnextifreq = pifreq + 1;
memmove(pIfreqList, pifreq, sizeof(*pifreq));
#endif
/*
* If its not an internet interface then dont use it
*/
if ( pIfreqList->ifr_addr.sa_family != AF_INET ) {
continue;
}
/*
* if it isnt a wildcarded interface then look for
* an exact match
@@ -473,6 +456,5 @@ int discoverInterfaces(IfaceNodeVector &list, SOCKET socket, const osiSockAddr *
}
#endif
}
}