diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-03-05 15:44:08 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-03-05 15:44:08 -0330 |
| commit | b96b045ecc6e034307ba8065af73c252e0093bbb (patch) | |
| tree | c3f22df1c67a7de3c435c4be31ef2adfb300b1e8 /cpp/src/Ice/StreamSocket.cpp | |
| parent | Fixed linux php build (diff) | |
| download | ice-b96b045ecc6e034307ba8065af73c252e0093bbb.tar.bz2 ice-b96b045ecc6e034307ba8065af73c252e0093bbb.tar.xz ice-b96b045ecc6e034307ba8065af73c252e0093bbb.zip | |
ICE-6082 No way to discover send/recv buffer sizes
Diffstat (limited to 'cpp/src/Ice/StreamSocket.cpp')
| -rw-r--r-- | cpp/src/Ice/StreamSocket.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp index 3c9bbf1afcc..7ade8172ba4 100644 --- a/cpp/src/Ice/StreamSocket.cpp +++ b/cpp/src/Ice/StreamSocket.cpp @@ -18,6 +18,7 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, const Address& addr, const Address& sourceAddr) : NativeInfo(createSocket(false, proxy ? proxy->getAddress() : addr)), + _instance(instance), _proxy(proxy), _addr(addr), _sourceAddr(sourceAddr), @@ -27,7 +28,7 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, _write(SocketOperationWrite) #endif { - init(instance); + init(); #ifndef ICE_USE_IOCP if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr)) { @@ -39,13 +40,14 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, SOCKET fd) : NativeInfo(fd), + _instance(instance), _state(StateConnected) #ifdef ICE_USE_IOCP , _read(SocketOperationRead), _write(SocketOperationWrite) #endif { - init(instance); + init(); _desc = fdToString(fd); } @@ -126,6 +128,12 @@ StreamSocket::getRecvPacketSize(size_t length) #endif } +void +StreamSocket::setBufferSize(int rcvSize, int sndSize) +{ + setTcpBufSize(_fd, rcvSize, sndSize, _instance); +} + SocketOperation StreamSocket::read(Buffer& buf) { @@ -486,10 +494,10 @@ StreamSocket::toString() const } void -StreamSocket::init(const ProtocolInstancePtr& instance) +StreamSocket::init() { setBlock(_fd, false); - setTcpBufSize(_fd, instance); + setTcpBufSize(_fd, _instance); #ifdef ICE_USE_IOCP // |