Bug 3972 - reduced trace level for some output and other minor cleanup

1 files changed, 6 insertions, 16 deletions

diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 30e4f7a8c07..8196391e00b 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -24,6 +24,7 @@
 #include <Ice/Network.h>
 #include <Ice/LocalException.h>
 #include <Ice/Properties.h>
+#include <IceUtil/StringUtil.h>
 
 using namespace std;
 using namespace Ice;
@@ -475,7 +476,6 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
     _traceLevels(instance->traceLevels()),
     _logger(instance->initializationData().logger),
     _stats(instance->initializationData().stats),
-    _protocolSupport(instance->protocolSupport()),
     _incoming(false),
     _addr(addr),
     _connect(true),
@@ -515,7 +515,6 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
     _traceLevels(instance->traceLevels()),
     _logger(instance->initializationData().logger),
     _stats(instance->initializationData().stats),
-    _protocolSupport(instance->protocolSupport()),
     _incoming(true),
     _addr(getAddressForServer(host, port, instance->protocolSupport())),
     _connect(connect),
@@ -584,21 +583,12 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
         Trace out(_logger, _traceLevels->networkCat);
         out << "starting to receive udp packets\n" << toString();
         
-        if(_traceLevels->network >= 3)
+        vector<string> interfaces = 
+            getHostsForEndpointExpand(inetAddrToString(_addr), instance->protocolSupport(), true);
+        if(!interfaces.empty())
         {
-            vector<string> interfaces = getHostsForEndpointExpand(inetAddrToString(_addr), _protocolSupport, true);
-            if(!interfaces.empty())
-            {
-                out << "\nlocal interfaces: ";
-                for(unsigned int i = 0; i < interfaces.size(); ++i)
-                {
-                    if(i != 0)
-                    {
-                        out << ", ";
-                    }
-                    out << interfaces[i];
-                }
-            }
+            out << "\nlocal interfaces: ";
+            out << IceUtilInternal::joinString(interfaces, ", ");
         }
     }
 }