Changeset 18781

Timestamp:

04/27/06 16:18:45 (3 years ago)

Author:

patrick

Message:

Improve the code that uses inet_ntoa(3) or inet_ntop(3) by using
std::ostringstream. This eliminates a Visual C++ 8 compiler warning
about strcpy(3) being deprecated.

Files:

• juggler/trunk/modules/vapor/vpr/md/common/InetAddrHelpers.cpp (modified) (1 diff)

juggler/trunk/modules/vapor/vpr/md/common/InetAddrHelpers.cpp

@@ -324 +324 @@
-      }
-
+      std::ostringstream addr_stream;
+
+#if defined(VPR_OS_Windows)
+      // inet_ntoa() returns a pointer to static memory, which means that
+      // it is not reentrant. Unfortunately, WinSock2 does not provide
+      // inet_ntop(). The memory returned is guaranteed to be valid until
+      // the next socket call in this thread, so there should not be a
+      // race condition here.
+      const char* temp_addr = inet_ntoa(addr->sin_addr);
+
+      if ( NULL != temp_addr )
+      {
+         addr_stream << temp_addr;
+      }
+#else
-      char netaddr[18];
-#if defined(VPR_OS_Windows)
-      // inet_ntoa() returns a pointer to static memory, which means that
-      // it is not reentrant. There is a race condition here between the
-      // time of the return from inet_ntoa() and the time that strcpy()
-      // actually copies the memory. Unfortunately, WinSock2 does not
-      // provide inet_ntop().
-      strcpy(netaddr, inet_ntoa(addr->sin_addr));
-      char* temp_addr = netaddr;
-#else
-      const char* temp_addr = inet_ntop(addr->sin_family, &addr->sin_addr,
-                                        netaddr, sizeof(netaddr));
-#endif
-
-      if ( NULL != temp_addr )
-      {
+         addr_stream << netaddr;
+      }
+#endif
+
+      if ( ! addr_stream.str().empty() )
+      {
-         vpr::InetAddr vpr_addr;
-netaddr
+addr_stream.str()
-         host_addrs.push_back(vpr_addr);
-      }