diff --git a/pvAccessApp/utils/inetAddressUtil.cpp b/pvAccessApp/utils/inetAddressUtil.cpp
index 217c740..15e7086 100644
--- a/pvAccessApp/utils/inetAddressUtil.cpp
+++ b/pvAccessApp/utils/inetAddressUtil.cpp
@@ -15,6 +15,7 @@
 #include <ellLib.h>
 #include <epicsAssert.h>
 #include <epicsException.h>
+#include <errlog.h>
 
 /* standard */
 #include <vector>
@@ -29,81 +30,134 @@ using namespace epics::pvData;
 namespace epics {
     namespace pvAccess {
 
-        /* copied from EPICS v3 ca/iocinf.cpp
-         * removeDuplicateAddresses ()
+        /*
+         * osiSockDiscoverBroadcastAddresses () je v
+         *  /opt/epics/base/src/libCom/osi/os/default/osdNetIntf.c
          */
-        void removeDuplicateAddresses(ELLLIST *pDestList, ELLLIST *pSrcList,
-                int silent) {
-            ELLNODE *pRawNode;
-
-            while((pRawNode = ellGet(pSrcList))) {
-                STATIC_ASSERT(offsetof(osiSockAddrNode, node)==0);
-                osiSockAddrNode *pNode =
-                        reinterpret_cast<osiSockAddrNode *> (pRawNode);
-                osiSockAddrNode *pTmpNode;
-
-                if(pNode->addr.sa.sa_family==AF_INET) {
-
-                    pTmpNode = (osiSockAddrNode *)ellFirst (pDestList); // X aCC 749
-                    while(pTmpNode) {
-                        if(pTmpNode->addr.sa.sa_family==AF_INET) {
-                            if(pNode->addr.ia.sin_addr.s_addr
-                                    ==pTmpNode->addr.ia.sin_addr.s_addr
-                                    &&pNode->addr.ia.sin_port
-                                            ==pTmpNode->addr.ia.sin_port) {
-                                if(!silent) {
-                                    char buf[64];
-                                    ipAddrToDottedIP(&pNode->addr.ia, buf,
-                                            sizeof(buf));
-                                    fprintf(
-                                            stderr,
-                                            "Warning: Duplicate EPICS CA Address list entry \"%s\" discarded\n",
-                                            buf);
-                                }
-                                free(pNode);
-                                pNode = NULL;
-                                break;
-                            }
-                        }
-                        pTmpNode = (osiSockAddrNode *)ellNext (&pTmpNode->node); // X aCC 749
-                    }
-                    if(pNode) {
-                        ellAdd(pDestList, &pNode->node);
-                    }
-                }
-                else {
-                    ellAdd(pDestList, &pNode->node);
-                }
-            }
-        }
 
         InetAddrVector* getBroadcastAddresses(SOCKET sock) {
-            ELLLIST bcastList;
-            ELLLIST tmpList;
-            osiSockAddr addr;
+            static const unsigned nelem = 100;
+            int status;
+            struct ifconf ifconf;
+            struct ifreq* pIfreqList;
+            struct ifreq *pifreq;
+            osiSockAddr* pNewNode;
 
-            ellInit ( &bcastList ); // X aCC 392
-            ellInit ( &tmpList ); // X aCC 392
+            InetAddrVector* retVector = new InetAddrVector();
 
-            addr.ia.sin_family = AF_UNSPEC;
-            osiSockDiscoverBroadcastAddresses(&bcastList, sock, &addr);
-            removeDuplicateAddresses(&tmpList, &bcastList, 1);
-            // forcePort ( &bcastList, port );  // if needed copy from ca/iocinf.cpp
-
-            int size = ellCount(&bcastList );
-            InetAddrVector* retVector = new InetAddrVector(size);
-
-            ELLNODE *pRawNode;
-
-            while((pRawNode = ellGet(&tmpList))) {
-                osiSockAddrNode *pNode =
-                        reinterpret_cast<osiSockAddrNode *> (pRawNode);
-                osiSockAddr* posa = new osiSockAddr;
-                memcpy(posa, &(pNode->addr), sizeof(osiSockAddr));
-                retVector->push_back(posa);
-                free(pNode); // using free because it is allocated by calloc
+            /*
+             * use pool so that we avoid using too much stack space
+             *
+             * nelem is set to the maximum interfaces
+             * on one machine here
+             */
+            pIfreqList = new ifreq[nelem];
+            if(!pIfreqList) {
+                errlogSevPrintf( errlogMajor,
+                        "osiSockDiscoverBroadcastAddresses(): no memory to complete request\n");
+                return retVector;
             }
 
+            // get number of interfaces
+            ifconf.ifc_len = nelem*sizeof(ifreq);
+            ifconf.ifc_req = pIfreqList;
+            status = socket_ioctl (sock, SIOCGIFCONF, &ifconf);
+            if(status<0||ifconf.ifc_len==0) {
+                errlogSevPrintf(
+                        errlogMinor,
+                        "osiSockDiscoverBroadcastAddresses(): unable to fetch network interface configuration");
+                delete[] pIfreqList;
+                return retVector;
+            }
+
+            for(int i = 0; i<=ifconf.ifc_len; i++) {
+                pifreq = &pIfreqList[i];
+
+                /*
+                 * If its not an internet interface then dont use it
+                 */
+                if(pifreq->ifr_addr.sa_family!=AF_INET) continue;
+
+                status = socket_ioctl ( sock, SIOCGIFFLAGS, pifreq );
+                if(status) {
+                    errlogSevPrintf(
+                            errlogMinor,
+                            "osiSockDiscoverBroadcastAddresses(): net intf flags fetch for \"%s\" failed\n",
+                            pifreq->ifr_name);
+                    continue;
+                }
+
+                /*
+                 * dont bother with interfaces that have been disabled
+                 */
+                if(!(pifreq->ifr_flags&IFF_UP)) continue;
+
+                /*
+                 * dont use the loop back interface
+                 */
+                if(pifreq->ifr_flags&IFF_LOOPBACK) continue;
+
+                pNewNode = new osiSockAddr;
+                if(pNewNode==NULL) {
+                    errlogSevPrintf(errlogMajor,
+                            "osiSockDiscoverBroadcastAddresses(): no memory available for configuration\n");
+                    delete[] pIfreqList;
+                    return retVector;
+                }
+
+                /*
+                 * If this is an interface that supports
+                 * broadcast fetch the broadcast address.
+                 *
+                 * Otherwise if this is a point to point
+                 * interface then use the destination address.
+                 *
+                 * Otherwise CA will not query through the
+                 * interface.
+                 */
+                if(pifreq->ifr_flags&IFF_BROADCAST) {
+                    status = socket_ioctl (sock, SIOCGIFBRDADDR, pifreq);
+                    if(status) {
+                        errlogSevPrintf(
+                                errlogMinor,
+                                "osiSockDiscoverBroadcastAddresses(): net intf \"%s\": bcast addr fetch fail\n",
+                                pIfreqList->ifr_name);
+                        delete pNewNode;
+                        continue;
+                    }
+                    pNewNode->sa = pifreq->ifr_broadaddr;
+                }
+#ifdef IFF_POINTOPOINT
+                else if(pIfreqList->ifr_flags&IFF_POINTOPOINT) {
+                    status = socket_ioctl ( sock, SIOCGIFDSTADDR, pifreq);
+                    if(status) {
+                        errlogSevPrintf(
+                                errlogMinor,
+                                "osiSockDiscoverBroadcastAddresses(): net intf \"%s\": pt to pt addr fetch fail\n",
+                                pifreq->ifr_name);
+                        delete pNewNode;
+                        continue;
+                    }
+                    pNewNode->sa = pifreq->ifr_dstaddr;
+                }
+#endif
+                else {
+                    errlogSevPrintf(
+                            errlogMinor,
+                            "osiSockDiscoverBroadcastAddresses(): net intf \"%s\": not point to point or bcast?\n",
+                            pifreq->ifr_name);
+                    delete pNewNode;
+                    continue;
+                }
+
+                /*
+                 * LOCK applied externally
+                 */
+                retVector->push_back(pNewNode);
+            }
+
+            delete[] pIfreqList;
+
             return retVector;
         }