Revert "ICE-6082 added sndBufSize and rcvBufSize to UDPEndpointInfo"

This reverts commit ad55ad9c4996fb32452bba72e337152b27e61963.

5 files changed, 8 insertions, 53 deletions

diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index b13e3fa89f3..26d5cd83640 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -25,13 +25,11 @@ using namespace IceInternal;
 IceUtil::Shared* IceInternal::upCast(UdpEndpointI* p) { return p; }
 
 IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, const string& host, Int port,
-                                        const Address& sourceAddr, const string& mcastInterface, Int mttl,
-                                        Int sndBufSize, Int rcvBufSize, bool conn, const string& conId, bool co) :
+                                        const Address& sourceAddr, const string& mcastInterface, Int mttl, bool conn,
+                                        const string& conId, bool co) :
     IPEndpointI(instance, host, port, sourceAddr, conId),
     _mcastTtl(mttl),
     _mcastInterface(mcastInterface),
-    _sndBufSize(sndBufSize),
-    _rcvBufSize(rcvBufSize),
     _connect(conn),
     _compress(co)
 {
@@ -40,8 +38,6 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, con
 IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance) :
     IPEndpointI(instance),
     _mcastTtl(-1),
-    _sndBufSize(-1),
-    _rcvBufSize(-1),
     _connect(false),
     _compress(false)
 {
@@ -50,8 +46,6 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance) :
 IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) :
     IPEndpointI(instance, s),
     _mcastTtl(-1),
-    _sndBufSize(-1),
-    _rcvBufSize(-1),
     _connect(false),
     _compress(false)
 {
@@ -134,8 +128,8 @@ IceInternal::UdpEndpointI::compress(bool compress) const
     }
     else
     {
-        return new UdpEndpointI(_instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl, _sndBufSize,
-                                _rcvBufSize, _connect, _connectionId, compress);
+        return new UdpEndpointI(_instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl, _connect,
+                                _connectionId, compress);
     }
 }
 
@@ -167,14 +161,7 @@ UdpEndpointIPtr
 IceInternal::UdpEndpointI::endpoint(const UdpTransceiverPtr& transceiver) const
 {
     return new UdpEndpointI(_instance, _host, transceiver->effectivePort(), _sourceAddr, _mcastInterface, _mcastTtl,
-                            transceiver->sndBufSize(), transceiver->rcvBufSize(), _connect, _connectionId, _compress);
-}
-
-void
-IceInternal::UdpEndpointI::setBufSize(int sndSize, int rcvSize)
-{
-    const_cast<int&>(_sndBufSize) = sndSize;
-    const_cast<int&>(_rcvBufSize) = rcvSize;
+                            _connect, _connectionId, _compress);
 }
 
 string
@@ -348,8 +335,6 @@ IceInternal::UdpEndpointI::fillEndpointInfo(IPEndpointInfo* info) const
         udpInfo->compress = _compress;
         udpInfo->mcastTtl = _mcastTtl;
         udpInfo->mcastInterface = _mcastInterface;
-        udpInfo->sndBufSize = _sndBufSize;
-        udpInfo->rcvBufSize = _rcvBufSize;
     }
 }
 
@@ -447,8 +432,8 @@ IceInternal::UdpEndpointI::createConnector(const Address& address, const Network
 IPEndpointIPtr
 IceInternal::UdpEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
 {
-    return new UdpEndpointI(_instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _sndBufSize, _rcvBufSize,
-                            _connect, connectionId, _compress);
+    return new UdpEndpointI(_instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _connect, connectionId,
+                            _compress);
 }
 
 IceInternal::UdpEndpointFactory::UdpEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance)
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index 545decafca7..0177963f0d9 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -23,7 +23,7 @@ class UdpEndpointI : public IPEndpointI
 public:
 
     UdpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, const Address&, const std::string&,
-                 Ice::Int, Ice::Int sndBufSize, Ice::Int rcvBufSize, bool, const std::string&, bool);
+                 Ice::Int, bool, const std::string&, bool);
     UdpEndpointI(const ProtocolInstancePtr&);
     UdpEndpointI(const ProtocolInstancePtr&, BasicStream*);
 
@@ -44,7 +44,6 @@ public:
     virtual bool operator<(const Ice::LocalObject&) const;
 
     UdpEndpointIPtr endpoint(const UdpTransceiverPtr&) const;
-    void setBufSize(int sndSize, int rcvSize);
 
     using IPEndpointI::connectionId;
 
@@ -65,8 +64,6 @@ private:
     //
     const Ice::Int _mcastTtl;
     const std::string _mcastInterface;
-    const int _sndBufSize;
-    const int _rcvBufSize;
     const bool _connect;
     const bool _compress;
 };
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 8085c1d47bb..1d2fcf47bbf 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -884,19 +884,6 @@ IceInternal::UdpTransceiver::effectivePort() const
     return getPort(_addr);
 }
 
-int
-IceInternal::UdpTransceiver::sndBufSize() const
-{
-    return _sndSize;
-}
-
-int
-IceInternal::UdpTransceiver::rcvBufSize() const
-{
-    return _rcvSize;
-}
-
-
 IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
                                             const Address& addr,
 #ifdef ICE_OS_WINRT
@@ -1097,10 +1084,6 @@ IceInternal::UdpTransceiver::setBufSize(const Ice::PropertiesPtr& properties)
             }
         }
     }
-
-    if (_endpoint) {
-        _endpoint->setBufSize(_sndSize, _rcvSize);
-    }
 }
 
 #ifdef ICE_OS_WINRT
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 5844c65ac7a..b09c9ce327e 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -63,8 +63,6 @@ public:
     virtual void checkSendSize(const Buffer&);
 
     int effectivePort() const;
-    int sndBufSize() const;
-    int rcvBufSize() const;
 
 private:
 
diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp
index 14c7f6a6623..3997c533a56 100644
--- a/cpp/test/Ice/info/AllTests.cpp
+++ b/cpp/test/Ice/info/AllTests.cpp
@@ -18,10 +18,6 @@ using namespace Test;
 void
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    Ice::PropertiesPtr properties = communicator->getProperties();
-    properties->setProperty("Ice.UDP.SndSize", "1024");
-    properties->setProperty("Ice.UDP.RcvSize", "2048");
-
     cout << "testing proxy endpoint information... " << flush;
     {
         Ice::ObjectPrx p1 =
@@ -64,8 +60,6 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(!udpEndpoint->secure());
         test(udpEndpoint->datagram());
         test(udpEndpoint->type() == Ice::UDPEndpointType);
-        test(udpEndpoint->sndBufSize == -1);
-        test(udpEndpoint->rcvBufSize == -1);
 
         Ice::OpaqueEndpointInfoPtr opaqueEndpoint = Ice::OpaqueEndpointInfoPtr::dynamicCast(endps[2]->getInfo());
         test(opaqueEndpoint);
@@ -100,8 +94,6 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(udpEndpoint->host == defaultHost);
         test(udpEndpoint->datagram());
         test(udpEndpoint->port > 0);
-        test(udpEndpoint->sndBufSize == 1024);
-        test(udpEndpoint->rcvBufSize == 2048);
 
         adapter->destroy();