From 1fc986044ae10ba4dba06cd629580311bb117993 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 7 Mar 2002 18:52:19 +0000
Subject: [PATCH] removed knowledge of subnet mask from network interface query

---
 src/libCom/osi/os/WIN32/osdNetIntf.c   | 4 ----
 src/libCom/osi/os/default/osdNetIntf.c | 9 ---------
 src/libCom/osi/osiSock.h               | 1 -
 3 files changed, 14 deletions(-)

diff --git a/src/libCom/osi/os/WIN32/osdNetIntf.c b/src/libCom/osi/os/WIN32/osdNetIntf.c
index 1c90fdb54..91a5c908b 100644
--- a/src/libCom/osi/os/WIN32/osdNetIntf.c
+++ b/src/libCom/osi/os/WIN32/osdNetIntf.c
@@ -227,13 +227,9 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
             pNewNode->addr.ia.sin_family = AF_INET;
             pNewNode->addr.ia.sin_addr.s_addr = result;
             pNewNode->addr.ia.sin_port = 0u;
-            pNewNode->netMask.ia.sin_family = AF_INET;
-            pNewNode->netMask.ia.sin_addr.s_addr = mask;
-            pNewNode->netMask.ia.sin_port = 0u;
         } 
         else {
             pNewNode->addr.sa = pIfinfo->iiBroadcastAddress.Address;
-            memset ( &pNewNode->netMask, '\0', sizeof ( pNewNode->netMask ) );
         }
 
 		/*
diff --git a/src/libCom/osi/os/default/osdNetIntf.c b/src/libCom/osi/os/default/osdNetIntf.c
index 2ca816d2b..4fb838197 100644
--- a/src/libCom/osi/os/default/osdNetIntf.c
+++ b/src/libCom/osi/os/default/osdNetIntf.c
@@ -180,14 +180,6 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
             }
             pNewNode->addr.sa = pifreq->ifr_broadaddr;
             ifDepenDebugPrintf ( ( "found broadcast addr = %x\n", ntohl ( pNewNode->addr.ia.sin_addr.s_addr ) ) );
-            status = socket_ioctl (socket, SIOCGIFNETMASK, pifreq);
-            if ( status ) {
-                errlogPrintf ( "osiSockDiscoverBroadcastAddresses(): net intf \"%s\": net mask fetch fail\n", pifreq->ifr_name );
-                free ( pNewNode );
-                continue;
-            }
-            pNewNode->netMask.sa = pifreq->ifr_addr;
-            ifDepenDebugPrintf ( ( "found net mask = %x\n", ntohl ( pNewNode->netMask.ia.sin_addr.s_addr ) ) );
         }
 #if defined (IFF_POINTOPOINT)
         else if ( pifreq->ifr_flags & IFF_POINTOPOINT ) {
@@ -198,7 +190,6 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
                 continue;
             }
             pNewNode->addr.sa = pifreq->ifr_dstaddr;
-            memset ( &pNewNode->netMask, '\0', sizeof ( pNewNode->netMask ) );
         }
 #endif
         else {
diff --git a/src/libCom/osi/osiSock.h b/src/libCom/osi/osiSock.h
index 6d76e4da5..10b18a52a 100644
--- a/src/libCom/osi/osiSock.h
+++ b/src/libCom/osi/osiSock.h
@@ -133,7 +133,6 @@ typedef union osiSockAddr {
 typedef struct osiSockAddrNode {
     ELLNODE node;
     osiSockAddr addr;
-    osiSockAddr netMask;
 } osiSockAddrNode;
 
 /*