Changeset 6787 in ntrip

Timestamp:

Apr 20, 2015, 4:13:12 PM (9 years ago)

Author:

stuerze

Message:

add keep-alive request to send gga message in ntrip version 1 mode without interruption

Location:

trunk/BNC/src

Files:

• bncnetquery.h (modified) (1 diff)
• bncnetqueryrtp.cpp (modified) (1 diff)
• bncnetqueryrtp.h (modified) (1 diff)
• bncnetquerys.cpp (modified) (1 diff)
• bncnetquerys.h (modified) (1 diff)
• bncnetqueryudp.cpp (modified) (1 diff)
• bncnetqueryudp.h (modified) (1 diff)
• bncnetqueryudp0.cpp (modified) (1 diff)
• bncnetqueryudp0.h (modified) (1 diff)
• bncnetqueryv0.cpp (modified) (1 diff)
• bncnetqueryv0.h (modified) (1 diff)
• bncnetqueryv1.cpp (modified) (1 diff)
• bncnetqueryv1.h (modified) (1 diff)
• bncnetqueryv2.cpp (modified) (1 diff)
• bncnetqueryv2.h (modified) (1 diff)

trunk/BNC/src/bncnetquery.h

@@ -21 +21 @@
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData) = 0;
   virtual void startRequest(const QUrl& url, const QByteArray& gga) = 0;
+  virtual void keepAliveRequest(const QUrl& url, const QByteArray& gga) = 0;
   virtual void waitForReadyRead(QByteArray& outData) = 0;
   
   void sendNMEA(const QByteArray& gga) {
-    stop();
-    startRequest(_url, gga);
+    keepAliveRequest(_url, gga);
   }
 

trunk/BNC/src/bncnetqueryrtp.cpp

@@ -237 +237 @@
 }
 
+void bncNetQueryRtp::keepAliveRequest(const QUrl& /* url */, const QByteArray& /* gga */) {
+}

trunk/BNC/src/bncnetqueryrtp.h

@@ -13 +13 @@
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
+  virtual void keepAliveRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
 

trunk/BNC/src/bncnetquerys.cpp

@@ -196 +196 @@
 }
 
+void bncNetQueryS::keepAliveRequest(const QUrl& /* url */, const QByteArray& /* gga */) {
+}

trunk/BNC/src/bncnetquerys.h

@@ -13 +13 @@
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
+  virtual void keepAliveRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
 

trunk/BNC/src/bncnetqueryudp.cpp

@@ -177 +177 @@
 }
 
+void bncNetQueryUdp::keepAliveRequest(const QUrl& /* url */ , const QByteArray& /* gga */) {
+}

trunk/BNC/src/bncnetqueryudp.h

@@ -13 +13 @@
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
+  virtual void keepAliveRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
 

trunk/BNC/src/bncnetqueryudp0.cpp

@@ -75 +75 @@
 }
 
+void bncNetQueryUdp0::keepAliveRequest(const QUrl& /* url */, const QByteArray& /* gga */) {
+}

trunk/BNC/src/bncnetqueryudp0.h

@@ -13 +13 @@
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
+  virtual void keepAliveRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
  private:

trunk/BNC/src/bncnetqueryv0.cpp

@@ -128 +128 @@
 }
 
+void bncNetQueryV0::keepAliveRequest(const QUrl& /* url */, const QByteArray& /* gga */) {
+}

trunk/BNC/src/bncnetqueryv0.h

@@ -12 +12 @@
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
+  virtual void keepAliveRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
 

trunk/BNC/src/bncnetqueryv1.cpp

@@ -105 +105 @@
 }
 
+
+// Already connected to Caster, send another Request
+////////////////////////////////////////////////////////////////////////////
+void bncNetQueryV1::keepAliveRequest(const QUrl& url, const QByteArray& gga) {
+
+  _status = running;
+
+  // Default scheme and path
+  // -----------------------
+  _url = url;
+  if (_url.scheme().isEmpty()) {
+    _url.setScheme("http");
+  }
+  if (_url.path().isEmpty()) {
+    _url.setPath("/");
+  }
+
+  // Connect the Socket
+  // ------------------
+  bncSettings settings;
+  QString proxyHost = settings.value("proxyHost").toString();
+  int     proxyPort = settings.value("proxyPort").toInt();
+
+  if ( proxyHost.isEmpty() ) {
+    _socket->connectToHost(_url.host(), _url.port());
+  }
+  else {
+    _socket->connectToHost(proxyHost, proxyPort);
+  }
+  if (!_socket->waitForConnected(_timeOut)) {
+    delete _socket;
+    _socket = 0;
+    _status = error;
+    return;
+  }
+
+  // Send Request
+  // ------------
+   QByteArray reqStr;
+
+   // 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().replace(0,1,"")
+                     + ": Write timeout", true);
+     return;
+   }
+
+}
+
 // Connect to Caster, send the Request
 ////////////////////////////////////////////////////////////////////////////

trunk/BNC/src/bncnetqueryv1.h

@@ -12 +12 @@
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
+  virtual void keepAliveRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
 

trunk/BNC/src/bncnetqueryv2.cpp

@@ -91 +91 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV2::startRequest(const QUrl& url, const QByteArray& gga) {
+  startRequestPrivate(url, gga, false);
+}
+
+// Start request, block till the next read
+////////////////////////////////////////////////////////////////////////////
+void bncNetQueryV2::keepAliveRequest(const QUrl& url, const QByteArray& gga) {
   startRequestPrivate(url, gga, false);
 }

trunk/BNC/src/bncnetqueryv2.h

@@ -14 +14 @@
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData);
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
+  virtual void keepAliveRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);