Add support for ipv6 settings property

3 files changed, 20 insertions, 6 deletions

diff --git a/lib/ofonoconnmancontext.cpp b/lib/ofonoconnmancontext.cpp
index 5a4b648..aff03e2 100644
--- a/lib/ofonoconnmancontext.cpp
+++ b/lib/ofonoconnmancontext.cpp
@@ -123,13 +123,15 @@ void OfonoConnmanContext::propertyChanged(const QString &property, const QVarian
     } else if (property == "MessageProxy") {
         emit messageProxyChanged(value.value<QString>());
     } else if (property == "MessageCenter") {
-            emit messageCenterChanged(value.value<QString>());
-
+        emit messageCenterChanged(value.value<QString>());
     } else if (property == "Settings") {
-
         QVariantMap map;
         value.value<QDBusArgument>()>>map;
         emit settingsChanged(map);
+    } else if (property == "IPv6.Settings") {
+        QVariantMap map;
+        value.value<QDBusArgument>()>>map;
+        emit IPv6SettingsChanged(map);
     }
 }
 
@@ -140,6 +142,13 @@ QVariantMap OfonoConnmanContext::settings() const
     return map;
 }
 
+QVariantMap OfonoConnmanContext::IPv6Settings() const
+{
+    QVariantMap map;
+    m_if->properties()["IPv6.Settings"].value<QDBusArgument>()>>map;
+    return map;
+}
+
 QString OfonoConnmanContext::path() const
 {
     return m_if->path();
diff --git a/lib/ofonoconnmancontext.h b/lib/ofonoconnmancontext.h
index 1925a84..2430f69 100644
--- a/lib/ofonoconnmancontext.h
+++ b/lib/ofonoconnmancontext.h
@@ -76,6 +76,7 @@ public:
     QString messageProxy() const;
     QString messageCenter() const;
     QVariantMap settings() const;
+    QVariantMap IPv6Settings() const;
 
     void setActive(const bool);
     void setAccessPointName(const QString&);
@@ -110,6 +111,7 @@ signals:
 
     /* Settings change notification*/
     void settingsChanged(const QVariantMap&);
+    void IPv6SettingsChanged(const QVariantMap&);
 
 private slots:
     void propertyChanged(const QString &property, const QVariant &value);
diff --git a/tests/test_ofonoconnmancontext.cpp b/tests/test_ofonoconnmancontext.cpp
index edb9f60..e0a1208 100644
--- a/tests/test_ofonoconnmancontext.cpp
+++ b/tests/test_ofonoconnmancontext.cpp
@@ -73,6 +73,7 @@ private slots:
         QSignalSpy pw (context, SIGNAL(passwordChanged(const QString&)));
         QSignalSpy proto (context, SIGNAL(protocolChanged(const QString&)));
         QSignalSpy sett (context, SIGNAL(settingsChanged(const QVariantMap&)));
+        QSignalSpy sett6 (context, SIGNAL(IPv6SettingsChanged(const QVariantMap&)));
 
         context->setAccessPointName("hyva");
         QTest::qWait(5000);
@@ -100,8 +101,9 @@ private slots:
         QCOMPARE(name.takeFirst().at(0).toString(),QString("yota"));
         QCOMPARE(type.count(),1);
         QCOMPARE(type.takeFirst().at(0).toString(),QString("mms"));
-        QCOMPARE(sett.count(),1);
-        QVariantMap settings = context->settings();
+        QCOMPARE(sett.count(),0);
+        QCOMPARE(sett6.count(),1);
+        QVariantMap settings = context->IPv6Settings();
         QCOMPARE(settings["Interface"].value<QString>(),QString("dummy0"));
         QCOMPARE(proto.count(),1);
         QCOMPARE(proto.takeFirst().at(0).toString(),QString("ipv6"));
@@ -114,7 +116,8 @@ private slots:
         m->removeContext(contextid);
         QTest::qWait(5000);
         QCOMPARE(active.count(),2);
-        QCOMPARE(sett.count(),2);
+        QCOMPARE(sett.count(),0);
+        QCOMPARE(sett6.count(),2);
         QCOMPARE(conrem.count(), 1);
 
     }