Changeset 9724 in ntrip for trunk

Timestamp:

May 19, 2022, 1:13:04 PM (2 years ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/upload/bncuploadcaster.cpp (modified) (1 diff)

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -123 +123 @@
  ////////////////////////////////////////////////////////////////////////////
  void bncUploadCaster::slotSslErrors(QList<QSslError> errors) {
-
- QString msg = "SSL Error\n";
- QSslCertificate cert = _outSocket->sslConfiguration().peerCertificate();
- if (!cert.isNull() &&
-     cert.issuerInfo(QSslCertificate::OrganizationalUnitName).count() &&
-     cert.issuerInfo(QSslCertificate::Organization).count()) {
-
-   msg += QString("Server Certificate Issued by:\n"
-                  "%1\n%2\nCannot be verified\n")
-#if QT_VERSION >= 0x050000
-          .arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).at(0))
-          .arg(cert.issuerInfo(QSslCertificate::Organization).at(0));
-#else
-          .arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName))
-          .arg(cert.issuerInfo(QSslCertificate::Organization));
-#endif
-  }
-
-  QListIterator<QSslError> it(errors);
-  while (it.hasNext()) {
-    const QSslError& err = it.next();
-    msg += "\n" + err.errorString();
-  }
-  emit(newMessage(msg.toLatin1(), true));
-
-  if (_sslIgnoreErrors) { cout << "_sslIgnoreErrors" << endl;
-    if (_outSocket) {cout << "no Socket" << endl;
-      _outSocket->ignoreSslErrors();
-    } else {
-      cout << "no Socket" << endl;
-    }
-  } else {
-    delete _outSocket;
-    _outSocket = 0;
-  }
+   QString msg = "SSL Error: ";
+   QSslCertificate cert = _outSocket->sslConfiguration().peerCertificate();
+   if (!cert.isNull() &&
+       cert.issuerInfo(QSslCertificate::OrganizationalUnitName).count() &&
+       cert.issuerInfo(QSslCertificate::Organization).count()) {
+
+     msg += QString("Server Certificate Issued by:\n"
+                    "%1\n%2\nCannot be verified\n")
+ #if QT_VERSION >= 0x050000
+            .arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).at(0))
+            .arg(cert.issuerInfo(QSslCertificate::Organization).at(0));
+ #else
+            .arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName))
+            .arg(cert.issuerInfo(QSslCertificate::Organization));
+ #endif
+   }
+
+   QListIterator<QSslError> it(errors);
+   while (it.hasNext()) {
+     const QSslError& err = it.next();
+     msg += err.errorString();
+   }
+   emit(newMessage(msg.toLatin1(), true));
+
+   if (_sslIgnoreErrors) {cout << "_sslIgnoreErrors" << endl;
+     if (_outSocket) {
+       _outSocket->ignoreSslErrors();
+       emit(newMessage("BNC ignores SSL errors as configured", true));
+     } else {
+       cout << "no Socket" << endl;
+     }
+   }
+   else {
+     delete _outSocket;
+     _outSocket = 0;
+   }
+   return;
 }