summaryrefslogtreecommitdiff
path: root/ace/Sock_Connect.cpp
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-08 22:12:13 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-08 22:12:13 +0000
commit01e323f2bb9b4f71998dc13493f4159d842e5ca6 (patch)
tree42dbf7fa8089fbe99734dcf0aba8f812c58d748e /ace/Sock_Connect.cpp
parent2973c7039b81e8d0ccc78661c33b9a5c8048e69f (diff)
downloadATCD-01e323f2bb9b4f71998dc13493f4159d842e5ca6.tar.gz
ChangeLogTag:Thu Feb 8 14:11:36 2001 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/Sock_Connect.cpp')
-rw-r--r--ace/Sock_Connect.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index f5e094a52ab..d39a3fd073f 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -305,7 +305,7 @@ ACE_Sock_Connect::get_bcast_addr (ACE_UINT32 &bcast_addr,
int
ACE_Sock_Connect::get_ip_interfaces (size_t &count,
- ACE_INET_Addr *&addrs)
+ ACE_INET_Addr *&addrs)
{
ACE_TRACE ("ACE_Sock_Connect::get_ip_interfaces");
@@ -324,9 +324,9 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
defined (_MSC_VER) && (_MSC_VER >= 1100)
#endif /* 0 */
- int i, n_interfaces, status;
+ int i, n_interfaces, status;
+
INTERFACE_INFO info[64];
- LPINTERFACE_INFO lpii;
SOCKET sock;
// Get an (overlapped) DGRAM socket to test with
@@ -337,8 +337,10 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
DWORD bytes;
status = WSAIoctl(sock,
SIO_GET_INTERFACE_LIST,
- 0, 0,
- info, sizeof(info),
+ 0,
+ 0,
+ info,
+ sizeof(info),
&bytes,
0,
0);
@@ -358,6 +360,7 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
// because they're down or don't have an IP address.
for (count = 0, i = 0; i < n_interfaces; i++)
{
+ LPINTERFACE_INFO lpii;
struct sockaddr_in *addrp;
lpii = &info[i];
@@ -370,7 +373,7 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
continue;
// Set the address for the caller.
- addrs[count].set(addrp, sizeof(lpii->iiAddress));
+ addrs[count].set(addrp, sizeof(sockaddr_in));
++count;
}