Handle KErrBadName when connecting to broadcast address

Symbian uses KErrBadName to indicate a badly formed socket address.
It also returns this error if the address is invalid for the attempted
operation, for example calling connect() with a broadcast address.

Now handle this error explicitly rather than returning unknown error.

Reviewed-by: Markus Goetz

2 files changed, 9 insertions, 0 deletions

diff --git a/src/network/socket/qsymbiansocketengine.cpp b/src/network/socket/qsymbiansocketengine.cpp
index 487f45c..8ded9ac 100644
--- a/src/network/socket/qsymbiansocketengine.cpp
+++ b/src/network/socket/qsymbiansocketengine.cpp
@@ -626,6 +626,10 @@ bool QSymbianSocketEngine::connectToHost(const QHostAddress &addr, quint16 port)
             d->setError(QAbstractSocket::SocketAccessError, d->AccessErrorString);
             d->socketState = QAbstractSocket::UnconnectedState;
             break;
+        case KErrBadName:
+            d->setError(QAbstractSocket::NetworkError, d->InvalidAddressError);
+            d->socketState = QAbstractSocket::UnconnectedState;
+            break;
         case KErrNotSupported:
         case KErrBadDescriptor:
         default:
@@ -1306,6 +1310,9 @@ void QSymbianSocketEnginePrivate::setError(QAbstractSocket::SocketError error, E
     case InvalidProxyTypeString:
         socketErrorString = QSymbianSocketEngine::tr("The proxy type is invalid for this operation");
         break;
+    case InvalidAddressError:
+        socketErrorString = QSymbianSocketEngine::tr("The address is invalid for this operation");
+        break;
     case UnknownSocketErrorString:
         socketErrorString = QSymbianSocketEngine::tr("Unknown error");
         break;
diff --git a/src/network/socket/qsymbiansocketengine_p.h b/src/network/socket/qsymbiansocketengine_p.h
index 8a0b8df..fb64dba 100644
--- a/src/network/socket/qsymbiansocketengine_p.h
+++ b/src/network/socket/qsymbiansocketengine_p.h
@@ -233,6 +233,8 @@ public:
         PortInuseErrorString,
         NotSocketErrorString,
         InvalidProxyTypeString,
+        //symbian specific
+        InvalidAddressError,
 
         UnknownSocketErrorString = -1
     };