From 41ad3ee7cb7f7b6a2041b114a1f348fb0327d73c Mon Sep 17 00:00:00 2001 From: Martin Petersson Date: Fri, 30 Mar 2012 13:19:28 +0200 Subject: Set QNetworkInterface::IsPointToPoint on Windows This was never set on Windows Xp or later as we only checked for this in the old interfaceListingWin2K() function. Task-number: QTBUG-10170 Change-Id: Ib0808a945d9d1b31019967a69e668ec216702799 Reviewed-by: Thiago Macieira --- src/network/kernel/qnetworkinterface_win.cpp | 2 ++ src/network/kernel/qnetworkinterface_win_p.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp index a311af7686..8e3b5ce7c0 100644 --- a/src/network/kernel/qnetworkinterface_win.cpp +++ b/src/network/kernel/qnetworkinterface_win.cpp @@ -182,6 +182,8 @@ static QList interfaceListingWinXP() iface->flags |= QNetworkInterface::IsUp | QNetworkInterface::IsRunning; if ((ptr->Flags & IP_ADAPTER_NO_MULTICAST) == 0) iface->flags |= QNetworkInterface::CanMulticast; + if (ptr->IfType == IF_TYPE_PPP) + iface->flags |= QNetworkInterface::IsPointToPoint; iface->name = QString::fromLocal8Bit(ptr->AdapterName); iface->friendlyName = QString::fromWCharArray(ptr->FriendlyName); diff --git a/src/network/kernel/qnetworkinterface_win_p.h b/src/network/kernel/qnetworkinterface_win_p.h index 73e5c625ec..303f4d3690 100644 --- a/src/network/kernel/qnetworkinterface_win_p.h +++ b/src/network/kernel/qnetworkinterface_win_p.h @@ -94,6 +94,9 @@ QT_BEGIN_NAMESPACE # define MIB_IF_TYPE_LOOPBACK 24 # define MIB_IF_TYPE_SLIP 28 +// definitions from Ipifcons.h +#define IF_TYPE_PPP 23 + #endif // copied from qnativesocketengine_win.cpp struct qt_in6_addr { -- cgit v1.2.3