Changeset 651 for trunk/src/network/socket

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qabstractsocket.cpp (modified) (3 diffs)
• src/network/socket/qabstractsocket.h (modified) (1 diff)
• src/network/socket/qabstractsocket_p.h (modified) (1 diff)
• src/network/socket/qabstractsocketengine.cpp (modified) (1 diff)
• src/network/socket/qabstractsocketengine_p.h (modified) (1 diff)
• src/network/socket/qhttpsocketengine.cpp (modified) (4 diffs)
• src/network/socket/qhttpsocketengine_p.h (modified) (2 diffs)
• src/network/socket/qlocalserver.cpp (modified) (1 diff)
• src/network/socket/qlocalserver.h (modified) (1 diff)
• src/network/socket/qlocalserver_p.h (modified) (1 diff)
• src/network/socket/qlocalserver_tcp.cpp (modified) (1 diff)
• src/network/socket/qlocalserver_unix.cpp (modified) (1 diff)
• src/network/socket/qlocalserver_win.cpp (modified) (1 diff)
• src/network/socket/qlocalsocket.cpp (modified) (1 diff)
• src/network/socket/qlocalsocket.h (modified) (1 diff)
• src/network/socket/qlocalsocket_p.h (modified) (1 diff)
• src/network/socket/qlocalsocket_tcp.cpp (modified) (1 diff)
• src/network/socket/qlocalsocket_unix.cpp (modified) (1 diff)
• src/network/socket/qlocalsocket_win.cpp (modified) (1 diff)
• src/network/socket/qnativesocketengine.cpp (modified) (2 diffs)
• src/network/socket/qnativesocketengine_p.h (modified) (1 diff)
• src/network/socket/qnativesocketengine_unix.cpp (modified) (1 diff)
• src/network/socket/qnativesocketengine_win.cpp (modified) (6 diffs)
• src/network/socket/qnet_unix_p.h (modified) (1 diff)
• src/network/socket/qsocks5socketengine.cpp (modified) (1 diff)
• src/network/socket/qsocks5socketengine_p.h (modified) (1 diff)
• src/network/socket/qtcpserver.cpp (modified) (1 diff)
• src/network/socket/qtcpserver.h (modified) (1 diff)
• src/network/socket/qtcpsocket.cpp (modified) (1 diff)
• src/network/socket/qtcpsocket.h (modified) (1 diff)
• src/network/socket/qtcpsocket_p.h (modified) (1 diff)
• src/network/socket/qudpsocket.cpp (modified) (1 diff)
• src/network/socket/qudpsocket.h (modified) (1 diff)

trunk/src/network/socket/qabstractsocket.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -521 +521 @@
 #if defined (QABSTRACTSOCKET_DEBUG)
     QString typeStr;
-    if (q->socketType() == QAbstractSocket::TcpSocket) typeStr = "TcpSocket";
-    else if (q->socketType() == QAbstractSocket::UdpSocket) typeStr = "UdpSocket";
-    else typeStr = "UnknownSocketType";
+    if (q->socketType() == QAbstractSocket::TcpSocket) typeStr = ;
+    else if (q->socketType() == QAbstractSocket::UdpSocket) typeStr = ;
+    else typeStr = ;
     QString protocolStr;
-    if (protocol == QAbstractSocket::IPv4Protocol) protocolStr = "IPv4Protocol";
-    else if (protocol == QAbstractSocket::IPv6Protocol) protocolStr = "IPv6Protocol";
-    else protocolStr = "UnknownNetworkLayerProtocol";
+    if (protocol == QAbstractSocket::IPv4Protocol) protocolStr = ;
+    else if (protocol == QAbstractSocket::IPv6Protocol) protocolStr = ;
+    else protocolStr = ;
 #endif
 
@@ -874 +874 @@
         return;
 
+
+
+
+
     addresses = hostInfo.addresses();
 
 #if defined(QABSTRACTSOCKET_DEBUG)
-    QString s = "{";
+    QString s = ;
     for (int i = 0; i < addresses.count(); ++i) {
-        if (i != 0) s += ", ";
+        if (i != 0) s += ;
         s += addresses.at(i).toString();
     }
-    s += '}';
+    s += ;
     qDebug("QAbstractSocketPrivate::_q_startConnecting(hostInfo == %s)", s.toLatin1().constData());
 #endif

trunk/src/network/socket/qabstractsocket.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qabstractsocket_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qabstractsocketengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qabstractsocketengine_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qhttpsocketengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -213 +213 @@
 {
     Q_D(QHttpSocketEngine);
-    qint64 bytesRead = 0;
-
-    if (!d->readBuffer.isEmpty()) {
-        // Read as much from the buffer as we can.
-        bytesRead = qMin((qint64)d->readBuffer.size(), maxlen);
-        memcpy(data, d->readBuffer.constData(), bytesRead);
-        data += bytesRead;
-        maxlen -= bytesRead;
-        d->readBuffer = d->readBuffer.mid(bytesRead);
-    }
-
-    qint64 bytesReadFromSocket = d->socket->read(data, maxlen);
+    qint64 bytesRead = d->socket->read(data, maxlen);
 
     if (d->socket->state() == QAbstractSocket::UnconnectedState
@@ -231 +220 @@
     }
 
-    if (bytesReadFromSocket > 0) {
-        // Add to what we read so far.
-        bytesRead += bytesReadFromSocket;
-    } else if (bytesRead == 0 && bytesReadFromSocket == -1) {
+    if (bytesRead == -1) {
         // If nothing has been read so far, and the direct socket read
         // failed, return the socket's error. Otherwise, fall through and
@@ -561 +547 @@
 
     QHttpResponseHeader responseHeader(QString::fromLatin1(d->readBuffer));
-    d->readBuffer.clear();
+    d->readBuffer.clear();
 
     int statusCode = responseHeader.statusCode();

trunk/src/network/socket/qhttpsocketengine_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -163 +163 @@
     QString peerName;
     QTcpSocket *socket;
-    QByteArray readBuffer;
+    QByteArray readBuffer;
     QHttpSocketEngine::HttpState state;
     QAuthenticator authenticator;

trunk/src/network/socket/qlocalserver.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalserver.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalserver_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalserver_tcp.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalserver_unix.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalserver_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalsocket.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalsocket.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalsocket_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalsocket_tcp.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalsocket_unix.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qlocalsocket_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qnativesocketengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -779 +779 @@
         close();
         return -1;
+
+
+
+
+
     }
     return readBytes;

trunk/src/network/socket/qnativesocketengine_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qnativesocketengine_unix.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qnativesocketengine_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -995 +995 @@
     Q_Q(QNativeSocketEngine);
     qint64 ret = 0;
-    // don't send more than 49152 per call to WSASendTo to avoid getting a WSAENOBUFS
+    qint64 bytesToSend = len;
+
     for (;;) {
-        qint64 bytesToSend = qMin<qint64>(49152, len - ret);
         WSABUF buf;
         buf.buf = (char*)data + ret;
@@ -1008 +1008 @@
         ret += qint64(bytesWritten);
 
+
         if (socketRet != SOCKET_ERROR) {
             if (ret == len)
@@ -1013 +1014 @@
             else
                 continue;
-        } else if (WSAGetLastError() == WSAEWOULDBLOCK) {
-            break;
+        } else if ((err = WSAGetLastError()) == WSAEWOULDBLOCK) {
+            break;
+        } else if (err == WSAENOBUFS) {
+            // this function used to not send more than 49152 per call to WSASendTo
+            // to avoid getting a WSAENOBUFS. However this is a performance regression
+            // and we think it only appears with old windows versions. We now handle the
+            // WSAENOBUFS and hope it never appears anyway.
+            // just go on, the next loop run we will try a smaller number
         } else {
-            int err = WSAGetLastError();
             WS_ERROR_DEBUG(err);
             switch (err) {
@@ -1030 +1036 @@
             break;
         }
+
+
+
     }
 
@@ -1191 +1200 @@
     qDebug("QNativeSocketEnginePrivate::nativeClose()");
 #endif
-    linger l = {1, 0};
-    ::setsockopt(socketDescriptor, SOL_SOCKET, SO_DONTLINGER, (char*)&l, sizeof(l));
+    // We were doing a setsockopt here before with SO_DONTLINGER. (However with kind of wrong
+    // usage of parameters, it wants a BOOL but we used a struct and pretended it to be bool).
+    // We don't think setting this option should be done here, if a user wants it she/he can
+     // do it manually with socketDescriptor()/setSocketDescriptor();
     ::closesocket(socketDescriptor);
 }

trunk/src/network/socket/qnet_unix_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qsocks5socketengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qsocks5socketengine_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qtcpserver.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qtcpserver.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qtcpsocket.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qtcpsocket.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qtcpsocket_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qudpsocket.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/network/socket/qudpsocket.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])