Changeset 9741 in ntrip for trunk

Timestamp:

May 31, 2022, 4:38:51 PM (2 years ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/upload/bncuploadcaster.cpp (modified) (4 diffs)

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -105 +105 @@
   }
   if (_outSocket) {
-    disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
     disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
     delete _outSocket;
@@ -144 +143 @@
     emit(newMessage(msg.toLatin1(), true));
 
-    if (_sslIgnoreErrors) {
-      _outSocket->ignoreSslErrors();
-      emit(newMessage("BNC ignores SSL errors as configured", true));
-    }
   }
 }
@@ -219 +214 @@
   _outSocket = new QSslSocket();
   _outSocket->setProxy(QNetworkProxy::NoProxy);
-  _outSocket->setSslConfiguration(BNC_SSL_CONFIG);
+
   connect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
-  connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
+
+  if (_sslIgnoreErrors) {
+    _outSocket->ignoreSslErrors();
+    emit(newMessage("BNC ignores SSL errors during upload as configured", true));
+  } else {
+    _outSocket->setSslConfiguration(BNC_SSL_CONFIG);
+    connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
+  }
 
   if (!_proxy) {
@@ -336 +338 @@
 void bncUploadCaster::slotSslSocketConnectionClosed() {
   disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
-  disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
   emit(newMessage("slotSslSocketConnectionClosed", true));
   if (_outSocket) {