spcket error handling

using local 8bit encoding instead utf8 in filename (also this comment much longer than codechanges ...)

3 files changed, 69 insertions, 4 deletions

diff --git a/client/Config.cpp b/client/Config.cpp
index f7b30cd..4c31039 100755
--- a/client/Config.cpp
+++ b/client/Config.cpp
@@ -23,7 +23,7 @@ Config::Config(): QObject(), StaticProxySpeedLow(50)
 	configValid = false;
 	
 	Logger::Info("Parsing config.cfg to determine initial configuration\n");
-        ifstream configFile(QString(this_app->applicationDirPath()+ "/config.cfg").toUtf8().data(), std::ios::in);
+        ifstream configFile(QString(this_app->applicationDirPath()+ "/config.cfg").toLocal8Bit().data(), std::ios::in);
 	if (!configFile)
 	{
 		Logger::Fatal("Can't open file: config.cfg\n");
diff --git a/client/SslClient.cpp b/client/SslClient.cpp
index 86449f4..c122f36 100644
--- a/client/SslClient.cpp
+++ b/client/SslClient.cpp
@@ -143,9 +143,73 @@ void SslClient::DataRecieved()
 	emit ReplyRecieved(type, data);
 }
 
-void SslClient::Error(QAbstractSocket::SocketError socketError)
+void SslClient::Error(QAbstractSocket::SocketError e)
 {
-	Logger::Fatal("Socket error!");
+    QString desc;
+    switch(e)
+    {
+    case QAbstractSocket::ConnectionRefusedError:
+        desc = "ConnectionRefusedError";
+        break;
+    case QAbstractSocket::RemoteHostClosedError:
+        desc = "RemoteHostClosedError";
+        break;
+    case QAbstractSocket::HostNotFoundError:
+        desc = "HostNotFoundError";
+        break;
+    case QAbstractSocket::SocketAccessError:
+        desc = "SocketAccessError";
+        break;
+    case QAbstractSocket::SocketResourceError:
+        desc = "SocketResourceError";
+        break;
+    case QAbstractSocket::SocketTimeoutError:
+        desc = "SocketTimeoutError";
+        break;
+    case QAbstractSocket::DatagramTooLargeError:
+        desc = "DatagramTooLargeError";
+        break;
+    case QAbstractSocket::NetworkError:
+        desc = "NetworkError";
+        break;
+    case QAbstractSocket::AddressInUseError:
+        desc = "AddressInUseError";
+        break;
+    case QAbstractSocket::SocketAddressNotAvailableError:
+        desc = "SocketAddressNotAvailableError";
+        break;
+    case QAbstractSocket::UnsupportedSocketOperationError:
+        desc = "UnsupportedSocketOperationError";
+        break;
+    case QAbstractSocket::ProxyAuthenticationRequiredError:
+        desc = "ProxyAuthenticationRequiredError";
+        break;
+    case QAbstractSocket::SslHandshakeFailedError:
+        desc = "SslHandshakeFailedError";
+        break;
+    case QAbstractSocket::UnfinishedSocketOperationError:
+        desc = "UnfinishedSocketOperationError";
+        break;
+    case QAbstractSocket::ProxyConnectionRefusedError:
+        desc = "ProxyConnectionRefusedError";
+        break;
+    case QAbstractSocket::ProxyConnectionClosedError:
+        desc = "ProxyConnectionClosedError";
+        break;
+    case QAbstractSocket::ProxyConnectionTimeoutError:
+        desc = "ProxyConnectionTimeoutError";
+        break;
+    case QAbstractSocket::ProxyNotFoundError:
+        desc = "ProxyNotFoundError";
+        break;
+    case QAbstractSocket::ProxyProtocolError:
+        desc = "ProxyProtocolError";
+        break;
+    default:
+        desc = "Unknown error";
+
+    }
+    Logger::Fatal(QString("Socket error! (" + desc + ")").toStdString());
 }
 
 void SslClient::PeerVerifyError(const QSslError &error)
@@ -176,4 +240,4 @@ void SslClient::SslErrors(const QList<QSslError> &errors)
 			Logger::Fatal("%s", errors[i].errorString().toStdString().c_str());
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/server/proxy_ui_server.workspace b/server/proxy_ui_server.workspace
index f3e41a2..fef20c5 100644
--- a/server/proxy_ui_server.workspace
+++ b/server/proxy_ui_server.workspace
@@ -19,6 +19,7 @@
   
   
   
+  
   ]]>
   </Environment>
 </CodeLite_Workspace>