Changeset 157 for trunk/src

Timestamp:

Sep 4, 2009, 2:06:32 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

network: Implemented QLocalServer/QLocalSocket/QNativeSocketEngine OS/2 bits (basically a copy of the Unix port with IPv6 stuff removed).

Location:

trunk/src/network/socket

Files:

• qlocalserver_os2.cpp (copied) (copied from trunk/src/network/socket/qlocalserver_unix.cpp ) (1 diff)
• qlocalsocket_os2.cpp (copied) (copied from trunk/src/network/socket/qlocalsocket_unix.cpp ) (1 diff)
• qnativesocketengine_os2.cpp (copied) (copied from trunk/src/network/socket/qnativesocketengine_unix.cpp ) (11 diffs)
• socket.pri (modified) (1 diff)

trunk/src/network/socket/qlocalserver_os2.cpp

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information ([email protected])
+
+
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.

trunk/src/network/socket/qlocalsocket_os2.cpp

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information ([email protected])
+
+
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.

trunk/src/network/socket/qnativesocketengine_os2.cpp

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information ([email protected])
+
+
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -50 +52 @@
 #include <errno.h>
 #include <fcntl.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-#ifdef QT_LINUXBASE
-#include <arpa/inet.h>
-#endif
+#include <sys/filio.h>
 
 #if defined QNATIVESOCKETENGINE_DEBUG
@@ -117 +111 @@
 static inline void qt_socket_getPortAndAddress(struct sockaddr *sa, quint16 *port, QHostAddress *addr)
 {
-#if !defined(QT_NO_IPV6)
-    if (sa->sa_family == AF_INET6) {
-        struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa;
-        Q_IPV6ADDR tmp;
-        memcpy(&tmp, &sa6->sin6_addr.s6_addr, sizeof(tmp));
-        if (addr) {
-            QHostAddress tmpAddress;
-            tmpAddress.setAddress(tmp);
-            *addr = tmpAddress;
-#ifndef QT_NO_IPV6IFNAME
-            char scopeid[IFNAMSIZ];
-            if (::if_indextoname(sa6->sin6_scope_id, scopeid) > 0) {
-                addr->setScopeId(QLatin1String(scopeid));
-            } else
-#endif
-            addr->setScopeId(QString::number(sa6->sin6_scope_id));
-        }
-        if (port)
-            *port = ntohs(sa6->sin6_port);
-        return;
-    }
-#endif
     struct sockaddr_in *sa4 = (struct sockaddr_in *)sa;
     if (port)
@@ -157 +129 @@
                                          QAbstractSocket::NetworkLayerProtocol socketProtocol)
 {
-#ifndef QT_NO_IPV6
-    int protocol = (socketProtocol == QAbstractSocket::IPv6Protocol) ? AF_INET6 : AF_INET;
-#else
     Q_UNUSED(socketProtocol);
     int protocol = AF_INET;
-#endif
     int type = (socketType == QAbstractSocket::UdpSocket) ? SOCK_DGRAM : SOCK_STREAM;
     int socket = qt_socket_socket(protocol, type, 0);
@@ -295 +263 @@
     QT_SOCKLEN_T sockAddrSize = 0;
 
-#if !defined(QT_NO_IPV6)
-    struct sockaddr_in6 sockAddrIPv6;
-
-    if (addr.protocol() == QAbstractSocket::IPv6Protocol) {
-        memset(&sockAddrIPv6, 0, sizeof(sockAddrIPv6));
-        sockAddrIPv6.sin6_family = AF_INET6;
-        sockAddrIPv6.sin6_port = htons(port);
-#ifndef QT_NO_IPV6IFNAME
-        sockAddrIPv6.sin6_scope_id = ::if_nametoindex(addr.scopeId().toLatin1().data());
-#else
-        sockAddrIPv6.sin6_scope_id = addr.scopeId().toInt();
-#endif
-        Q_IPV6ADDR ip6 = addr.toIPv6Address();
-        memcpy(&sockAddrIPv6.sin6_addr.s6_addr, &ip6, sizeof(ip6));
-
-        sockAddrSize = sizeof(sockAddrIPv6);
-        sockAddrPtr = (struct sockaddr *) &sockAddrIPv6;
-    } else
-#if 0
-    {}
-#endif
-#endif
     if (addr.protocol() == QAbstractSocket::IPv4Protocol) {
         memset(&sockAddrIPv4, 0, sizeof(sockAddrIPv4));
@@ -403 +349 @@
     QT_SOCKLEN_T sockAddrSize = 0;
 
-#if !defined(QT_NO_IPV6)
-    struct sockaddr_in6 sockAddrIPv6;
-
-    if (address.protocol() == QAbstractSocket::IPv6Protocol) {
-        memset(&sockAddrIPv6, 0, sizeof(sockAddrIPv6));
-        sockAddrIPv6.sin6_family = AF_INET6;
-        sockAddrIPv6.sin6_port = htons(port);
-#ifndef QT_NO_IPV6IFNAME
-        sockAddrIPv6.sin6_scope_id = ::if_nametoindex(address.scopeId().toLatin1().data());
-#else
-        sockAddrIPv6.sin6_scope_id = address.scopeId().toInt();
-#endif
-        Q_IPV6ADDR tmp = address.toIPv6Address();
-        memcpy(&sockAddrIPv6.sin6_addr.s6_addr, &tmp, sizeof(tmp));
-        sockAddrSize = sizeof(sockAddrIPv6);
-        sockAddrPtr = (struct sockaddr *) &sockAddrIPv6;
-    } else
-#endif
-        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
-            memset(&sockAddrIPv4, 0, sizeof(sockAddrIPv4));
-            sockAddrIPv4.sin_family = AF_INET;
-            sockAddrIPv4.sin_port = htons(port);
-            sockAddrIPv4.sin_addr.s_addr = htonl(address.toIPv4Address());
-            sockAddrSize = sizeof(sockAddrIPv4);
-            sockAddrPtr = (struct sockaddr *) &sockAddrIPv4;
-        } else {
-            // unreachable
-        }
+    if (address.protocol() == QAbstractSocket::IPv4Protocol) {
+        memset(&sockAddrIPv4, 0, sizeof(sockAddrIPv4));
+        sockAddrIPv4.sin_family = AF_INET;
+        sockAddrIPv4.sin_port = htons(port);
+        sockAddrIPv4.sin_addr.s_addr = htonl(address.toIPv4Address());
+        sockAddrSize = sizeof(sockAddrIPv4);
+        sockAddrPtr = (struct sockaddr *) &sockAddrIPv4;
+    } else {
+        // unreachable
+    }
 
     int bindResult = QT_SOCKET_BIND(socketDescriptor, sockAddrPtr, sockAddrSize);
@@ -537 +465 @@
 {
     // Create a sockaddr struct and reset its port number.
-#if !defined(QT_NO_IPV6)
-    struct sockaddr_storage storage;
-    sockaddr_in6 *storagePtrIPv6 = reinterpret_cast<sockaddr_in6 *>(&storage);
-    storagePtrIPv6->sin6_port = 0;
-#else
     struct sockaddr storage;
-#endif
     sockaddr *storagePtr = reinterpret_cast<sockaddr *>(&storage);
     storagePtr->sa_family = 0;
@@ -599 +521 @@
                                                     QHostAddress *address, quint16 *port)
 {
-#if !defined(QT_NO_IPV6)
-    struct sockaddr_storage aa;
-#else
     struct sockaddr_in aa;
-#endif
     memset(&aa, 0, sizeof(aa));
     QT_SOCKLEN_T sz;
@@ -638 +556 @@
     QT_SOCKLEN_T sockAddrSize = 0;
 
-#if !defined(QT_NO_IPV6)
-    struct sockaddr_in6 sockAddrIPv6;
-    if (host.protocol() == QAbstractSocket::IPv6Protocol) {
-        memset(&sockAddrIPv6, 0, sizeof(sockAddrIPv6));
-        sockAddrIPv6.sin6_family = AF_INET6;
-        sockAddrIPv6.sin6_port = htons(port);
-
-        Q_IPV6ADDR tmp = host.toIPv6Address();
-        memcpy(&sockAddrIPv6.sin6_addr.s6_addr, &tmp, sizeof(tmp));
-        sockAddrSize = sizeof(sockAddrIPv6);
-        sockAddrPtr = (struct sockaddr *)&sockAddrIPv6;
-    } else
-#endif
     if (host.protocol() == QAbstractSocket::IPv4Protocol) {
         memset(&sockAddrIPv4, 0, sizeof(sockAddrIPv4));
@@ -698 +603 @@
         return false;
 
-#if !defined(QT_NO_IPV6)
-    struct sockaddr_storage sa;
-#else
     struct sockaddr_in sa;
-#endif
     struct sockaddr *sockAddrPtr = (struct sockaddr *) &sa;
     QT_SOCKLEN_T sockAddrSize = sizeof(sa);
@@ -716 +617 @@
             socketProtocol = QAbstractSocket::IPv4Protocol;
             break;
-#if !defined (QT_NO_IPV6)
-        case AF_INET6:
-            socketProtocol = QAbstractSocket::IPv6Protocol;
-            break;
-#endif
         default:
             socketProtocol = QAbstractSocket::UnknownNetworkLayerProtocol;

trunk/src/network/socket/socket.pri

@@ -35 +35 @@
                 socket/qlocalserver_win.cpp
 
+
+
+
+
 wince*: {
     SOURCES -= socket/qlocalsocket_win.cpp \