Changeset 1430 in ntrip

Timestamp:

Jan 3, 2009, 11:15:03 AM (15 years ago)

Author:

mervart

Message:

* empty log message *

File:

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

trunk/BNC/GPSS/gpssDecoder.cpp

@@ -63 +63 @@
     _buffer = _buffer.mid(iBeg);
 
-    // Record Size
-    // -----------
     int recordSize;
-    if (_buffer.length() >= int(2 + sizeof(recordSize)) &&
-        ( char(_buffer[1]) == 0x00 || char(_buffer[1]) == 0x01) ) {
-      memcpy(&recordSize, _buffer.data()+2, sizeof(recordSize)); 
-    }
-    else {
-      break;
-    }
+    int crc;
    
     // Observations
@@ -82 +74 @@
                sizeof(epochHdr));
 
-        if (_buffer.length() >= int(2 + sizeof(recordSize) + sizeof(epochHdr) +
-                                epochHdr.n_svs * sizeof(t_obsInternal))) {
-          for (int is = 1; is <= epochHdr.n_svs; is++) {
+        int reqLength = 2 + sizeof(recordSize) + sizeof(epochHdr) +
+          epochHdr.n_svs * sizeof(t_obsInternal) + sizeof(crc) + 1;
+
+        if (_buffer.length() >= reqLength) {
+          for (int is = 0; is < epochHdr.n_svs; is++) {
             t_obs* obs = new t_obs();
-            memcpy(&(obs->_o), _buffer.data(), sizeof(t_obsInternal));
+            memcpy(&(obs->_o), _buffer.data() + 2 + sizeof(recordSize) + 
+                               sizeof(epochHdr) + is * sizeof(t_obsInternal), 
+                   sizeof(t_obsInternal));
             _obsList.push_back(obs);
           }
@@ -96 +92 @@
     // ---------
     else if (char(_buffer[1]) == 0x01) {
-      if (_buffer.length() >= int(2+sizeof(recordSize)+ sizeof(gpsephemeris))){
+      int reqLength = 2 + sizeof(recordSize) + sizeof(gpsephemeris) +
+        sizeof(crc) + 1;
+      if (_buffer.length() >= reqLength) {
         gpsephemeris* gpsEph = new gpsephemeris;
-        memcpy(gpsEph, _buffer.data(), sizeof(gpsephemeris));
+        memcpy(gpsEph, _buffer.data() + 2 + sizeof(recordSize) + 
+                       sizeof(gpsephemeris), sizeof(gpsephemeris));
         emit newGPSEph(gpsEph);
       }