Implement IPv6 in symbian QNetworkInterface

For IPv6 interfaces, the network mask is reported correctly, so we use
that.
For IPv4 interfaces, the network mask is reported as 0.0.0.0 so the
existing workaround to get the netmask from routes is used.
For loopback interfaces, the mask can be statically determined.

Skip checking the routes if proper masks were reported for all the
interfaces.

Added a helper function for converting TInetAddr -> QHostAddress using
the constructors that take binary data. (better than conversion to/from
strings)

Task-number: QTBUG-18137
Reviewed-by: Markus Goetz

1 files changed, 83 insertions, 45 deletions

diff --git a/src/network/kernel/qnetworkinterface_symbian.cpp b/src/network/kernel/qnetworkinterface_symbian.cpp
index 42a041c..7767f54 100644
--- a/src/network/kernel/qnetworkinterface_symbian.cpp
+++ b/src/network/kernel/qnetworkinterface_symbian.cpp
@@ -67,10 +67,24 @@ static QNetworkInterface::InterfaceFlags convertFlags(const TSoInetInterfaceInfo
     return flags;
 }
 
+//TODO: share this, at least QHostInfo needs to do the same thing
+static QHostAddress qt_QHostAddressFromTInetAddr(const TInetAddr& addr)
+{
+    //TODO: do we want to call v4 mapped addresses v4 or v6 outside of this file?
+    if (addr.IsV4Mapped() || addr.Family() == KAfInet) {
+        //convert v4 host address
+        return QHostAddress(addr.Address());
+    } else {
+        //convert v6 host address
+        return QHostAddress((quint8 *)(addr.Ip6Address().u.iAddr8));
+    }
+}
+
 static QList<QNetworkInterfacePrivate *> interfaceListing()
 {
     TInt err(KErrNone);
     QList<QNetworkInterfacePrivate *> interfaces;
+    QList<QHostAddress> addressesWithEstimatedNetmasks;
 
     // Open dummy socket for interface queries
     RSocket socket;
@@ -90,8 +104,7 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
     TPckgBuf<TSoInetInterfaceInfo> infoPckg;
     TSoInetInterfaceInfo &info = infoPckg();
     while (socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, infoPckg) == KErrNone) {
-        // Do not include IPv6 addresses because netmask and broadcast address cannot be determined correctly
-        if (info.iName != KNullDesC && info.iAddress.IsV4Mapped()) {
+        if (info.iName != KNullDesC) {
             TName address;
             QNetworkAddressEntry entry;
             QNetworkInterfacePrivate *iface = 0;
@@ -113,40 +126,58 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
             }
 
             // Get the address of the interface
-            info.iAddress.Output(address);
-            entry.setIp(QHostAddress(qt_TDesC2QString(address)));
+            entry.setIp(qt_QHostAddressFromTInetAddr(info.iAddress));
+
+#if defined(QNETWORKINTERFACE_DEBUG)
+            qDebug() << "address is" << info.iAddress.Family() << entry.ip();
+            qDebug() << "netmask is" << info.iNetMask.Family() << qt_QHostAddressFromTInetAddr( info.iNetMask );
+#endif
 
             // Get the interface netmask
-            // For some reason netmask is always 0.0.0.0
-            // info.iNetMask.Output(address);
-            // entry.setNetmask( QHostAddress( qt_TDesC2QString( address ) ) );
-
-            // Workaround: Let Symbian determine netmask based on IP address class
-            // TODO: Works only for IPv4 - Task: 259128 Implement IPv6 support
-            TInetAddr netmask;
-            netmask.NetMask(info.iAddress);
-            netmask.Output(address);
-            entry.setNetmask(QHostAddress(qt_TDesC2QString(address)));
-
-            // Get the interface broadcast address
-            if (iface->flags & QNetworkInterface::CanBroadcast) {
-                // For some reason broadcast address is always 0.0.0.0
-                // info.iBrdAddr.Output(address);
-                // entry.setBroadcast( QHostAddress( qt_TDesC2QString( address ) ) );
-
-                // Workaround: Let Symbian determine broadcast address based on IP address
-                // TODO: Works only for IPv4 - Task: 259128 Implement IPv6 support
-                TInetAddr broadcast;
-                broadcast.NetBroadcast(info.iAddress);
-                broadcast.Output(address);
-                entry.setBroadcast(QHostAddress(qt_TDesC2QString(address)));
+            if (info.iNetMask.IsUnspecified()) {
+                // For some reason netmask is always 0.0.0.0 for IPv4 interfaces
+                // and loopback interfaces (which we statically know)
+                if (info.iAddress.IsV4Mapped()) {
+                    if (info.iFeatures & KIfIsLoopback) {
+                        entry.setPrefixLength(32);
+                    } else {
+                        // Workaround: Let Symbian determine netmask based on IP address class (IPv4 only API)
+                        TInetAddr netmask;
+                        netmask.NetMask(info.iAddress);
+                        entry.setNetmask(QHostAddress(netmask.Address())); //binary convert v4 address
+                        addressesWithEstimatedNetmasks << entry.ip();
+#if defined(QNETWORKINTERFACE_DEBUG)
+                        qDebug() << "address class determined netmask" << entry.netmask();
+#endif
+                    }
+                } else {
+                    // For IPv6 interfaces
+                    if (info.iFeatures & KIfIsLoopback) {
+                        entry.setPrefixLength(128);
+                    } else if (info.iNetMask.IsUnspecified()) {
+                        //Don't see this error for IPv6, but try to handle it if it happens
+                        entry.setPrefixLength(64); //most common
+#if defined(QNETWORKINTERFACE_DEBUG)
+                        qDebug() << "total guess netmask" << entry.netmask();
+#endif
+                        addressesWithEstimatedNetmasks << entry.ip();
+                    }
+                }
+            } else {
+                //Expected code path for IPv6 non loopback interfaces (IPv4 could come here if symbian is fixed)
+                entry.setNetmask(qt_QHostAddressFromTInetAddr(info.iNetMask));
+#if defined(QNETWORKINTERFACE_DEBUG)
+                qDebug() << "reported netmask" << entry.netmask();
+#endif
             }
 
+            // broadcast address is determined from the netmask in postProcess()
+
             // Add new entry to interface address entries
             iface->addressEntries << entry;
 
 #if defined(QNETWORKINTERFACE_DEBUG)
-            printf("\n       Found network interface %s, interface flags:\n\
+            qDebug("\n       Found network interface %s, interface flags:\n\
                 IsUp = %d, IsRunning = %d, CanBroadcast = %d,\n\
                 IsLoopBack = %d, IsPointToPoint = %d, CanMulticast = %d, \n\
                 ip = %s, netmask = %s, broadcast = %s,\n\
@@ -160,8 +191,14 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
         }
     }
 
+    // if we didn't have to guess any netmasks, then we're done.
+    if (addressesWithEstimatedNetmasks.isEmpty()) {
+        socket.Close();
+        return interfaces;
+    }
+
     // we will try to use routing info to detect more precisely
-    // netmask and then ::postProcess() should calculate
+    // estimated netmasks and then ::postProcess() should calculate
     // broadcast addresses
 
     // use dummy socket to start enumerating routes
@@ -176,16 +213,21 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
     TSoInetRouteInfo routeInfo;
     TPckg<TSoInetRouteInfo> routeInfoPkg(routeInfo);
     while (socket.GetOpt(KSoInetNextRoute, KSolInetRtCtrl, routeInfoPkg) == KErrNone) {
-        TName address;
-
         // get interface address
-        routeInfo.iIfAddr.Output(address);
-        QHostAddress ifAddr(qt_TDesC2QString(address));
+        QHostAddress ifAddr(qt_QHostAddressFromTInetAddr(routeInfo.iIfAddr));
         if (ifAddr.isNull())
             continue;
+        if (!addressesWithEstimatedNetmasks.contains(ifAddr)) {
+#if defined(QNETWORKINTERFACE_DEBUG)
+            qDebug() << "skipping route from" << ifAddr << "because it wasn't an estimated netmask";
+#endif
+            continue;
+        }
 
-        routeInfo.iDstAddr.Output(address);
-        QHostAddress destination(qt_TDesC2QString(address));
+        QHostAddress destination(qt_QHostAddressFromTInetAddr(routeInfo.iDstAddr));
+#if defined(QNETWORKINTERFACE_DEBUG)
+        qDebug() << "route from" << ifAddr << "to" << destination;
+#endif
         if (destination.isNull() || destination != ifAddr)
             continue;
 
@@ -196,17 +238,13 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
                 QNetworkAddressEntry entry = iface->addressEntries.at(eindex);
                 if (entry.ip() != ifAddr) {
                     continue;
-                } else if (entry.ip().protocol() != QAbstractSocket::IPv4Protocol) {
-                    // skip if not IPv4 address (e.g. IPv6)
-                    // as results not reliable on Symbian
-                    continue;
-                } else {
-                    routeInfo.iNetMask.Output(address);
-                    QHostAddress netmask(qt_TDesC2QString(address));
+                } else if (!routeInfo.iNetMask.IsUnspecified()) {
+                    //the route may also return 0.0.0.0 netmask, in which case don't use it.
+                    QHostAddress netmask(qt_QHostAddressFromTInetAddr(routeInfo.iNetMask));
                     entry.setNetmask(netmask);
-                    // NULL boradcast address for
-                    // ::postProcess to have effect
-                    entry.setBroadcast(QHostAddress());
+#if defined(QNETWORKINTERFACE_DEBUG)
+                    qDebug() << " - route netmask" << routeInfo.iNetMask.Family() << netmask << " (using route determined netmask)";
+#endif
                     iface->addressEntries.replace(eindex, entry);
                 }
             }