diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-12-16 13:01:37 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-12-16 13:01:37 -0330 |
| commit | c9db39ce56f03b50b0d4f98df090fc21e6d2dd6e (patch) | |
| tree | c19e4ff46a96b70ed7239bab9644d52e93669eab /cpp/src/Ice/Network.cpp | |
| parent | Bump some demoscript timeouts that could cause problems (diff) | |
| download | ice-c9db39ce56f03b50b0d4f98df090fc21e6d2dd6e.tar.bz2 ice-c9db39ce56f03b50b0d4f98df090fc21e6d2dd6e.tar.xz ice-c9db39ce56f03b50b0d4f98df090fc21e6d2dd6e.zip | |
ICE-6180 filter out IPv4 link local for C# as well
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 64d45f9244b..1107dbc8bea 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -465,7 +465,8 @@ isLinklocal(const Address& addr) } else if (addr.saStorage.ss_family == AF_INET) { - return inetAddrToString(addr).find("169.254.") == 0; + // Check for 169.254.X.X in network order + return (addr.saIn.sin_addr.s_addr & 0x0000FFFF) == 0x0000FEA9; } return false; } |