Changeset 9738 in ntrip for trunk/BNC

Timestamp:

May 31, 2022, 10:54:53 AM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bnccore.h (modified) (3 diffs)
• bncmain.cpp (modified) (2 diffs)
• bncnetqueryv2.cpp (modified) (3 diffs)
• upload/bncuploadcaster.cpp (modified) (4 diffs)

trunk/BNC/src/bnccore.h

@@ -30 +30 @@
 #include "bncrawfile.h"
 #include "bncephuser.h"
+#include "bncsslconfig.h"
 
 class bncComb;
@@ -56 +57 @@
   QDateTime         dateAndTimeGPS() const;
   void              setDateAndTimeGPS(QDateTime dateTime);
+  void              setSslConfiguration(const bncSslConfig& sslConfig) {_sslConfig = sslConfig;}
+  QString           confFileName() const {return _confFileName;}
   void              setConfFileName(const QString& confFileName);
-  QString           confFileName() const {return _confFileName;}
+  bncSslConfig      sslConfiguration() const {return _sslConfig;}
+
   void              writeRawData(const QByteArray& data, const QByteArray& staID,
                                  const QByteArray& format);
@@ -146 +150 @@
   QList<QTcpSocket*>*    _socketsCorr;
   bncCaster*             _caster;
+  bncSslConfig           _sslConfig;
   QString                _confFileName;
   QDate                  _fileDate;

trunk/BNC/src/bncmain.cpp

@@ -81 +81 @@
   bool       displaySet   = false;
 #endif
-  QByteArray rawFileName;
-  QString    confFileName;
+  QByteArray   rawFileName;
+  QString      confFileName;
+  bncSslConfig sslConfig;
 
   QByteArray printHelp =
@@ -393 +394 @@
   BNC_CORE->setConfFileName( confFileName );
 
+  BNC_CORE->setSslConfiguration( sslConfig );
+
   bncSettings settings;
 

trunk/BNC/src/bncnetqueryv2.cpp

@@ -135 +135 @@
   // ---------------
   QNetworkRequest request;
-  bncSslConfig sslConfig;
-  request.setSslConfiguration(sslConfig);
+  request.setSslConfiguration(BNC_CORE->sslConfiguration());
   request.setUrl(_url);
   request.setRawHeader("Host"         , _url.host().toLatin1());
@@ -239 +238 @@
     msg += err.errorString();
   }
-  BNC_CORE->slotMessage(msg.toLatin1(), true);
 
   if (_sslIgnoreErrors) {
@@ -246 +244 @@
   }
   else {
+    BNC_CORE->slotMessage(msg.toLatin1(), true);
     stop();
   }

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -64 +64 @@
 
   _sslIgnoreErrors = (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked);
-
-  qRegisterMetaType<QList<QSslError> >("QList<QSslError>");
 
   _proxyOutHost = settings.value("proxyHost").toString();
@@ -196 +194 @@
 void bncUploadCaster::open() {
   const int timeOut = 5000;  // 5 seconds
-  bncSslConfig sslConfig;
   QByteArray msg;
 
@@ -222 +219 @@
 
   _outSocket = new QSslSocket();
+  _outSocket->setSslConfiguration(BNC_CORE->sslConfiguration());
   _outSocket->setProxy(QNetworkProxy::NoProxy);
-  _outSocket->setSslConfiguration(sslConfig);
+
   connect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
   connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
@@ -339 +337 @@
 
 void bncUploadCaster::slotSslSocketConnectionClosed() {
-  disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
-  disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
+//  disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
+//  disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
   emit(newMessage("slotSslSocketConnectionClosed", true));
   if (_outSocket) {