summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES15
-rw-r--r--cpp/src/Ice/UdpEndpointI.cpp29
-rw-r--r--cpp/src/Ice/UdpEndpointI.h5
-rw-r--r--cpp/src/Ice/UdpTransceiver.cpp17
-rw-r--r--cpp/src/Ice/UdpTransceiver.h2
-rw-r--r--cpp/test/Ice/info/AllTests.cpp8
-rw-r--r--cs/src/Ice/UdpEndpointI.cs25
-rw-r--r--cs/src/Ice/UdpTransceiver.cs15
-rw-r--r--cs/test/Ice/info/AllTests.cs8
-rw-r--r--java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java27
-rw-r--r--java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java15
-rw-r--r--java/test/src/main/java/test/Ice/info/AllTests.java8
-rw-r--r--php/src/IcePHP/Endpoint.cpp6
-rw-r--r--php/test/Ice/info/Client.php5
-rw-r--r--py/modules/IcePy/EndpointInfo.cpp26
-rw-r--r--py/test/Ice/info/AllTests.py8
-rw-r--r--rb/src/IceRuby/Endpoint.cpp4
-rw-r--r--rb/test/Ice/info/AllTests.rb6
-rw-r--r--slice/Ice/Endpoint.ice14
19 files changed, 23 insertions, 220 deletions
diff --git a/CHANGES b/CHANGES
index 8dfbfb52c3f..11edaab6b04 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,17 +18,6 @@ Note that this file only includes changes since Ice 3.2.1. For the
change history of prior releases, refer to the CHANGES file in the
subdirectory of each language mapping (e.g., cpp/CHANGES).
-======================================================================
-Changes since version 3.6b
-======================================================================
-
-
-General Changes
-===============
-
-- Added sndBufSize and rcvBufSize members to UDPEndpointInfo class.
- These are the send and recieve buffer sizes set on socket used by
- the UDP endpoint.
======================================================================
Changes since version 3.5.1
@@ -54,7 +43,7 @@ General Changes
the maximum message size is now only performed on the receiver
side. If the size of the message is greater than the limit, Ice
raises Ice::MemoryLimitException and closes the connection.
-
+
Previously, it was also used to limit the amount of data sent to a
peer (either for a request or reply). This is no longer the case.
@@ -310,7 +299,7 @@ C++ Changes
===========
- Refactored the capture and printing of exception stack traces
- to be more efficient when the stack traces are not printed.
+ to be more efficient when the stack traces are not printed.
The signature of IceUtil::Exception::ice_stackTrace changed to:
std::string ice_stackTrace() const;
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();
diff --git a/cs/src/Ice/UdpEndpointI.cs b/cs/src/Ice/UdpEndpointI.cs
index 38512dad52a..818a84fb16d 100644
--- a/cs/src/Ice/UdpEndpointI.cs
+++ b/cs/src/Ice/UdpEndpointI.cs
@@ -20,13 +20,11 @@ namespace IceInternal
sealed class UdpEndpointI : IPEndpointI
{
public UdpEndpointI(ProtocolInstance instance, string ho, int po, EndPoint sourceAddr, string mcastInterface,
- int mttl, int sndBufSize, int rcvBufSize, bool conn, string conId, bool co) :
+ int mttl, bool conn, string conId, bool co) :
base(instance, ho, po, sourceAddr, conId)
{
_mcastInterface = mcastInterface;
_mcastTtl = mttl;
- _sndBufSize = sndBufSize;
- _rcvBufSize = rcvBufSize;
_connect = conn;
_compress = co;
}
@@ -130,8 +128,8 @@ namespace IceInternal
}
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);
}
}
@@ -172,14 +170,7 @@ namespace IceInternal
public UdpEndpointI endpoint(UdpTransceiver transceiver)
{
return new UdpEndpointI(instance_, host_, transceiver.effectivePort(), sourceAddr_, _mcastInterface,
- _mcastTtl, transceiver.sndBufSize(), transceiver.rcvBufSize(), _connect,
- connectionId_, _compress);
- }
-
- public void setBufSize(int sndSize, int rcvSize)
- {
- _sndBufSize = sndSize;
- _rcvBufSize = rcvSize;
+ _mcastTtl, _connect, connectionId_, _compress);
}
public override string options()
@@ -303,8 +294,6 @@ namespace IceInternal
udpInfo.compress = _compress;
udpInfo.mcastInterface = _mcastInterface;
udpInfo.mcastTtl = _mcastTtl;
- udpInfo.sndBufSize = _sndBufSize;
- udpInfo.rcvBufSize = _rcvBufSize;
}
}
@@ -413,14 +402,12 @@ namespace IceInternal
protected override IPEndpointI createEndpoint(string host, int port, string connectionId)
{
- 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);
}
private string _mcastInterface = "";
private int _mcastTtl = -1;
- private int _sndBufSize = -1;
- private int _rcvBufSize = -1;
private bool _connect;
private bool _compress;
}
diff --git a/cs/src/Ice/UdpTransceiver.cs b/cs/src/Ice/UdpTransceiver.cs
index b79537674ec..68ff87944c5 100644
--- a/cs/src/Ice/UdpTransceiver.cs
+++ b/cs/src/Ice/UdpTransceiver.cs
@@ -816,16 +816,6 @@ namespace IceInternal
return Network.endpointPort(_addr);
}
- public int sndBufSize()
- {
- return _sndSize;
- }
-
- public int rcvBufSize()
- {
- return _rcvSize;
- }
-
//
// Only for use by UdpConnector.
//
@@ -1010,11 +1000,6 @@ namespace IceInternal
}
}
}
-
- if(_endpoint != null)
- {
- _endpoint.setBufSize(_sndSize, _rcvSize);
- }
}
#if ICE_SOCKET_ASYNC_API
diff --git a/cs/test/Ice/info/AllTests.cs b/cs/test/Ice/info/AllTests.cs
index f95b9a79009..5a99dbd5215 100644
--- a/cs/test/Ice/info/AllTests.cs
+++ b/cs/test/Ice/info/AllTests.cs
@@ -34,10 +34,6 @@ public class AllTests : TestCommon.TestApp
public static void allTests(Ice.Communicator communicator)
#endif
{
- Ice.Properties properties = communicator.getProperties();
- properties.setProperty("Ice.UDP.SndSize", "1024");
- properties.setProperty("Ice.UDP.RcvSize", "2048");
-
Write("testing proxy endpoint information... ");
Flush();
{
@@ -87,8 +83,6 @@ public class AllTests : TestCommon.TestApp
test(!udpEndpoint.secure());
test(udpEndpoint.datagram());
test(udpEndpoint.type() == 3);
- test(udpEndpoint.sndBufSize == -1);
- test(udpEndpoint.rcvBufSize == -1);
Ice.OpaqueEndpointInfo opaqueEndpoint = (Ice.OpaqueEndpointInfo)endps[2].getInfo();
test(opaqueEndpoint.rawBytes.Length > 0);
@@ -127,8 +121,6 @@ public class AllTests : TestCommon.TestApp
test(udpEndpoint.host.Equals(defaultHost));
test(udpEndpoint.datagram());
test(udpEndpoint.port > 0);
- test(udpEndpoint.sndBufSize == 1024);
- test(udpEndpoint.rcvBufSize == 2048);
adapter.destroy();
diff --git a/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java b/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java
index 680cd031626..834d4eca127 100644
--- a/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java
+++ b/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java
@@ -12,14 +12,11 @@ package IceInternal;
final class UdpEndpointI extends IPEndpointI
{
public UdpEndpointI(ProtocolInstance instance, String ho, int po, java.net.InetSocketAddress sourceAddr,
- String mcastInterface, int mttl, int sndBufSize, int rcvBufSize, boolean conn, String conId,
- boolean co)
+ String mcastInterface, int mttl, boolean conn, String conId, boolean co)
{
super(instance, ho, po, sourceAddr, conId);
_mcastInterface = mcastInterface;
_mcastTtl = mttl;
- _sndBufSize = sndBufSize;
- _rcvBufSize = rcvBufSize;
_connect = conn;
_compress = co;
}
@@ -123,8 +120,8 @@ final class UdpEndpointI extends IPEndpointI
}
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);
}
}
@@ -168,14 +165,8 @@ final class UdpEndpointI extends IPEndpointI
public UdpEndpointI endpoint(UdpTransceiver transceiver)
{
- return new UdpEndpointI(_instance, _host, transceiver.effectivePort(), _sourceAddr, _mcastInterface, _mcastTtl,
- transceiver.sndBufSize(), transceiver.rcvBufSize(), _connect, _connectionId, _compress);
- }
-
- public void setBufSize(int sndSize, int rcvSize)
- {
- _sndBufSize = sndSize;
- _rcvBufSize = rcvSize;
+ return new UdpEndpointI(_instance, _host, transceiver.effectivePort(), _sourceAddr, _mcastInterface,_mcastTtl,
+ _connect, _connectionId, _compress);
}
//
@@ -305,8 +296,6 @@ final class UdpEndpointI extends IPEndpointI
udpInfo.compress = _compress;
udpInfo.mcastInterface = _mcastInterface;
udpInfo.mcastTtl = _mcastTtl;
- udpInfo.sndBufSize = _sndBufSize;
- udpInfo.rcvBufSize = _rcvBufSize;
}
}
@@ -407,14 +396,12 @@ final class UdpEndpointI extends IPEndpointI
@Override
protected IPEndpointI createEndpoint(String host, int port, String connectionId)
{
- 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);
}
private String _mcastInterface = "";
private int _mcastTtl = -1;
- private int _sndBufSize = -1;
- private int _rcvBufSize = -1;
private boolean _connect;
private boolean _compress;
}
diff --git a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
index bb9d7cd65d8..cead447dda2 100644
--- a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
+++ b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
@@ -343,16 +343,6 @@ final class UdpTransceiver implements Transceiver
return _addr.getPort();
}
- public final int sndBufSize()
- {
- return _sndSize;
- }
-
- public final int rcvBufSize()
- {
- return _rcvSize;
- }
-
//
// Only for use by UdpEndpoint
//
@@ -479,11 +469,6 @@ final class UdpTransceiver implements Transceiver
}
}
}
-
- if(_endpoint != null)
- {
- _endpoint.setBufSize(_sndSize, _rcvSize);
- }
}
private void configureMulticast(java.net.InetSocketAddress group, String interfaceAddr, int ttl)
diff --git a/java/test/src/main/java/test/Ice/info/AllTests.java b/java/test/src/main/java/test/Ice/info/AllTests.java
index 1ee9487491b..8d864ac6f02 100644
--- a/java/test/src/main/java/test/Ice/info/AllTests.java
+++ b/java/test/src/main/java/test/Ice/info/AllTests.java
@@ -28,10 +28,6 @@ public class AllTests
public static void
allTests(Ice.Communicator communicator, PrintWriter out)
{
- Ice.Properties properties = communicator.getProperties();
- properties.setProperty("Ice.UDP.SndSize", "1024");
- properties.setProperty("Ice.UDP.RcvSize", "2048");
-
out.print("testing proxy endpoint information... ");
out.flush();
{
@@ -70,8 +66,6 @@ public class AllTests
test(!udpEndpoint.secure());
test(udpEndpoint.datagram());
test(udpEndpoint.type() == Ice.UDPEndpointType.value);
- test(udpEndpoint.sndBufSize == -1);
- test(udpEndpoint.rcvBufSize == -1);
Ice.OpaqueEndpointInfo opaqueEndpoint = (Ice.OpaqueEndpointInfo)endps[2].getInfo();
test(opaqueEndpoint.rawEncoding.equals(new Ice.EncodingVersion((byte)1, (byte)8)));
@@ -101,8 +95,6 @@ public class AllTests
test(udpEndpoint.host.equals(defaultHost));
test(udpEndpoint.datagram());
test(udpEndpoint.port > 0);
- test(udpEndpoint.sndBufSize == 1024);
- test(udpEndpoint.rcvBufSize == 2048);
adapter.destroy();
diff --git a/php/src/IcePHP/Endpoint.cpp b/php/src/IcePHP/Endpoint.cpp
index 654dfde2ee8..39303b190be 100644
--- a/php/src/IcePHP/Endpoint.cpp
+++ b/php/src/IcePHP/Endpoint.cpp
@@ -351,10 +351,6 @@ IcePHP::endpointInit(TSRMLS_D)
STRCAST(""), ZEND_ACC_PUBLIC TSRMLS_CC);
zend_declare_property_long(udpEndpointInfoClassEntry, STRCAST("mcastTtl"), sizeof("mcastTtl") - 1, 0,
ZEND_ACC_PUBLIC TSRMLS_CC);
- zend_declare_property_long(udpEndpointInfoClassEntry, STRCAST("sndBufSize"), sizeof("sndBufSize") - 1, 0,
- ZEND_ACC_PUBLIC TSRMLS_CC);
- zend_declare_property_long(udpEndpointInfoClassEntry, STRCAST("rcvBufSize"), sizeof("rcvBufSize") - 1, 0,
- ZEND_ACC_PUBLIC TSRMLS_CC);
//
// Define the WSEndpointInfo class.
@@ -443,8 +439,6 @@ IcePHP::createEndpointInfo(zval* zv, const Ice::EndpointInfoPtr& p TSRMLS_DC)
{
add_property_string(zv, STRCAST("mcastInterface"), const_cast<char*>(info->mcastInterface.c_str()), 1);
add_property_long(zv, STRCAST("mcastTtl"), static_cast<long>(info->mcastTtl));
- add_property_long(zv, STRCAST("sndBufSize"), static_cast<long>(info->sndBufSize));
- add_property_long(zv, STRCAST("rcvBufSize"), static_cast<long>(info->rcvBufSize));
}
}
else if(Ice::WSEndpointInfoPtr::dynamicCast(p))
diff --git a/php/test/Ice/info/Client.php b/php/test/Ice/info/Client.php
index 52425a505c8..46c800c3b33 100644
--- a/php/test/Ice/info/Client.php
+++ b/php/test/Ice/info/Client.php
@@ -44,9 +44,6 @@ function allTests($communicator)
$protocolVersionClass = $NS ? "Ice\\ProtocolVersion" : "Ice_ProtocolVersion";
$encodingVersionClass = $NS ? "Ice\\EncodingVersion" : "Ice_EncodingVersion";
- $communicator->getProperties()->setProperty("Ice.UDP.SndSize", "1024");
- $communicator->getProperties()->setProperty("Ice.UDP.RcvSize", "2048");
-
echo "testing proxy endpoint information... ";
flush();
{
@@ -86,8 +83,6 @@ function allTests($communicator)
test(!$udpEndpoint->secure());
test($udpEndpoint->datagram());
test($udpEndpoint->type() == $udpEndpointType);
- test($udpEndpoint->sndBufSize == -1);
- test($udpEndpoint->rcvBufSize == -1);
$opaqueEndpoint = $endps[2]->getInfo();
test($opaqueEndpoint);
diff --git a/py/modules/IcePy/EndpointInfo.cpp b/py/modules/IcePy/EndpointInfo.cpp
index 68c1dd1678c..f175fe85a3b 100644
--- a/py/modules/IcePy/EndpointInfo.cpp
+++ b/py/modules/IcePy/EndpointInfo.cpp
@@ -198,28 +198,6 @@ udpEndpointInfoGetMcastTtl(EndpointInfoObject* self)
extern "C"
#endif
static PyObject*
-udpEndpointInfoGetSndBufSize(EndpointInfoObject* self)
-{
- Ice::UDPEndpointInfoPtr info = Ice::UDPEndpointInfoPtr::dynamicCast(*self->endpointInfo);
- assert(info);
- return PyLong_FromLong(info->sndBufSize);
-}
-
-#ifdef WIN32
-extern "C"
-#endif
-static PyObject*
-udpEndpointInfoGetRcvBufSize(EndpointInfoObject* self)
-{
- Ice::UDPEndpointInfoPtr info = Ice::UDPEndpointInfoPtr::dynamicCast(*self->endpointInfo);
- assert(info);
- return PyLong_FromLong(info->rcvBufSize);
-}
-
-#ifdef WIN32
-extern "C"
-#endif
-static PyObject*
opaqueEndpointInfoGetRawBytes(EndpointInfoObject* self)
{
Ice::OpaqueEndpointInfoPtr info = Ice::OpaqueEndpointInfoPtr::dynamicCast(*self->endpointInfo);
@@ -281,10 +259,6 @@ static PyGetSetDef UDPEndpointInfoGetters[] =
PyDoc_STR(STRCAST("multicast interface")), 0 },
{ STRCAST("mcastTtl"), reinterpret_cast<getter>(udpEndpointInfoGetMcastTtl), 0,
PyDoc_STR(STRCAST("multicast time-to-live")), 0 },
- { STRCAST("sndBufSize"), reinterpret_cast<getter>(udpEndpointInfoGetSndBufSize), 0,
- PyDoc_STR(STRCAST("send buffer size")), 0 },
- { STRCAST("rcvBufSize"), reinterpret_cast<getter>(udpEndpointInfoGetRcvBufSize), 0,
- PyDoc_STR(STRCAST("recieve buffer size")), 0 },
{ 0, 0 } /* sentinel */
};
diff --git a/py/test/Ice/info/AllTests.py b/py/test/Ice/info/AllTests.py
index 67e395e9714..c8b8ec46bce 100644
--- a/py/test/Ice/info/AllTests.py
+++ b/py/test/Ice/info/AllTests.py
@@ -14,10 +14,6 @@ def test(b):
raise RuntimeError('test assertion failed')
def allTests(communicator):
- properties = communicator.getProperties()
- properties.setProperty("Ice.UDP.SndSize", "1024")
- properties.setProperty("Ice.UDP.RcvSize", "2048")
-
sys.stdout.write("testing proxy endpoint information... ")
sys.stdout.flush()
@@ -56,8 +52,6 @@ def allTests(communicator):
test(not udpEndpoint.secure())
test(udpEndpoint.datagram())
test(udpEndpoint.type() == Ice.UDPEndpointType)
- test(udpEndpoint.sndBufSize == -1)
- test(udpEndpoint.rcvBufSize == -1)
opaqueEndpoint = endps[2].getInfo()
test(isinstance(opaqueEndpoint, Ice.OpaqueEndpointInfo))
@@ -88,8 +82,6 @@ def allTests(communicator):
test(udpEndpoint.host == defaultHost)
test(udpEndpoint.datagram())
test(udpEndpoint.port > 0)
- test(udpEndpoint.sndBufSize == 1024)
- test(udpEndpoint.rcvBufSize == 2048)
adapter.destroy()
diff --git a/rb/src/IceRuby/Endpoint.cpp b/rb/src/IceRuby/Endpoint.cpp
index 6b3198246b5..e2a31f0242e 100644
--- a/rb/src/IceRuby/Endpoint.cpp
+++ b/rb/src/IceRuby/Endpoint.cpp
@@ -148,8 +148,6 @@ IceRuby::createEndpointInfo(const Ice::EndpointInfoPtr& p)
rb_ivar_set(info, rb_intern("@sourceAddress"), createString(udp->sourceAddress));
rb_ivar_set(info, rb_intern("@mcastInterface"), createString(udp->mcastInterface));
rb_ivar_set(info, rb_intern("@mcastTtl"), INT2FIX(udp->mcastTtl));
- rb_ivar_set(info, rb_intern("@sndBufSize"), INT2FIX(udp->sndBufSize));
- rb_ivar_set(info, rb_intern("@rcvBufSize"), INT2FIX(udp->rcvBufSize));
}
else if(Ice::OpaqueEndpointInfoPtr::dynamicCast(p))
{
@@ -293,8 +291,6 @@ IceRuby::initEndpoint(VALUE iceModule)
//
rb_define_attr(_udpEndpointInfoClass, "mcastInterface", 1, 0);
rb_define_attr(_udpEndpointInfoClass, "mcastTtl", 1, 0);
- rb_define_attr(_udpEndpointInfoClass, "sndBufSize", 1, 0);
- rb_define_attr(_udpEndpointInfoClass, "rcvBufSize", 1, 0);
//
// OpaqueEndpointInfo
diff --git a/rb/test/Ice/info/AllTests.rb b/rb/test/Ice/info/AllTests.rb
index 12ab7ae7139..1a81b1337f3 100644
--- a/rb/test/Ice/info/AllTests.rb
+++ b/rb/test/Ice/info/AllTests.rb
@@ -8,10 +8,6 @@
# **********************************************************************
def allTests(communicator)
- properties = communicator.getProperties()
- properties.setProperty("Ice.UDP.SndSize", "1024")
- properties.setProperty("Ice.UDP.RcvSize", "2048")
-
print "testing proxy endpoint information..."
STDOUT.flush
@@ -50,8 +46,6 @@ def allTests(communicator)
test(!udpEndpoint.secure())
test(udpEndpoint.datagram())
test(udpEndpoint.type() == Ice::UDPEndpointType)
- test(udpEndpoint.sndBufSize == -1)
- test(udpEndpoint.rcvBufSize == -1)
opaqueEndpoint = endps[2].getInfo()
test(opaqueEndpoint.is_a?(Ice::OpaqueEndpointInfo));
diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice
index 1048e1c01ab..4dadf20d277 100644
--- a/slice/Ice/Endpoint.ice
+++ b/slice/Ice/Endpoint.ice
@@ -182,20 +182,6 @@ local class UDPEndpointInfo extends IPEndpointInfo
*
**/
int mcastTtl;
-
- /**
- *
- * The size of the UDP send buffer (-1 if not set).
- *
- **/
- int sndBufSize;
-
- /**
- *
- * The size of the UDP receive buffer (-1 if not set).
- *
- **/
- int rcvBufSize;
};
/**
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:30:09 +0000