Changeset 9723 in ntrip

Timestamp:

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

Author:

stuerze

Message:

minor changes to handle SSL errors

File:

• trunk/BNC/src/bncnetqueryv2.cpp (modified) (6 diffs)

trunk/BNC/src/bncnetqueryv2.cpp

@@ -74 +74 @@
   if (_reply && _reply->error() != QNetworkReply::NoError) {
     _status = error;
+    if (!_reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray().isEmpty()) {
     emit newMessage(_url.path().toLatin1().replace(0,1,"")  +
                     ": NetQueryV2: server replied: " +
                     _reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray(),
                     true);
+    } else {
+      emit newMessage(_url.path().toLatin1().replace(0,1,"")  +
+                         ": NetQueryV2: server replied: " +
+                         _reply->errorString().toLatin1(),
+                         true);
+    }
   }
   else {
@@ -189 +196 @@
     _eventLoop->exec();
   }
+  if (!_reply) {
+    return;
+  }
 
   // Check NTRIPv2 error code
@@ -196 +206 @@
   }
 
+
   // Append Data
   // -----------
@@ -207 +218 @@
 void bncNetQueryV2::slotSslErrors(QList<QSslError> errors) {
 
-  QString msg = "SSL Error\n";
+  QString msg = "SSL Error: ";
   QSslCertificate cert = _reply->sslConfiguration().peerCertificate();
   if (!cert.isNull() &&
@@ -224 +235 @@
   }
 
-  QListIterator<QSslError> it(errors); std::cout << "errors.size(): "  << errors.size() << std::endl;
+  QListIterator<QSslError> it(errors);
   while (it.hasNext()) {
     const QSslError& err = it.next();
-    msg += "\n" + err.errorString();
+    msg += err.errorString();
   }
   BNC_CORE->slotMessage(msg.toLatin1(), true);
@@ -233 +244 @@
   if (_sslIgnoreErrors) {
     _reply->ignoreSslErrors();
+    BNC_CORE->slotMessage("BNC ignores SSL errors as configured", true);
   }
   else {
     stop();
   }
-}
+  return;
+}