Changeset 8501 in ntrip for branches/BNC_2.12/src

Timestamp:

Sep 27, 2018, 10:52:07 AM (6 years ago)

Author:

stuerze

Message:

minor changes to allow requests of user and password detected sourcetables

Location:

branches/BNC_2.12/src

Files:

• bncrinex.cpp (modified) (1 diff)
• bnctabledlg.cpp (modified) (4 diffs)
• bnctabledlg.h (modified) (1 diff)

branches/BNC_2.12/src/bncrinex.cpp

@@ -137 +137 @@
 
   QStringList table;
-  bncTableDlg::getFullTable(_ntripVersion, _mountPoint.host(),
-                            _mountPoint.port(), table, true);
+  bncTableDlg::getFullTable(_ntripVersion, _mountPoint.host(), _mountPoint.port(),
+      _mountPoint.userName(), _mountPoint.password(), table, true);
   QString net;
   QStringListIterator it(table);

branches/BNC_2.12/src/bnctabledlg.cpp

@@ -193 +193 @@
 t_irc bncTableDlg::getFullTable(const QString& ntripVersion,
                                 const QString& casterHost,
-                                int casterPort, QStringList& allLines,
+                                int casterPort,
+                                const QString& casterUser,
+                                const QString& casterPassword,
+                                QStringList& allLines,
                                 bool alwaysRead) {
 
@@ -229 +232 @@
     url.setScheme("http");
   }
-
+  url.setUserName(QUrl::toPercentEncoding(casterUser));
+  url.setPassword(QUrl::toPercentEncoding(casterPassword));
   QByteArray outData;
   query->waitForRequestResult(url, outData);
@@ -260 +264 @@
                     _casterHostComboBox->currentText(),
                     _casterPortLineEdit->text().toInt(),
+                    _casterUserLineEdit->text(),
+                    _casterPasswordLineEdit->text(),
                     _allLines, true) != success ) {
     QMessageBox::warning(0, "BNC", "Cannot retrieve table of data");
@@ -382 +388 @@
       format.replace(" ", "_");
       if (_table->isItemSelected(item)) {
-        url.setPath(item->text());
+        url.setPath("/"+item->text());
         mountPoints->push_back(url.toString() + " " + format + " " + country + " " + latitude
                         + " " + longitude + " " + nmea + " " + ntripVersion);

branches/BNC_2.12/src/bnctabledlg.h

@@ -59 +59 @@
     bncTableDlg(QWidget* parent);
     ~bncTableDlg();
-    static t_irc getFullTable(const QString& ntripVersion, 
+    static t_irc getFullTable(const QString& ntripVersion,
                               const QString& casterHost, int casterPort,
+                              const QString& casterUser, const QString& casterPassword,
                               QStringList& allLines, bool alwaysRead = true);