Changeset 1761 in ntrip for trunk

Timestamp:

Mar 9, 2009, 1:01:29 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncnetqueryudp.cpp (modified) (6 diffs)
• bncnetqueryudp.h (modified) (1 diff)
• todo.txt (modified) (1 diff)

trunk/BNC/bncnetqueryudp.cpp ¶

@@ -17 +17 @@
 #include <iostream>
 #include <iomanip>
+#include <time.h>
 
 #include "bncnetqueryudp.h"
@@ -24 +25 @@
 
 #define BNCVERSION "1.7"
+#define TIME_RESOLUTION 125
 
 // Constructor
@@ -32 +34 @@
   _eventLoop = new QEventLoop(this);
 
-  _keepAlive = new char[12];
-  _keepAlive[0]  = 128;
-  _keepAlive[1]  =  96;
-  for (int jj = 2; jj <= 7; jj++) {
-    _keepAlive[jj] = 0;
+  _keepAlive[ 0] = 128;
+  _keepAlive[ 1] =  96;
+  for (int ii = 2; ii <=11; ii++) {
+    _keepAlive[ii] = 0;
   }
-  int session = rand();
-  _keepAlive[8]  = (session >> 24) & 0xFF;
-  _keepAlive[9]  = (session >> 16) & 0xFF;
-  _keepAlive[10] = (session >>  8) & 0xFF;
-  _keepAlive[11] = (session)       & 0xFF;
 }
 
@@ -50 +46 @@
   delete _eventLoop;
   delete _udpSocket;
-  delete _keepAlive;
 }
 
@@ -64 +59 @@
 void bncNetQueryUdp::slotKeepAlive() {
   if (_udpSocket) {
-    cout << "slotKeepAlive" << endl;
     _udpSocket->writeDatagram(_keepAlive, 12, _address, _port);
   }
-  QTimer::singleShot(30000, this, SLOT(slotKeepAlive()));
+  QTimer::singleShot(15000, this, SLOT(slotKeepAlive()));
 }
 
@@ -156 +150 @@
 
     _udpSocket->writeDatagram(rtpbuffer, 12 + reqStr.size(), _address, _port);
-    QTimer::singleShot(30000, this, SLOT(slotKeepAlive()));
+
+    // Wait for Reply, read Session Number
+    // -----------------------------------
+    QByteArray repl;
+    waitForReadyRead(repl);
+
+    QTextStream in(repl);
+    QString line = in.readLine();
+    while (!line.isEmpty()) {
+      if (line.indexOf("Session:") == 0) {
+        _session = line.mid(9).toInt();
+        _keepAlive[ 8] = (_session >> 24) & 0xFF;
+        _keepAlive[ 9] = (_session >> 16) & 0xFF;
+        _keepAlive[10] = (_session >>  8) & 0xFF;
+        _keepAlive[11] = (_session)       & 0xFF;
+        break;
+      }
+      line = in.readLine();
+    }
+
+    QTimer::singleShot(15000, this, SLOT(slotKeepAlive()));
   }
 }

trunk/BNC/bncnetqueryudp.h ¶

@@ -23 +23 @@
   QHostAddress _address;
   int          _port;
-  char*        _keepAlive;
+  char         _keepAlive[12];
+  int          _session;
 };
 

trunk/BNC/todo.txt ¶

@@ -6 +6 @@
 BNC
 =========================
-(1) NTRIP "U": 
-Stopps after ~60sec with message "Data timeout, reconnecting"
-Could it be that a kind of keep-alife packet is necessary?
-
-(2) Added "bncnetquerys" for stream input from serial port
+(1) Added "bncnetquerys" for stream input from serial port
 Please have a look.
 
-(3) "Append" files doesn't work with "ZERO" decoder.
+(2) "Append" files doesn't work with "ZERO" decoder.
 
 (3) GW: Keep an eye on www.igs-ip.net/PENC0.