diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-09-17 13:50:35 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-09-17 13:50:35 -0230 |
| commit | a3d676c4199ff53edd458abf7ce52f6cf83213b4 (patch) | |
| tree | d6975ba5b7c3d9e58b5378f2e27ec536e4157517 /cpp/src/Ice/UdpTransceiver.cpp | |
| parent | Simplified creation of Admin facets in IceBox; simplified test for Admin enab... (diff) | |
| download | ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.tar.bz2 ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.tar.xz ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.zip | |
ICE-4891 some minor improvements
Diffstat (limited to 'cpp/src/Ice/UdpTransceiver.cpp')
| -rw-r--r-- | cpp/src/Ice/UdpTransceiver.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index 418c2528285..a54fd179d95 100644 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <Ice/UdpTransceiver.h> -#include <Ice/EndpointI.h> +#include <Ice/UdpEndpointI.h> #include <Ice/Connection.h> #include <Ice/ProtocolInstance.h> #include <Ice/LoggerUtil.h> @@ -34,6 +34,8 @@ using namespace Windows::Networking; using namespace Windows::Networking::Sockets; #endif +IceUtil::Shared* IceInternal::upCast(UdpTransceiver* p) { return p; } + NativeInfoPtr IceInternal::UdpTransceiver::getNativeInfo() { @@ -132,7 +134,7 @@ IceInternal::UdpTransceiver::close() } EndpointIPtr -IceInternal::UdpTransceiver::bind(const EndpointIPtr& endp) +IceInternal::UdpTransceiver::bind() { if(isMulticast(_addr)) { @@ -178,7 +180,9 @@ IceInternal::UdpTransceiver::bind(const EndpointIPtr& endp) } _bound = true; - return endp->endpoint(this); + + _endpoint = _endpoint->endpoint(this); + return _endpoint; } SocketOperation @@ -964,8 +968,9 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance, #endif } -IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance, const string& host, int port, - const string& mcastInterface, bool connect) : +IceInternal::UdpTransceiver::UdpTransceiver(const UdpEndpointIPtr& endpoint, const ProtocolInstancePtr& instance, + const string& host, int port, const string& mcastInterface, bool connect) : + _endpoint(endpoint), _instance(instance), _incoming(true), _bound(false), |