Changeset 1431 in ntrip

Timestamp:

Jan 3, 2009, 11:22:42 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/GPSS/gpssDecoder.cpp (modified) (5 diffs)

trunk/BNC/GPSS/gpssDecoder.cpp

@@ -15 +15 @@
  *
  * -----------------------------------------------------------------------*/
+
+#include <iostream>
 
 #include "gpssDecoder.h"
@@ -69 +71 @@
     // ------------
     if      (char(_buffer[1]) == 0x00) {
-      EPOCHHEADER epochHdr;
-      if (_buffer.length() >= int(2 + sizeof(recordSize) + sizeof(epochHdr))) {
+
+      int reqLength = 2 + sizeof(recordSize) + sizeof(EPOCHHEADER);
+
+      cout << "Obs: " << _buffer.length() << " " << reqLength << endl;
+
+      if (_buffer.length() >= reqLength) {
+        EPOCHHEADER epochHdr;
         memcpy(&epochHdr, _buffer.data() + 2 + sizeof(recordSize), 
                sizeof(epochHdr));
-
-        int reqLength = 2 + sizeof(recordSize) + sizeof(epochHdr) +
-          epochHdr.n_svs * sizeof(t_obsInternal) + sizeof(crc) + 1;
+        
+        reqLength += epochHdr.n_svs * sizeof(t_obsInternal) + sizeof(crc) + 1;
 
         if (_buffer.length() >= reqLength) {
@@ -87 +93 @@
         }
       }
+      _buffer.mid(reqLength);
     }
 
@@ -94 +101 @@
       int reqLength = 2 + sizeof(recordSize) + sizeof(gpsephemeris) +
         sizeof(crc) + 1;
+
+      cout << "Eph: " << _buffer.length() << " " << reqLength << endl;
+
       if (_buffer.length() >= reqLength) {
         gpsephemeris* gpsEph = new gpsephemeris;
@@ -100 +110 @@
         emit newGPSEph(gpsEph);
       }
+      _buffer.mid(reqLength);
     }