summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorvishal <vishal@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-10-02 23:51:31 +0000
committervishal <vishal@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-10-02 23:51:31 +0000
commit64af653c1a19f15b69c40ab5c07fbab67d28d0a5 (patch)
treea26b4cab86fa791b8a73e0917d5dd29d702c1853 /ace
parent8d8ca488257aa7934a98791c1c3b414f5185a653 (diff)
downloadATCD-64af653c1a19f15b69c40ab5c07fbab67d28d0a5.tar.gz
*** empty log message ***
Diffstat (limited to 'ace')
-rw-r--r--ace/SOCK_Dgram_Mcast.cpp15
-rw-r--r--ace/SOCK_Dgram_Mcast.h3
2 files changed, 12 insertions, 6 deletions
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index e5ebee0b344..de0351e1eeb 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -236,7 +236,8 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
const ASYS_TCHAR *net_if,
int protocol_family,
int protocol,
- int reuse_addr)
+ int reuse_addr,
+ ACE_Protocol_Info *protocolinfo)
{
ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_ifs");
#if defined (ACE_WIN32)
@@ -277,7 +278,8 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
reuse_addr,
ASYS_TEXT ("0.0.0.0"),
protocol_family,
- protocol) == 0)
+ protocol,
+ protocolinfo) == 0)
++nr_subscribed;
}
else
@@ -295,7 +297,8 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
reuse_addr,
ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()),
protocol_family,
- protocol) == 0)
+ protocol,
+ protocolinfo) == 0)
++nr_subscribed;
}
@@ -315,6 +318,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
ACE_UNUSED_ARG (protocol_family);
ACE_UNUSED_ARG (protocol);
ACE_UNUSED_ARG (reuse_addr);
+ ACE_UNUSED_ARG (protocolinfo);
#endif /* ACE_WIN32 */
// Otherwise, do it like everyone else...
@@ -395,7 +399,8 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
net_if,
protocol_family,
protocol,
- reuse_addr);
+ reuse_addr,
+ protocolinfo);
// Check for the "short-circuit" return value of 1 (for NT).
if (result != 0)
return result;
@@ -407,7 +412,7 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
sockaddr_in mult_addr;
- mult_addr.sin_family = protocol_family;
+ mult_addr.sin_family = protocolinfo->iAddressFamily;
mult_addr.sin_port = ACE_HTONS (mcast_addr.get_port_number ());
mult_addr.sin_addr = this->mcast_request_if_.imr_multiaddr;
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index a072f7bb892..468cbb0493f 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -187,7 +187,8 @@ private:
const ASYS_TCHAR *net_if,
int protocol_family,
int protocol,
- int reuse_addr);
+ int reuse_addr,
+ ACE_Protocol_Info *protocolinfo);
// Subscribe to the multicast interface using QoS-enabled semantics.
int unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,