Changeset 3353 in ntrip

Timestamp:

Aug 22, 2011, 3:42:21 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncnetqueryv2.cpp (modified) (2 diffs)
• bncnetqueryv2.h (modified) (1 diff)

trunk/BNC/bncnetqueryv2.cpp

@@ -39 +39 @@
     stop();
   }
+  _ignoreSslErrors = false;
 }
 
@@ -198 +199 @@
 void bncNetQueryV2::slotSslErrors(QList<QSslError> errors) {
 
-  QString msg = "SSL Errors";
-  QListIterator<QSslError> it(errors);
-  while (it.hasNext()) {
-    const QSslError& err = it.next();
-    msg += "\n" + err.errorString();
-  }
-
+  QString msg = "SSL Error\n";
   QSslCertificate cert = _reply->sslConfiguration().peerCertificate();
   if (!cert.isNull()) {
-    QString issuer = QString("\nIssued by:\n%1\n%2\n")
+    msg = QString("Server Certificate Issued by:\n"
+                  "%1\n%2\nCannot be verified\n")
       .arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName))
       .arg(cert.issuerInfo(QSslCertificate::Organization));
-    msg += issuer;
+  }
+  else {
+    QListIterator<QSslError> it(errors);
+    while (it.hasNext()) {
+      const QSslError& err = it.next();
+      msg += "\n" + err.errorString();
+    }
   }
 
   ((bncApp*)qApp)->slotMessage(msg.toAscii(), true);
 
-  _reply->ignoreSslErrors();
-}
+  if (_ignoreSslErrors) {
+    _reply->ignoreSslErrors();
+  }
+  else {
+    stop();
+  }
+}

trunk/BNC/bncnetqueryv2.h

@@ -29 +29 @@
   bool                   _firstData;
   bool                   _secure;
+  bool                   _ignoreSslErrors;
 };