Changeset 7513 in ntrip
- Timestamp:
- Oct 16, 2015, 12:38:42 PM (9 years ago)
- Location:
- trunk/BNC/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bnchelp.html
r7511 r7513 4566 4566 proxyPort {Proxy port [integer number]} 4567 4567 sslCaCertPath {Full path to SSL certificates [character string]} 4568 ignoreSslErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}4568 sslIgnoreErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]} 4569 4569 4570 4570 General Panel keys: -
trunk/BNC/src/bncmain.cpp
r7512 r7513 94 94 " proxyPort {Proxy port [integer number]}\n" 95 95 " sslCaCertPath {Full path to SSL certificates [character string]}\n" 96 " ignoreSslErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}\n"96 " sslIgnoreErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}\n" 97 97 "\n" 98 98 "General Panel keys:\n" -
trunk/BNC/src/bncnetqueryv2.cpp
r6787 r7513 38 38 39 39 bncSettings settings; 40 _ ignoreSslErrors =41 (Qt::CheckState(settings.value(" ignoreSslErrors").toInt()) == Qt::Checked);40 _sslIgnoreErrors = 41 (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked); 42 42 43 43 if (_secure && !QSslSocket::supportsSsl()) { … … 227 227 BNC_CORE->slotMessage(msg.toAscii(), true); 228 228 229 if (_ ignoreSslErrors) {229 if (_sslIgnoreErrors) { 230 230 _reply->ignoreSslErrors(); 231 231 } -
trunk/BNC/src/bncnetqueryv2.h
r6787 r7513 30 30 bool _firstData; 31 31 bool _secure; 32 bool _ ignoreSslErrors;32 bool _sslIgnoreErrors; 33 33 }; 34 34 -
trunk/BNC/src/bncsettings.cpp
r7488 r7513 78 78 setValue_p("proxyPort", ""); 79 79 setValue_p("sslCaCertPath", ""); 80 setValue_p(" ignoreSslErrors", "0");80 setValue_p("sslIgnoreErrors", "0"); 81 81 // General 82 82 setValue_p("logFile", ""); -
trunk/BNC/src/bncwindow.cpp
r7506 r7513 174 174 175 175 _sslCaCertPathLineEdit = new QLineEdit(settings.value("sslCaCertPath").toString()); 176 _ ignoreSslErrorsCheckBox = new QCheckBox();177 _ ignoreSslErrorsCheckBox->setCheckState(Qt::CheckState(178 settings.value(" ignoreSslErrors").toInt()));176 _sslIgnoreErrorsCheckBox = new QCheckBox(); 177 _sslIgnoreErrorsCheckBox->setCheckState(Qt::CheckState( 178 settings.value("sslIgnoreErrors").toInt())); 179 179 180 180 // General Options … … 646 646 pLayout->addWidget(new QLabel("Default: " + bncSslConfig::defaultPath()), 3,11, 1,20); 647 647 pLayout->addWidget(new QLabel("Ignore SSL authorization errors"), 4, 0); 648 pLayout->addWidget(_ ignoreSslErrorsCheckBox, 4, 1, 1,10);648 pLayout->addWidget(_sslIgnoreErrorsCheckBox, 4, 1, 1,10); 649 649 pLayout->addWidget(new QLabel(""), 5, 1); 650 650 pLayout->setRowStretch(6, 999); … … 1295 1295 _proxyPortLineEdit->setWhatsThis(tr("<p>Enter your proxy server port number in case a proxy is operated in front of BNC.</p>")); 1296 1296 _sslCaCertPathLineEdit->setWhatsThis(tr("<p>Communication with an Ntrip broadcaster over SSL requires the exchange of client and/or server certificates. Specify the path to a directory where you save certificates on your system. Don't try communication via SSL if you are not sure wheter this is supported by the involved Ntrip broadcaster. Note that SSL communication is usually done over port 443.</p>")); 1297 _ ignoreSslErrorsCheckBox->setWhatsThis(tr("<p>SSL communication may involve queries coming from the Ntrip broadcaster. Tick 'Ignore SSL authorization erros' if you don't want to be bothered with this.</p>"));1297 _sslIgnoreErrorsCheckBox->setWhatsThis(tr("<p>SSL communication may involve queries coming from the Ntrip broadcaster. Tick 'Ignore SSL authorization erros' if you don't want to be bothered with this.</p>")); 1298 1298 _outWaitSpinBox->setWhatsThis(tr("<p>When feeding a real-time GNSS network engine waiting for synchronized input epoch by epoch, BNC drops whatever is received later than 'Wait for full obs epoch' seconds. A value of 3 to 5 seconds is recommended, depending on the latency of the incoming streams and the delay acceptable to your real-time GNSS network engine or products.</p>")); 1299 1299 _outFileLineEdit->setWhatsThis(tr("Specify the full path to a file where synchronized observations are saved in plain ASCII format. Beware that the size of this file can rapidly increase depending on the number of incoming streams.")); … … 1501 1501 1502 1502 settings.setValue("sslCaCertPath", _sslCaCertPathLineEdit->text()); 1503 settings.setValue(" ignoreSslErrors", _ignoreSslErrorsCheckBox->checkState());1503 settings.setValue("sslIgnoreErrors", _sslIgnoreErrorsCheckBox->checkState()); 1504 1504 1505 1505 QMessageBox msgBox; … … 1732 1732 settings.setValue("proxyPort", _proxyPortLineEdit->text()); 1733 1733 settings.setValue("sslCaCertPath", _sslCaCertPathLineEdit->text()); 1734 settings.setValue(" ignoreSslErrors", _ignoreSslErrorsCheckBox->checkState());1734 settings.setValue("sslIgnoreErrors", _sslIgnoreErrorsCheckBox->checkState()); 1735 1735 // General 1736 1736 settings.setValue("logFile", _logFileLineEdit->text()); -
trunk/BNC/src/bncwindow.h
r7420 r7513 128 128 QLineEdit* _proxyPortLineEdit; 129 129 QLineEdit* _sslCaCertPathLineEdit; 130 QCheckBox* _ ignoreSslErrorsCheckBox;130 QCheckBox* _sslIgnoreErrorsCheckBox; 131 131 QLineEdit* _outFileLineEdit; 132 132 QLineEdit* _outPortLineEdit;
Note:
See TracChangeset
for help on using the changeset viewer.