diff --git a/src/libCom/osi/os/WIN32/osdSock.c b/src/libCom/osi/os/WIN32/osdSock.c
index a8aa5af8b..6ea1a775e 100644
--- a/src/libCom/osi/os/WIN32/osdSock.c
+++ b/src/libCom/osi/os/WIN32/osdSock.c
@@ -44,6 +44,7 @@
  * ANSI C
  */
 #include <stdio.h>
+#include <stdlib.h>
 
 /*
  * WIN32 specific
@@ -56,6 +57,7 @@
 
 #define epicsExportSharedSymbols
 #include "osiSock.h"
+#include "errlog.h"
 #include "epicsVersion.h"
 
 static unsigned nAttached = 0;
@@ -220,3 +222,193 @@ epicsShareFunc const char * epicsShareAPI convertSocketErrorToString (int errnoI
 #endif
 }
 
+/*
+ * osiLocalAddr ()
+ */
+epicsShareFunc osiSockAddr epicsShareAPI osiLocalAddr (SOCKET socket)
+{
+	static osiSockAddr  addr;
+	static char     	init;
+	int             	status;
+	INTERFACE_INFO		*pIfinfo;
+	INTERFACE_INFO      *pIfinfoList;
+	unsigned			nelem;
+	DWORD				numifs;
+	DWORD				cbBytesReturned;
+
+	if (init) {
+		return addr;
+	}
+
+    init = 1;
+    addr.sa.sa_family = AF_UNSPEC;
+
+	/* only valid for winsock 2 and above */
+	if (wsaMajorVersion() < 2 ) {
+		return addr;
+	}
+
+	nelem = 10;
+	pIfinfoList = (INTERFACE_INFO *) calloc ( nelem, sizeof (INTERFACE_INFO) );
+	if (!pIfinfoList) {
+		errlogPrintf ("calloc failed\n");
+		return addr;
+    }
+
+	status = WSAIoctl (socket, SIO_GET_INTERFACE_LIST, NULL, 0,
+						(LPVOID)pIfinfoList, nelem*sizeof(INTERFACE_INFO),
+						&cbBytesReturned, NULL, NULL);
+
+	if (status != 0 || cbBytesReturned == 0) {
+		errlogPrintf ("WSAIoctl SIO_GET_INTERFACE_LIST failed %d\n",WSAGetLastError());
+		free (pIfinfoList);		
+		return addr;
+    }
+
+	numifs = cbBytesReturned / sizeof(INTERFACE_INFO);
+	for (pIfinfo = pIfinfoList; pIfinfo < (pIfinfoList+numifs); pIfinfo++){
+
+		/*
+		 * dont use interfaces that have been disabled
+		 */
+		if (!(pIfinfo->iiFlags & IFF_UP)) {
+			continue;
+		}
+
+		/*
+		 * dont use the loop back interface
+		 */
+		if (pIfinfo->iiFlags & IFF_LOOPBACK) {
+			continue;
+		}
+
+		addr.sa = pIfinfo->iiAddress.Address;
+
+		/* Work around MS Winsock2 bugs */
+        if (addr.sa.sa_family == 0) {
+            addr.sa.sa_family = AF_INET;
+        }
+
+		free (pIfinfoList);
+        return addr;
+	}
+
+    free (pIfinfoList);
+	return addr;
+}
+
+/*
+ *  	osiSockDiscoverBroadcastAddresses ()
+ */
+epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
+     (ELLLIST *pList, SOCKET socket, const osiSockAddr *pMatchAddr)
+{
+	struct sockaddr_in 	*pInetAddr;
+	struct sockaddr_in 	*pInetNetMask;
+	int             	status;
+	INTERFACE_INFO      *pIfinfo;
+	INTERFACE_INFO      *pIfinfoList;
+	unsigned			nelem;
+	int					numifs;
+	DWORD				cbBytesReturned;
+    osiSockAddrNode     *pNewNode;
+
+	/* only valid for winsock 2 and above */
+	if (wsaMajorVersion() < 2 ) {
+		fprintf(stderr, "Need to set EPICS_CA_AUTO_ADDR_LIST=NO for winsock 1\n");
+		return;
+	}
+
+	nelem = 10;
+	pIfinfoList = (INTERFACE_INFO *) calloc(nelem, sizeof(INTERFACE_INFO));
+	if(!pIfinfoList){
+		return;
+	}
+
+	status = WSAIoctl (socket, SIO_GET_INTERFACE_LIST, 
+						NULL, 0,
+						(LPVOID)pIfinfoList, nelem*sizeof(INTERFACE_INFO),
+						&cbBytesReturned, NULL, NULL);
+
+	if (status != 0 || cbBytesReturned == 0) {
+		fprintf(stderr, "WSAIoctl SIO_GET_INTERFACE_LIST failed %d\n",WSAGetLastError());
+		free(pIfinfoList);		
+		return;
+	}
+
+	numifs = cbBytesReturned/sizeof(INTERFACE_INFO);
+	for (pIfinfo = pIfinfoList; pIfinfo < (pIfinfoList+numifs); pIfinfo++){
+
+		/*
+		 * dont bother with interfaces that have been disabled
+		 */
+		if (!(pIfinfo->iiFlags & IFF_UP)) {
+			continue;
+		}
+
+		/*
+		 * dont use the loop back interface
+		 */
+		if (pIfinfo->iiFlags & IFF_LOOPBACK) {
+			continue;
+		}
+
+		pInetAddr = (struct sockaddr_in *) &pIfinfo->iiAddress;
+		pInetNetMask = (struct sockaddr_in *) &pIfinfo->iiNetmask;
+
+		/*
+		 * work around WS2 bug
+		 */
+		if (pIfinfo->iiAddress.Address.sa_family != AF_INET) {
+			if (pIfinfo->iiAddress.Address.sa_family == 0) {
+				pIfinfo->iiAddress.Address.sa_family = AF_INET;
+			}
+		}
+
+		/*
+		 * if it isnt a wildcarded interface then look for
+		 * an exact match
+		 */
+        if (pMatchAddr->sa.sa_family != AF_UNSPEC) {
+            if (pIfinfo->iiAddress.Address.sa_family != pMatchAddr->sa.sa_family) {
+                continue;
+            }
+            if (pIfinfo->iiAddress.Address.sa_family != AF_INET) {
+                continue;
+            }
+            if (pMatchAddr->sa.sa_family != AF_INET) {
+                continue;
+            }
+		    if (pMatchAddr->ia.sin_addr.s_addr != htonl(INADDR_ANY)) {
+			    if (pIfinfo->iiAddress.AddressIn.sin_addr.s_addr != pMatchAddr->ia.sin_addr.s_addr) {
+				    continue;
+			    }
+		    }
+        }
+
+        pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
+        if (pNewNode==NULL) {
+            errlogPrintf ("osiSockDiscoverInterfaces(): no memory available for configuration\n");
+            return;
+        }
+
+        if (pIfinfo->iiAddress.Address.sa_family == AF_INET && pIfinfo->iiFlags & IFF_BROADCAST) {
+            const unsigned mask = pIfinfo->iiNetmask.AddressIn.sin_addr.s_addr;
+            const unsigned bcast = pIfinfo->iiBroadcastAddress.AddressIn.sin_addr.s_addr;
+            const unsigned addr = pIfinfo->iiAddress.AddressIn.sin_addr.s_addr;
+            unsigned result = (addr & mask) | (bcast &~mask);
+            pNewNode->addr.ia.sin_family = AF_INET;
+            pNewNode->addr.ia.sin_addr.s_addr = result;
+        } 
+        else {
+            pNewNode->addr.sa = pIfinfo->iiBroadcastAddress.Address;
+        }
+
+		/*
+		 * LOCK applied externally
+		 */
+        ellAdd (pList, &pNewNode->node);
+	}
+
+	free (pIfinfoList);
+}