Changeset 9725 in ntrip for trunk

Timestamp:

May 19, 2022, 2:09:16 PM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bncnetqueryv2.cpp (modified) (1 diff)
• upload/bncuploadcaster.cpp (modified) (3 diffs)
• upload/bncuploadcaster.h (modified) (1 diff)

trunk/BNC/src/bncnetqueryv2.cpp

@@ -206 +206 @@
   }
 
-
   // Append Data
   // -----------

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -119 +119 @@
   emit newMessage("slotProxyAuthenticationRequired", true);
 }
-
-// TSL/SSL
- ////////////////////////////////////////////////////////////////////////////
- void bncUploadCaster::slotSslErrors(QList<QSslError> errors) {
-   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;
-}
-
 
 // Endless Loop
@@ -237 +194 @@
 
   _outSocket = new QSslSocket();
-
+  _outSocket->setProxy(QNetworkProxy::NoProxy);
   _outSocket->setSslConfiguration(sslConfig);
-  _outSocket->setProxy(QNetworkProxy::NoProxy);
+  if (_sslIgnoreErrors) {
+    _outSocket->ignoreSslErrors();
+    emit(newMessage("BNC ignores SSL errors as configured", true));
+  }
 
   if (_proxy) {
@@ -300 +260 @@
   }
 
-  connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
-
   if (_ntripVersion == "1") {
     msg = "SOURCE " + _password.toLatin1() + " /" + _mountpoint.toLatin1()

trunk/BNC/src/upload/bncuploadcaster.h

@@ -36 +36 @@
  private slots:
   void slotProxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*);
-  void slotSslErrors(QList<QSslError>);
 
  private: