diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-12-19 22:06:38 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-12-19 22:06:38 +0100 |
| commit | f6121ea342641eb36f7cd67c7c877a1c70ec3055 (patch) | |
| tree | b545f3a2548b81fd8dd56a87a58f98b992c0066b /cpp/src/Ice/UdpConnector.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.tar.bz2 ice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.tar.xz ice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.zip | |
- Merge IPv6 support from Dwayne's branch.
- Reviewed and fixed IPv6 bugs.
- Fixed bug in the outgoing connection factory where an assert could be
triggered if the proxy contained identical endpoints
Diffstat (limited to 'cpp/src/Ice/UdpConnector.cpp')
| -rw-r--r-- | cpp/src/Ice/UdpConnector.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp index 05c202a8310..96019514ca1 100644 --- a/cpp/src/Ice/UdpConnector.cpp +++ b/cpp/src/Ice/UdpConnector.cpp @@ -168,7 +168,8 @@ IceInternal::UdpConnector::operator<(const Connector& r) const return compareAddress(_addr, p->_addr) == -1; } -IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const struct sockaddr_in& addr, + +IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const struct sockaddr_storage& addr, const string& mcastInterface, int mcastTtl, Ice::Byte protocolMajor, Ice::Byte protocolMinor, Ice::Byte encodingMajor, Ice::Byte encodingMinor, const std::string& connectionId) : |