Fix online status checking in generic bearer plugin.

QNetworkInterface::IsUp means the interface is up, but not necessarily
connected. QNetworkInterface::IsRunning means the interface is up and
connected.

Task-number: QTBUG-22873
Change-Id: Ieb544058814520b4292b496de2e4672214f3d00a
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
This commit is contained in:
Xizhi Zhu 2012-01-18 21:38:17 +01:00 committed by Qt by Nokia
parent 5fb2122c34
commit c93ac67586
3 changed files with 98 additions and 1 deletions

View File

@ -232,7 +232,7 @@ void QGenericEngine::doRequestUpdate()
name = interface.name();
QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Defined;
if((interface.flags() & QNetworkInterface::IsUp) && !interface.addressEntries().isEmpty())
if ((interface.flags() & QNetworkInterface::IsRunning) && !interface.addressEntries().isEmpty())
state |= QNetworkConfiguration::Active;
if (accessPointConfigurations.contains(id)) {

View File

@ -0,0 +1,84 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QDebug>
#include <qtest.h>
#include <QtTest/QtTest>
#include <QtNetwork/qnetworkconfigmanager.h>
class tst_qnetworkconfigurationmanager : public QObject
{
Q_OBJECT
private slots:
void isOnline();
};
class SignalHandler : public QObject
{
Q_OBJECT
public slots:
void onOnlineStateChanged(bool isOnline)
{
qDebug() << "Online state changed to:" << isOnline;
}
};
void tst_qnetworkconfigurationmanager::isOnline()
{
QNetworkConfigurationManager manager;
qDebug() << "Testing QNetworkConfigurationManager online status reporting functionality.";
qDebug() << "This should tell the current online state:" << manager.isOnline();
qDebug() << "Now please plug / unplug the network cable, and check the state update signal.";
qDebug() << "Note that there might be some delays before you see the change, depending on the backend.";
SignalHandler signalHandler;
connect(&manager, SIGNAL(onlineStateChanged(bool)), &signalHandler, SLOT(onOnlineStateChanged(bool)));
// event loop
QTestEventLoop::instance().enterLoop(30);
QVERIFY(QTestEventLoop::instance().timeout());
}
QTEST_MAIN(tst_qnetworkconfigurationmanager)
#include "main.moc"

View File

@ -0,0 +1,13 @@
CONFIG += testcase
TEMPLATE = app
TARGET = tst_qnetworkconfigurationmanager
DEPENDPATH += .
INCLUDEPATH += .
QT -= gui
QT += network testlib
CONFIG += release
# Input
SOURCES += main.cpp