diff -r 885c2596c964 -r 5d007b20cfd0 qtmobility/src/bearer/qnetworksession_maemo.cpp
--- a/qtmobility/src/bearer/qnetworksession_maemo.cpp	Thu Aug 19 10:43:30 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1035 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, 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.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QHash>
-
-#include "qnetworksession_maemo_p.h"
-
-#include <maemo_icd.h>
-#include <iapconf.h>
-#include <proxyconf.h>
-
-#include <ifaddrs.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-
-QDBusArgument &operator<<(QDBusArgument &argument,
-                          const QtMobility::ICd2DetailsDBusStruct &icd2)
-{
-    argument.beginStructure();
-    argument << icd2.serviceType;
-    argument << icd2.serviceAttributes;
-    argument << icd2.setviceId;
-    argument << icd2.networkType;
-    argument << icd2.networkAttributes;
-    argument << icd2.networkId;
-    argument.endStructure();
-    return argument;
-}
-
-const QDBusArgument &operator>>(const QDBusArgument &argument,
-                                QtMobility::ICd2DetailsDBusStruct &icd2)
-{
-    argument.beginStructure();
-    argument >> icd2.serviceType;
-    argument >> icd2.serviceAttributes;
-    argument >> icd2.setviceId;
-    argument >> icd2.networkType;
-    argument >> icd2.networkAttributes;
-    argument >> icd2.networkId;
-    argument.endStructure();
-    return argument;
-}
-
-const QDBusArgument &operator>>(const QDBusArgument &argument,
-                                QtMobility::ICd2DetailsList &detailsList)
-{
-     argument.beginArray();
-     detailsList.clear();
-
-     while (!argument.atEnd()) {
-         QtMobility::ICd2DetailsDBusStruct element;
-         argument >> element;
-         detailsList.append(element);
-     }
-
-     argument.endArray();
-     return argument;
-}
-
-QDBusArgument &operator<<(QDBusArgument &argument,
-                          const QtMobility::ICd2DetailsList &detailsList)
-{
-     argument.beginArray(qMetaTypeId<QtMobility::ICd2DetailsDBusStruct>());
-     for (int i = 0; i < detailsList.count(); ++i)
-         argument << detailsList[i];
-     argument.endArray();
-     return argument;
-}
-
-QTM_BEGIN_NAMESPACE
-
-static QHash<QString, QVariant> properties;
-
-static QString get_network_interface();
-
-void QNetworkSessionPrivate::iapStateChanged(const QString& iapid, uint icd_connection_state)
-{
-    if ((publicConfig.type() == QNetworkConfiguration::UserChoice) && opened) {
-        updateIdentifier(iapid);
-    }
-
-    if (((publicConfig.type() == QNetworkConfiguration::UserChoice) && (activeConfig.d->id == iapid)) ||
-        (publicConfig.d->id == iapid)) {
-        switch (icd_connection_state) {
-        case ICD_STATE_CONNECTING:
-            updateState(QNetworkSession::Connecting);
-            break;
-        case ICD_STATE_CONNECTED:
-            updateState(QNetworkSession::Connected);
-            break;
-        case ICD_STATE_DISCONNECTING:
-            updateState(QNetworkSession::Closing);
-            break;
-        case ICD_STATE_DISCONNECTED:
-            updateState(QNetworkSession::Disconnected);
-            break;
-        default:
-            break;
-        }
-    }
-}
-
-void QNetworkSessionPrivate::cleanupSession(void)
-{
-    QObject::disconnect(q, SIGNAL(stateChanged(QNetworkSession::State)), this, SLOT(updateProxies(QNetworkSession::State)));
-}
-
-
-void QNetworkSessionPrivate::updateState(QNetworkSession::State newState)
-{
-    if (newState != state) {
-        if (newState == QNetworkSession::Disconnected) {
-            if (isOpen) {
-                // The Session was aborted by the user or system
-                lastError = QNetworkSession::SessionAbortedError;
-                emit q->error(lastError);
-                emit q->closed();
-            }
-            if (m_stopTimer.isActive()) {
-                // Session was closed by calling stop()
-                m_stopTimer.stop();
-            }
-            isOpen = false;
-            opened = false;
-	    currentNetworkInterface.clear();
-            if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
-                copyConfig(publicConfig, activeConfig);
-                activeConfig.d->state = QNetworkConfiguration::Defined;
-            } else {
-                if (!activeConfig.isValid()) {
-                    // Active configuration (IAP) was removed from system
-                    // => Connection was disconnected and configuration became
-                    //    invalid
-                    // => Also Session state must be changed to invalid
-                    newState = QNetworkSession::Invalid;
-                }
-            }
-        } else if (newState == QNetworkSession::Connected) {
-            if (opened) {
-                isOpen = true;
-            }
-	    if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
-		activeConfig.d->state = QNetworkConfiguration::Active;
-		activeConfig.d->type = QNetworkConfiguration::InternetAccessPoint;
-	    }
-	    publicConfig.d->state = QNetworkConfiguration::Active;
-	}
-
-        if (newState != state) {
-            state = newState;
-            emit q->stateChanged(newState);
-        }
-    }
-}
-
-
-void QNetworkSessionPrivate::updateIdentifier(const QString &newId)
-{
-    if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
-	activeConfig.d->network_attrs |= ICD_NW_ATTR_IAPNAME;
-	activeConfig.d->id = newId;
-    } else {
-	publicConfig.d->network_attrs |= ICD_NW_ATTR_IAPNAME;
-	if (publicConfig.d->id != newId) {
-	    qWarning() << "Your config id changed from" << publicConfig.d->id << "to" << newId;
-	    publicConfig.d->id = newId;
-	}
-    }
-}
-
-
-QNetworkSessionPrivate::Statistics QNetworkSessionPrivate::getStatistics() const
-{
-    /* This could be also implemented by using the Maemo::Icd::statistics()
-     * that gets the statistics data for a specific IAP. Change if
-     * necessary.
-     */
-    Maemo::Icd icd;
-    QList<Maemo::IcdStatisticsResult> stats_results;
-    Statistics stats = { 0, 0, 0};
-
-    if (!icd.statistics(stats_results))
-        return stats;
-
-    foreach (const Maemo::IcdStatisticsResult &res, stats_results) {
-        if (res.params.network_attrs & ICD_NW_ATTR_IAPNAME) {
-            /* network_id is the IAP UUID */
-            if (QString(res.params.network_id.data()) == activeConfig.identifier()) {
-                stats.txData = res.bytes_sent;
-                stats.rxData = res.bytes_received;
-                stats.activeTime = res.time_active;
-            }
-        } else {
-            /* We probably will never get to this branch */
-            QNetworkConfigurationPrivate *d = activeConfig.d.data();
-            if (res.params.network_id == d->network_id) {
-                stats.txData = res.bytes_sent;
-                stats.rxData = res.bytes_received;
-                stats.activeTime = res.time_active;
-            }
-        }
-    }
-
-    return stats;
-}
-
-
-quint64 QNetworkSessionPrivate::bytesWritten() const
-{
-    return getStatistics().txData;
-}
-
-quint64 QNetworkSessionPrivate::bytesReceived() const
-{
-    return getStatistics().rxData;
-}
-
-quint64 QNetworkSessionPrivate::activeTime() const
-{
-    return getStatistics().activeTime;
-}
-
-
-QNetworkConfiguration& QNetworkSessionPrivate::copyConfig(QNetworkConfiguration &fromConfig, QNetworkConfiguration &toConfig, bool deepCopy)
-{
-    if (deepCopy) {
-        QNetworkConfigurationPrivate* cpPriv = new QNetworkConfigurationPrivate();
-        QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr(cpPriv);
-        toConfig.d = ptr;
-    }
-
-    toConfig.d->name = fromConfig.d->name;
-    toConfig.d->isValid = fromConfig.d->isValid;
-    // Note that we do not copy id field here as the publicConfig does
-    // not contain a valid IAP id.
-    toConfig.d->state = fromConfig.d->state;
-    toConfig.d->type = fromConfig.d->type;
-    toConfig.d->roamingSupported = fromConfig.d->roamingSupported;
-    toConfig.d->purpose = fromConfig.d->purpose;
-    toConfig.d->network_id = fromConfig.d->network_id;
-    toConfig.d->iap_type = fromConfig.d->iap_type;
-    toConfig.d->network_attrs = fromConfig.d->network_attrs;
-    toConfig.d->service_type = fromConfig.d->service_type;
-    toConfig.d->service_id = fromConfig.d->service_id;
-    toConfig.d->service_attrs = fromConfig.d->service_attrs;
-    toConfig.d->manager = fromConfig.d->manager;
-
-    return toConfig;
-}
-
-
-/* This is called by QNetworkSession constructor and it updates the current
- * state of the configuration.
- */
-void QNetworkSessionPrivate::syncStateWithInterface()
-{
-    /* Initially we are not active although the configuration might be in
-     * connected state.
-     */
-    isOpen = false;
-    opened = false;
-
-    QObject::connect(&manager, SIGNAL(updateCompleted()), this, SLOT(networkConfigurationsChanged()));
-
-    if (publicConfig.d.data()) {
-	QNetworkConfigurationManagerPrivate* mgr = (QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager;
-	if (mgr) {
-            connect(mgr, SIGNAL(iapStateChanged(const QString&, uint)),
-                    this, SLOT(iapStateChanged(const QString&, uint)));
-	} else {
-            qWarning()<<"Manager object not set when trying to connect iapStateChanged signal. Your configuration object is not correctly setup, did you remember to call manager.updateConfigurations() before creating session object?";
-	    state = QNetworkSession::Invalid;
-	    lastError = QNetworkSession::UnknownSessionError;
-	    return;
-	}
-    }
-
-    QObject::connect(q, SIGNAL(stateChanged(QNetworkSession::State)), this, SLOT(updateProxies(QNetworkSession::State)));
-
-    state = QNetworkSession::Invalid;
-    lastError = QNetworkSession::UnknownSessionError;
-
-    switch (publicConfig.type()) {
-    case QNetworkConfiguration::InternetAccessPoint:
-        activeConfig = publicConfig;
-        break;
-    case QNetworkConfiguration::ServiceNetwork:
-        serviceConfig = publicConfig;
-	break;
-    case QNetworkConfiguration::UserChoice:
-	// active config will contain correct data after open() has succeeded
-        copyConfig(publicConfig, activeConfig);
-
-	/* We create new configuration that holds the actual configuration
-	 * returned by icd. This way publicConfig still contains the
-	 * original user specified configuration.
-	 *
-	 * Note that the new activeConfig configuration is not inserted
-	 * to configurationManager as manager class will get the newly
-	 * connected configuration from gconf when the IAP is saved.
-	 * This configuration manager update is done by IapMonitor class.
-	 * If the ANY connection fails in open(), then the configuration
-	 * data is not saved to gconf and will not be added to
-	 * configuration manager IAP list.
-	 */
-#ifdef BEARER_MANAGEMENT_DEBUG
-	qDebug()<<"New configuration created for" << publicConfig.identifier();
-#endif
-	break;
-    default:
-	/* Invalid configuration, no point continuing */
-	return;
-    }
-
-    if (!activeConfig.isValid())
-	return;
-
-    /* Get the initial state from icd */
-    Maemo::Icd icd;
-    QList<Maemo::IcdStateResult> state_results;
-
-    /* Update the active config from first connection, this is ok as icd
-     * supports only one connection anyway.
-     */
-    if (icd.state(state_results) && !state_results.isEmpty()) {
-	/* If we did not get full state back, then we are not
-	 * connected and can skip the next part.
-	 */
-	if (!(state_results.first().params.network_attrs == 0 &&
-		state_results.first().params.network_id.isEmpty())) {
-
-	    /* If we try to connect to specific IAP and we get results back
-	     * that tell the icd is actually connected to another IAP,
-	     * then do not update current state etc.
-	     */
-	    if (publicConfig.type() == QNetworkConfiguration::UserChoice ||
-		    publicConfig.d->id == state_results.first().params.network_id) {
-		switch (state_results.first().state) {
-		case ICD_STATE_DISCONNECTED:
-                    state = QNetworkSession::Disconnected;
-		    if (activeConfig.d.data())
-			activeConfig.d->isValid = true;
-		    break;
-		case ICD_STATE_CONNECTING:
-                    state = QNetworkSession::Connecting;
-		    if (activeConfig.d.data())
-			activeConfig.d->isValid = true;
-		    break;
-		case ICD_STATE_CONNECTED:
-		    {
-                        if (!state_results.first().error.isEmpty())
-			    break;
-
-                        const QString id = state_results.first().params.network_id;
-
-                        QNetworkConfigurationManagerPrivate *mgr = (QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager;
-			if (mgr->accessPointConfigurations.contains(id)) {
-                            //we don't want the copied data if the config is already known by the manager
-                            //just reuse it so that existing references to the old data get the same update
-                            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = mgr->accessPointConfigurations.value(id);
-                            activeConfig.d = priv;
-                        }
-
-			state = QNetworkSession::Connected;
-                        activeConfig.d->network_id = state_results.first().params.network_id;
-                        activeConfig.d->id = activeConfig.d->network_id;
-                        activeConfig.d->network_attrs = state_results.first().params.network_attrs;
-                        activeConfig.d->iap_type = state_results.first().params.network_type;
-                        activeConfig.d->service_type = state_results.first().params.service_type;
-                        activeConfig.d->service_id = state_results.first().params.service_id;
-                        activeConfig.d->service_attrs = state_results.first().params.service_attrs;
-                        activeConfig.d->type = QNetworkConfiguration::InternetAccessPoint;
-                        activeConfig.d->state = QNetworkConfiguration::Active;
-                        activeConfig.d->isValid = true;
-                        currentNetworkInterface = get_network_interface();
-
-			Maemo::IAPConf iap_name(activeConfig.d->id);
-			QString name_value = iap_name.value("name").toString();
-			if (!name_value.isEmpty())
-			    activeConfig.d->name = name_value;
-			else
-			    activeConfig.d->name = activeConfig.d->id;
-
-			// Add the new active configuration to manager or update the old config
-			mgr = (QNetworkConfigurationManagerPrivate*)activeConfig.d.data()->manager;
-			if (!(mgr->accessPointConfigurations.contains(activeConfig.d->id))) {
-			    QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr = activeConfig.d;
-			    mgr->accessPointConfigurations.insert(activeConfig.d->id, ptr);
-
-			    QNetworkConfiguration item;
-			    item.d = ptr;
-			    emit mgr->configurationAdded(item);
-
-#ifdef BEARER_MANAGEMENT_DEBUG
-			    //qDebug()<<"New configuration"<<activeConfig.d->id<<"added to manager in sync";
-#endif
-
-                        }
-		    }
-		    break;
-
-		case ICD_STATE_DISCONNECTING:
-                    state = QNetworkSession::Closing;
-		    if (activeConfig.d.data())
-			activeConfig.d->isValid = true;
-		    break;
-		default:
-                    break;
-		}
-	    }
-	} else {
-#ifdef BEARER_MANAGEMENT_DEBUG
-	    qDebug() << "status_req tells icd is not connected";
-#endif
-	}
-    } else {
-#ifdef BEARER_MANAGEMENT_DEBUG
-	qDebug() << "status_req did not return any results from icd";
-#endif
-    }
-
-    networkConfigurationsChanged();
-}
-
-
-void QNetworkSessionPrivate::networkConfigurationsChanged()
-{
-    if (serviceConfig.isValid())
-        updateStateFromServiceNetwork();
-    else
-        updateStateFromActiveConfig();
-}
-
-
-void QNetworkSessionPrivate::updateStateFromServiceNetwork()
-{
-    QNetworkSession::State oldState = state;
-
-    foreach (const QNetworkConfiguration &config, serviceConfig.children()) {
-        if ((config.state() & QNetworkConfiguration::Active) != QNetworkConfiguration::Active)
-            continue;
-
-        if (activeConfig != config) {
-            activeConfig = config;
-            emit q->newConfigurationActivated();
-        }
-
-        state = QNetworkSession::Connected;
-        if (state != oldState)
-            emit q->stateChanged(state);
-
-        return;
-    }
-
-    if (serviceConfig.children().isEmpty())
-        state = QNetworkSession::NotAvailable;
-    else
-        state = QNetworkSession::Disconnected;
-
-    if (state != oldState)
-        emit q->stateChanged(state);
-}
-
-
-void QNetworkSessionPrivate::clearConfiguration(QNetworkConfiguration &config)
-{
-    config.d->network_id.clear();
-    config.d->iap_type.clear();
-    config.d->network_attrs = 0;
-    config.d->service_type.clear();
-    config.d->service_id.clear();
-    config.d->service_attrs = 0;
-}
-
-
-void QNetworkSessionPrivate::updateStateFromActiveConfig()
-{
-    QNetworkSession::State oldState = state;
-
-    bool newActive = false;
-
-    if (!activeConfig.d.data())
-	return;
-
-    if (!activeConfig.isValid()) {
-        state = QNetworkSession::Invalid;
-	clearConfiguration(activeConfig);
-    } else if ((activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-        state = QNetworkSession::Connected;
-        newActive = opened;
-    } else if ((activeConfig.state() & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered) {
-        state = QNetworkSession::Disconnected;
-    } else if ((activeConfig.state() & QNetworkConfiguration::Defined) == QNetworkConfiguration::Defined) {
-        state = QNetworkSession::NotAvailable;
-    } else if ((activeConfig.state() & QNetworkConfiguration::Undefined) == QNetworkConfiguration::Undefined) {
-        state = QNetworkSession::NotAvailable;
-    }
-
-    bool oldActive = isOpen;
-    isOpen = newActive;
-
-    if (!oldActive && isOpen)
-        emit quitPendingWaitsForOpened();
-
-    if (oldActive && !isOpen)
-        emit q->closed();
-
-    if (oldState != state) {
-        emit q->stateChanged(state);
-
-        if (state == QNetworkSession::Disconnected && oldActive) {
-#ifdef BEARER_MANAGEMENT_DEBUG
-	    //qDebug()<<"session aborted error emitted for"<<activeConfig.identifier();
-#endif
-	    lastError = QNetworkSession::SessionAbortedError;
-	    emit q->error(lastError);
-	}
-    }
-
-#ifdef BEARER_MANAGEMENT_DEBUG
-    //qDebug()<<"oldState ="<<oldState<<" state ="<<state<<" oldActive ="<<oldActive<<" newActive ="<<newActive<<" opened ="<<opened;
-#endif
-}
-
-static QString get_network_interface()
-{
-    Maemo::Icd icd;
-    QList<Maemo::IcdAddressInfoResult> addr_results;
-    uint ret;
-    QString iface;
-
-    ret = icd.addrinfo(addr_results);
-    if (ret == 0) {
-	/* No results */
-#ifdef BEARER_MANAGEMENT_DEBUG
-	qDebug() << "Cannot get addrinfo from icd, are you connected or is icd running?";
-#endif
-	return iface;
-    }
-
-    const char *address = addr_results.first().ip_info.first().address.toAscii().constData();
-    struct in_addr addr;
-    if (inet_aton(address, &addr) == 0) {
-#ifdef BEARER_MANAGEMENT_DEBUG
-	qDebug() << "address" << address << "invalid";
-#endif
-	return iface;
-    }
-
-    struct ifaddrs *ifaddr, *ifa;
-    int family;
-
-    if (getifaddrs(&ifaddr) == -1) {
-#ifdef BEARER_MANAGEMENT_DEBUG
-	qDebug() << "getifaddrs() failed";
-#endif
-	return iface;
-    }
-
-    for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-        if (ifa->ifa_addr) {
-            family = ifa->ifa_addr->sa_family;
-            if (family != AF_INET) {
-                continue; /* Currently only IPv4 is supported by icd dbus interface */
-            }
-            if (((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr == addr.s_addr) {
-                iface = QString(ifa->ifa_name);
-                break;
-            }
-        }
-    }
-
-    freeifaddrs(ifaddr);
-    return iface;
-}
-
-
-void QNetworkSessionPrivate::open()
-{
-    if (m_stopTimer.isActive()) {
-        m_stopTimer.stop();
-    }
-    if (!publicConfig.isValid()) {
-        lastError = QNetworkSession::InvalidConfigurationError;
-        emit q->error(lastError);
-        return;
-    }
-    if (serviceConfig.isValid()) {
-        lastError = QNetworkSession::OperationNotSupportedError;
-        emit q->error(lastError);
-    } else if (!isOpen) {
-	if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
-	    /* Caller is trying to connect to default IAP.
-	     * At this time we will not know the IAP details so we just
-	     * connect and update the active config when the IAP is
-	     * connected.
-	     */
-	    opened = true;
-            state = QNetworkSession::Connecting;
-            emit q->stateChanged(state);
-	    QTimer::singleShot(0, this, SLOT(do_open()));
-	    return;
-	}
-
-	/* User is connecting to one specific IAP. If that IAP is not
-	 * in discovered state we cannot continue.
-	 */
-        if ((activeConfig.state() & QNetworkConfiguration::Discovered) !=
-            QNetworkConfiguration::Discovered) {
-            lastError =QNetworkSession::InvalidConfigurationError;
-            emit q->error(lastError);
-            return;
-        }
-        opened = true;
-
-        if ((activeConfig.state() & QNetworkConfiguration::Active) != QNetworkConfiguration::Active) {
-            state = QNetworkSession::Connecting;
-            emit q->stateChanged(state);
-            QTimer::singleShot(0, this, SLOT(do_open()));
-            return;
-        }
-        isOpen = (activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active;
-        if (isOpen)
-            emit quitPendingWaitsForOpened();
-    } else {
-        /* We seem to be active so inform caller */
-        emit quitPendingWaitsForOpened();
-    }
-}
-
-void QNetworkSessionPrivate::do_open()
-{
-    icd_connection_flags flags = connectFlags;
-    QString iap = publicConfig.identifier();
-
-    if (state == QNetworkSession::Connected) {
-#ifdef BEARER_MANAGEMENT_DEBUG
-        qDebug() << "Already connected to" << activeConfig.identifier();
-#endif
-        emit q->stateChanged(QNetworkSession::Connected);
-        emit quitPendingWaitsForOpened();
-	return;
-    }
-
-    if (publicConfig.type() == QNetworkConfiguration::UserChoice)
-        config = activeConfig;
-    else
-        config = publicConfig;
-
-    if (iap == OSSO_IAP_ANY) {
-#ifdef BEARER_MANAGEMENT_DEBUG
-        qDebug() << "connecting to default IAP" << iap;
-#endif
-        m_connectRequestTimer.start(ICD_LONG_CONNECT_TIMEOUT);
-        m_dbusInterface->asyncCall(ICD_DBUS_API_CONNECT_REQ, (uint)flags); // Return value ignored
-        m_asynchCallActive = true;
-    } else {
-        ICd2DetailsDBusStruct icd2;
-        icd2.serviceType = config.d->service_type;
-        icd2.serviceAttributes = config.d->service_attrs;
-        icd2.setviceId = config.d->service_id;
-        icd2.networkType = config.d->iap_type;
-        icd2.networkAttributes = config.d->network_attrs;
-        if (config.d->network_attrs & ICD_NW_ATTR_IAPNAME) {
-            icd2.networkId  = QByteArray(iap.toLatin1());
-        } else {
-            icd2.networkId  = config.d->network_id;
-        }
-
-#ifdef BEARER_MANAGEMENT_DEBUG
-    qDebug("connecting to %s/%s/0x%x/%s/0x%x/%s",
-        icd2.networkId.data(),
-        icd2.networkType.toAscii().constData(),
-        icd2.networkAttributes,
-        icd2.serviceType.toAscii().constData(),
-        icd2.serviceAttributes,
-        icd2.setviceId.toAscii().constData());
-#endif
-
-        ICd2DetailsList paramArray;
-        paramArray.append(icd2);
-        m_connectRequestTimer.start(ICD_LONG_CONNECT_TIMEOUT);
-        m_dbusInterface->asyncCall(ICD_DBUS_API_CONNECT_REQ, (uint)flags, QVariant::fromValue(paramArray)); // Return value ignored
-        m_asynchCallActive = true;
-    }
-}
-
- void QNetworkSessionPrivate::stateChange(const QDBusMessage& rep)
-{
-     if (m_asynchCallActive == true) {
-        if (m_connectRequestTimer.isActive())
-            m_connectRequestTimer.stop();
-        m_asynchCallActive = false;
-
-        QString result = rep.arguments().at(5).toString(); // network id or empty string
-        QString connected_iap = result;
-        if (connected_iap.isEmpty()) {
-#ifdef BEARER_MANAGEMENT_DEBUG
-            qDebug() << "connect to"<< publicConfig.identifier() << "failed, result is empty";
-#endif
-            updateState(QNetworkSession::Disconnected);
-            emit q->error(QNetworkSession::InvalidConfigurationError);
-            if (publicConfig.type() == QNetworkConfiguration::UserChoice)
-                    copyConfig(publicConfig, activeConfig);
-            return;
-        }
-
-         /* If the user tried to connect to some specific connection (foo)
-         * and we were already connected to some other connection (bar),
-         * then we cannot activate this session although icd has a valid
-         * connection to somewhere.
-         */
-        if ((publicConfig.type() != QNetworkConfiguration::UserChoice) &&
-            (connected_iap != config.identifier())) {
-            updateState(QNetworkSession::Disconnected);
-            emit q->error(QNetworkSession::InvalidConfigurationError);
-            return;
-        }
-
-        /* Did we connect to non saved IAP? */
-        if (!(config.d->network_attrs & ICD_NW_ATTR_IAPNAME)) {
-            /* Because the connection succeeded, the IAP is now known.
-             */
-            config.d->network_attrs |= ICD_NW_ATTR_IAPNAME;
-            config.d->id = connected_iap;
-        }
-
-        /* User might have changed the IAP name when a new IAP was saved */
-        Maemo::IAPConf iap_name(config.d->id);
-        QString name = iap_name.value("name").toString();
-        if (!name.isEmpty())
-            config.d->name = name;
-
-        config.d->iap_type = rep.arguments().at(3).toString(); // connect_result.connect.network_type;
-        config.d->isValid = true;
-        config.d->state = QNetworkConfiguration::Active;
-        config.d->type = QNetworkConfiguration::InternetAccessPoint;
-
-        startTime = QDateTime::currentDateTime();
-        updateState(QNetworkSession::Connected);
-        //currentNetworkInterface = get_network_interface();
-#ifdef BEARER_MANAGEMENT_DEBUG
-        //qDebug() << "connected to" << result << config.d->name << "at" << currentNetworkInterface;
-#endif
-
-        /* We first check if the configuration already exists in the manager
-         * and if it is not found there, we then insert it. Note that this
-         * is only done for user choice config only because it can be missing
-         * from config manager list.
-         */
-        if (publicConfig.d->type == QNetworkConfiguration::UserChoice) {
-#ifdef BEARER_MANAGEMENT_DEBUG
-#if 0
-            QList<QNetworkConfiguration> configs;
-            QNetworkConfigurationManagerPrivate *conPriv = (QNetworkConfigurationManagerPrivate*)config.d.data()->manager;
-            QList<QString> cpsIdents = conPriv->accessPointConfigurations.keys();
-            foreach( QString ii, cpsIdents) {
-                QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> p =
-                        conPriv->accessPointConfigurations.value(ii);
-                QNetworkConfiguration pt;
-                pt.d = conPriv->accessPointConfigurations.value(ii);
-                configs << pt;
-            }
-
-            int all = configs.count();
-            qDebug() << "All configurations:" << all;
-            foreach(QNetworkConfiguration p, configs) {
-                qDebug() << p.name() <<":  isvalid->" <<p.isValid() << " type->"<< p.type() <<
-                        " roaming->" << p.isRoamingAvailable() << "identifier->" << p.identifier() <<
-                        " purpose->" << p.purpose() << " state->" << p.state();
-            }
-#endif
-#endif
-            QNetworkConfigurationManagerPrivate *mgr = (QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager;
-            if (!mgr->accessPointConfigurations.contains(result)) {
-                QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr = config.d;
-                mgr->accessPointConfigurations.insert(result, ptr);
-
-                QNetworkConfiguration item;
-                item.d = ptr;
-                emit mgr->configurationAdded(item);
-
-#ifdef BEARER_MANAGEMENT_DEBUG
-            qDebug()<<"New configuration"<<result<<"added to manager in open";
-#endif
-
-            } else {
-                QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = mgr->accessPointConfigurations.value(result);
-                QNetworkConfiguration reference;
-                reference.d = priv;
-                copyConfig(config, reference, false);
-                reference.d.data()->id = result; // Note: Id was not copied in copyConfig() function
-                config = reference;
-                activeConfig = reference;
-
-#ifdef BEARER_MANAGEMENT_DEBUG
-                qDebug()<<"Existing configuration"<<result<<"updated in manager in open";
-#endif
-            }
-        }
-
-        emit quitPendingWaitsForOpened();
-    }
-}
-
-void QNetworkSessionPrivate::connectTimeout()
-{
-    updateState(QNetworkSession::Disconnected);
-    if (publicConfig.type() == QNetworkConfiguration::UserChoice)
-            copyConfig(publicConfig, activeConfig);
-        emit q->error(QNetworkSession::UnknownSessionError);
-}
-
-void QNetworkSessionPrivate::close()
-{
-    if (m_connectRequestTimer.isActive())
-        m_connectRequestTimer.stop();
-
-    if (serviceConfig.isValid()) {
-        lastError = QNetworkSession::OperationNotSupportedError;
-        emit q->error(lastError);
-    } else if (isOpen) {
-        opened = false;
-        isOpen = false;
-        emit q->closed();
-    }
-}
-
-
-void QNetworkSessionPrivate::stop()
-{
-    if (m_connectRequestTimer.isActive())
-        m_connectRequestTimer.stop();
-
-    if (serviceConfig.isValid()) {
-        lastError = QNetworkSession::OperationNotSupportedError;
-        emit q->error(lastError);
-    } else {
-        if ((activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-            if (!m_stopTimer.isActive()) {
-                Maemo::Icd icd;
-#ifdef BEARER_MANAGEMENT_DEBUG
-                qDebug() << "stopping session" << publicConfig.identifier();
-#endif
-                state = QNetworkSession::Closing;
-                emit q->stateChanged(state);
-
-                opened = false;
-                isOpen = false;
-
-                icd.disconnect(ICD_CONNECTION_FLAG_APPLICATION_EVENT);
-                startTime = QDateTime();
-
-                /* Note: Session state will change to disconnected
-                 *       as soon as QNetworkConfigurationManager sends
-                 *       corresponding iapStateChanged signal.
-                 */
-
-                // Make sure that this Session will send closed signal
-                // even though ICD connection will not ever get closed
-                m_stopTimer.start(ICD_SHORT_CONNECT_TIMEOUT); // 10 seconds wait
-            }
-        } else {
-	    opened = false;
-	    isOpen = false;
-	    emit q->closed();
-	}
-    }
-}
-
-void QNetworkSessionPrivate::finishStopBySendingClosedSignal()
-{
-    if ((activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-        state = QNetworkSession::Connected;
-        emit q->stateChanged(state);
-    }
-    emit q->closed();
-}
-
-void QNetworkSessionPrivate::migrate()
-{
-    qWarning("This platform does not support roaming (%s).", __FUNCTION__);
-}
-
-
-void QNetworkSessionPrivate::accept()
-{
-    qWarning("This platform does not support roaming (%s).", __FUNCTION__);
-}
-
-
-void QNetworkSessionPrivate::ignore()
-{
-    qWarning("This platform does not support roaming (%s).", __FUNCTION__);
-}
-
-
-void QNetworkSessionPrivate::reject()
-{
-    qWarning("This platform does not support roaming (%s).", __FUNCTION__);
-}
-
-
-QNetworkInterface QNetworkSessionPrivate::currentInterface() const
-{
-    if (!publicConfig.isValid() || state != QNetworkSession::Connected)
-        return QNetworkInterface();
-
-    if (currentNetworkInterface.isEmpty())
-        return QNetworkInterface();
-
-    return QNetworkInterface::interfaceFromName(currentNetworkInterface);
-}
-
-
-void QNetworkSessionPrivate::setSessionProperty(const QString& key, const QVariant& value)
-{
-    if (value.isValid()) {
-	properties.insert(key, value);
-
-	if (key == "ConnectInBackground") {
-	    bool v = value.toBool();
-	    if (v)
-		connectFlags = ICD_CONNECTION_FLAG_APPLICATION_EVENT;
-	    else
-		connectFlags = ICD_CONNECTION_FLAG_USER_EVENT;
-	}
-    } else {
-	properties.remove(key);
-
-	/* Set default value when property is removed */
-	if (key == "ConnectInBackground")
-	    connectFlags = ICD_CONNECTION_FLAG_USER_EVENT;
-    }
-}
-
-
-QVariant QNetworkSessionPrivate::sessionProperty(const QString& key) const
-{
-    return properties.value(key);
-}
-
-
-QString QNetworkSessionPrivate::errorString() const
-{
-    QString errorStr;
-    switch(q->error()) {
-    case QNetworkSession::RoamingError:
-        errorStr = QObject::tr("Roaming error");
-        break;
-    case QNetworkSession::SessionAbortedError:
-        errorStr = QObject::tr("Session aborted by user or system");
-        break;
-    default:
-    case QNetworkSession::UnknownSessionError:
-        errorStr = QObject::tr("Unidentified Error");
-        break;
-    }
-    return errorStr;
-}
-
-
-QNetworkSession::SessionError QNetworkSessionPrivate::error() const
-{
-    return QNetworkSession::UnknownSessionError;
-}
-
-
-void QNetworkSessionPrivate::updateProxies(QNetworkSession::State newState)
-{
-    if ((newState == QNetworkSession::Connected) &&
-	(newState != currentState))
-	updateProxyInformation();
-    else if ((newState == QNetworkSession::Disconnected) &&
-	    (currentState == QNetworkSession::Closing))
-	clearProxyInformation();
-
-    currentState = newState;
-}
-
-
-void QNetworkSessionPrivate::updateProxyInformation()
-{
-    Maemo::ProxyConf::update();
-}
-
-
-void QNetworkSessionPrivate::clearProxyInformation()
-{
-    Maemo::ProxyConf::clear();
-}
-
-
-#include "moc_qnetworksession_maemo_p.cpp"
-
-QTM_END_NAMESPACE