Skip to content

Commit 03998d9

Browse files
committed
- Remove inet_ntoa emulation since it's not thread-safe and not used by TAO
- Calling ACE_OS::hostname within ACE_OS::uname causes infinite call loop
1 parent f6cf9e7 commit 03998d9

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

Diff for: ACE/ace/OS_NS_arpa_inet.cpp

-20
Original file line numberDiff line numberDiff line change
@@ -102,24 +102,4 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr)
102102
#endif /* ACE_LACKS_INET_ATON */
103103
}
104104

105-
#if defined (ACE_INTEGRITY) && defined (ACE_LACKS_INET_NTOA)
106-
char* ACE_OS::inet_ntoa (const struct in_addr addr)
107-
{
108-
ACE_OS_TRACE ("ACE_OS::inet_ntoa");
109-
110-
static ACE_thread_mutex_t mutex;
111-
static char addrstr[INET_ADDRSTRLEN + 1] = { 0 };
112-
113-
LockGuard guard (mutex);
114-
ACE_UINT32 ipaddr = ntohl (addr.s_addr);
115-
sprintf (addrstr,
116-
"%d.%d.%d.%d",
117-
((ipaddr & 0xff000000) >> 24) & 0x000000ff,
118-
(ipaddr & 0x00ff0000) >> 16,
119-
(ipaddr & 0x0000ff00) >> 8,
120-
(ipaddr & 0x000000ff));
121-
return addrstr;
122-
}
123-
#endif /* ACE_INTEGRITY && ACE_LACKS_INET_NTOA */
124-
125105
ACE_END_VERSIONED_NAMESPACE_DECL

Diff for: ACE/ace/OS_NS_arpa_inet.inl

-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ ACE_OS::inet_addr (const char *name)
5353
#endif /* ACE_HAS_NONCONST_INET_ADDR */
5454
}
5555

56-
#if !(defined (ACE_INTEGRITY) && defined (ACE_LACKS_INET_NTOA))
5756
ACE_INLINE char *
5857
ACE_OS::inet_ntoa (const struct in_addr addr)
5958
{
@@ -65,7 +64,6 @@ ACE_OS::inet_ntoa (const struct in_addr addr)
6564
return ::inet_ntoa (addr);
6665
# endif
6766
}
68-
#endif
6967

7068
ACE_INLINE const char *
7169
ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)

Diff for: ACE/ace/OS_NS_sys_utsname.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ ACE_OS::uname (ACE_utsname *name)
220220
return -1;
221221
}
222222

223-
if (ACE_OS::hostname (name->nodename, __SYS_NMLN) != 0)
223+
if (::gethostname (name->nodename, __SYS_NMLN) != 0)
224224
return -1;
225225

226226
# if defined (ACE_INTEGRITY178B)

0 commit comments

Comments
 (0)