diff options
author | Shane Kearns <shane.kearns@accenture.com> | 2012-05-09 17:06:47 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 17:39:13 +0200 |
commit | b72c8dd8a248d67b1192e3baa1fca07244a3719d (patch) | |
tree | 434191d0472fb555c6cf993e053eebcea14d0267 /src/network/kernel/qnetworkinterface_unix.cpp | |
parent | 653bca19c70bda9aa6f058380694451fa3ed3a16 (diff) |
Include scope ids in QHostAddress from QNetworkInterface
The scope ID is a required part of the address for link local
addresses (to solve the problem of the same link local address
being created by two machines on different networks).
It is required to send packets to a link local address on Mac and
Windows, although Linux multicasts if scope is missing.
Task-number: QTBUG-25634
Change-Id: Ie2bb09df8d261eefcb81716bafeb1475f0bed5fe
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'src/network/kernel/qnetworkinterface_unix.cpp')
-rw-r--r-- | src/network/kernel/qnetworkinterface_unix.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index db031fcc6b..5087e761eb 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -89,9 +89,19 @@ static QHostAddress addressFromSockaddr(sockaddr *sa) if (sa->sa_family == AF_INET) address.setAddress(htonl(((sockaddr_in *)sa)->sin_addr.s_addr)); - else if (sa->sa_family == AF_INET6) + else if (sa->sa_family == AF_INET6) { address.setAddress(((sockaddr_in6 *)sa)->sin6_addr.s6_addr); - + int scope = ((sockaddr_in6 *)sa)->sin6_scope_id; + if (scope) { +#ifndef QT_NO_IPV6IFNAME + char scopeid[IFNAMSIZ]; + if (::if_indextoname(scope, scopeid)) { + address.setScopeId(QLatin1String(scopeid)); + } else +#endif + address.setScopeId(QString::number(scope)); + } + } return address; } |