Changeset 1622 in ntrip for trunk/BNC

Timestamp:

Feb 19, 2009, 1:41:34 PM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnchelp.html (modified) (1 diff)
• bncnetqueryv0.cpp (modified) (3 diffs)

trunk/BNC/bnchelp.html

@@ -848 +848 @@
 <ul>
 <li>Enter the IP address of the stream providing host.</li>
-<li>Enter the port number of the stream providing host.</li>
+<li>Enter the IP port number of the stream providing host.</li>
 <li>Specify a mountpoint. Recommended is a 4-character reference station ID. Example: FFMJ</li>
 <li>Specify the stream format. Available options are 'RTCM_2', 'RTCM_3', 'RTIGS', and 'ZERO'.</li>

trunk/BNC/bncnetqueryv0.cpp

@@ -5 +5 @@
  * Class:      bncNetQueryV0
  *
- * Purpose:    Blocking Network Requests (NTRIP Version 1)
+ * Purpose:    Direct TCP/IP Network Requests no NTRIP
  *
  * Author:     L. Mervart
@@ -106 +106 @@
   }
 
-  // Send Request
-  // ------------
-  QString uName = QUrl::fromPercentEncoding(_url.userName().toAscii());
-  QString passW = QUrl::fromPercentEncoding(_url.password().toAscii());
-  QByteArray userAndPwd;
-
-  if(!uName.isEmpty() || !passW.isEmpty()) {
-    userAndPwd = "Authorization: Basic " + (uName.toAscii() + ":" +
-    passW.toAscii()).toBase64() + "\r\n";
-  }
-
-  QByteArray reqStr;
-  if (_url.path().indexOf("/") != 0) _url.setPath("/");
-  reqStr = "GET " + _url.path().toAscii() + " HTTP/1.0\r\n"
-           + "User-Agent: NTRIP BNC/" BNCVERSION "\r\n"
-           + userAndPwd + "\r\n";
-
-  // NMEA string to handle VRS stream
-  // --------------------------------
-  if (!gga.isEmpty()) {
-    reqStr += gga + "\r\n";
-  }
-
-  _socket->write(reqStr, reqStr.length());
-
-  if (!_socket->waitForBytesWritten(_timeOut)) {
-    delete _socket;
-    _socket = 0;
-    _status = error;
-    emit newMessage(_url.path().toAscii() + " write timeout", true);
-    return;
-  }
-
   // Read Caster Response
   // --------------------
@@ -153 +120 @@
       QString line = _socket->readLine();
       response.push_back(line);
-      if (line.trimmed().isEmpty()) {
-        break;
-      }
-      if (line.indexOf("200 OK") == -1) { // != weber
-        response.clear();
-        break;
-      }
+      response.clear();
+      break;
     }
-  }
-  if (response.size() > 0) {
-    delete _socket;
-    _socket = 0;
-    _status = error;
-    emit newMessage(_url.path().toAscii() + " wrong caster response\n" +
-                    response.join("\n").toAscii(), true);
   }
 }