Changeset 9738 in ntrip


Ignore:
Timestamp:
May 31, 2022, 10:54:53 AM (4 weeks ago)
Author:
stuerze
Message:

minor changes

Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccore.h

    r9211 r9738  
    3030#include "bncrawfile.h"
    3131#include "bncephuser.h"
     32#include "bncsslconfig.h"
    3233
    3334class bncComb;
     
    5657  QDateTime         dateAndTimeGPS() const;
    5758  void              setDateAndTimeGPS(QDateTime dateTime);
     59  void              setSslConfiguration(const bncSslConfig& sslConfig) {_sslConfig = sslConfig;}
     60  QString           confFileName() const {return _confFileName;}
    5861  void              setConfFileName(const QString& confFileName);
    59   QString           confFileName() const {return _confFileName;}
     62  bncSslConfig      sslConfiguration() const {return _sslConfig;}
     63
    6064  void              writeRawData(const QByteArray& data, const QByteArray& staID,
    6165                                 const QByteArray& format);
     
    146150  QList<QTcpSocket*>*    _socketsCorr;
    147151  bncCaster*             _caster;
     152  bncSslConfig           _sslConfig;
    148153  QString                _confFileName;
    149154  QDate                  _fileDate;
  • trunk/BNC/src/bncmain.cpp

    r9676 r9738  
    8181  bool       displaySet   = false;
    8282#endif
    83   QByteArray rawFileName;
    84   QString    confFileName;
     83  QByteArray   rawFileName;
     84  QString      confFileName;
     85  bncSslConfig sslConfig;
    8586
    8687  QByteArray printHelp =
     
    393394  BNC_CORE->setConfFileName( confFileName );
    394395
     396  BNC_CORE->setSslConfiguration( sslConfig );
     397
    395398  bncSettings settings;
    396399
  • trunk/BNC/src/bncnetqueryv2.cpp

    r9725 r9738  
    135135  // ---------------
    136136  QNetworkRequest request;
    137   bncSslConfig sslConfig;
    138   request.setSslConfiguration(sslConfig);
     137  request.setSslConfiguration(BNC_CORE->sslConfiguration());
    139138  request.setUrl(_url);
    140139  request.setRawHeader("Host"         , _url.host().toLatin1());
     
    239238    msg += err.errorString();
    240239  }
    241   BNC_CORE->slotMessage(msg.toLatin1(), true);
    242240
    243241  if (_sslIgnoreErrors) {
     
    246244  }
    247245  else {
     246    BNC_CORE->slotMessage(msg.toLatin1(), true);
    248247    stop();
    249248  }
  • trunk/BNC/src/upload/bncuploadcaster.cpp

    r9737 r9738  
    6464
    6565  _sslIgnoreErrors = (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked);
    66 
    67   qRegisterMetaType<QList<QSslError> >("QList<QSslError>");
    6866
    6967  _proxyOutHost = settings.value("proxyHost").toString();
     
    196194void bncUploadCaster::open() {
    197195  const int timeOut = 5000;  // 5 seconds
    198   bncSslConfig sslConfig;
    199196  QByteArray msg;
    200197
     
    222219
    223220  _outSocket = new QSslSocket();
     221  _outSocket->setSslConfiguration(BNC_CORE->sslConfiguration());
    224222  _outSocket->setProxy(QNetworkProxy::NoProxy);
    225   _outSocket->setSslConfiguration(sslConfig);
     223
    226224  connect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
    227225  connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
     
    339337
    340338void bncUploadCaster::slotSslSocketConnectionClosed() {
    341   disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
    342   disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
     339//  disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
     340//  disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
    343341  emit(newMessage("slotSslSocketConnectionClosed", true));
    344342  if (_outSocket) {
Note: See TracChangeset for help on using the changeset viewer.