diff options
Diffstat (limited to 'ace/SOCK_Dgram.cpp')
| -rw-r--r-- | ace/SOCK_Dgram.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 5c4a04c5397..64c4bd35b27 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -28,8 +28,6 @@ ACE_RCSID (ace, #define IMR_MULTIADDR imr_multiaddr #endif /* ! defined (IMR_MULTIADDR) */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram) void @@ -86,11 +84,10 @@ ACE_SOCK_Dgram::recv (iovec *io_vec, sockaddr *saddr = (sockaddr *) addr.get_addr (); int addr_len = addr.get_size (); - int inlen; + u_long inlen; if (ACE_OS::ioctl (this->get_handle (), - FIONREAD, - &inlen) == -1) + FIONREAD, (u_long *) &inlen) == -1) return -1; else if (inlen > 0) { @@ -620,7 +617,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq, // Look up the interface by number, not name. if_address.ifr_ifno = ACE_OS::atoi (net_if); #else - ACE_OS::strcpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if)); + ACE_OS::string_copy (if_address.ifr_name, net_if, sizeof(if_address.ifr_name)); #endif /* defined (ACE_PSOS) */ if (ACE_OS::ioctl (this->get_handle (), @@ -663,7 +660,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, #if defined(__linux__) if (net_if != 0) { - lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR(net_if)); + lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_TO_CHAR_IN(net_if)); } else #elif defined (ACE_WIN32) @@ -707,10 +704,11 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, { if ((num_if && pAddrs->Ipv6IfIndex == static_cast<unsigned int>(if_ix)) || (!num_if && - (ACE_OS::strcmp (ACE_TEXT_ALWAYS_CHAR (net_if), - pAddrs->AdapterName) == 0 - || ACE_OS::strcmp (ACE_TEXT_ALWAYS_CHAR (net_if), - ACE_Wide_To_Ascii (pAddrs->FriendlyName).char_rep()) == 0))) + // Do we need these conversions? + (ACE_OS::strcmp (ACE_TEXT_TO_CHAR_IN (net_if), + ACE_TEXT_TO_CHAR_IN (pAddrs->AdapterName)) == 0 + || ACE_OS::strcmp (ACE_TEXT_TO_CHAR_IN (net_if), + ACE_TEXT_TO_CHAR_IN (pAddrs->FriendlyName)) == 0))) { lmreq.ipv6mr_interface = pAddrs->Ipv6IfIndex; break; @@ -737,5 +735,3 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, return 0; } #endif /* __linux__ && ACE_HAS_IPV6 */ - -ACE_END_VERSIONED_NAMESPACE_DECL |