Changeset 1438 in ntrip

Timestamp:

Jan 3, 2009, 1:15:04 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• GPSS/gpssDecoder.cpp (modified) (6 diffs)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/GPSS/gpssDecoder.cpp

@@ -80 +80 @@
   _buffer += QByteArray(data, dataLen);
 
+  bool obsFound = false;
+  bool ephFound = false;
   int iBeg;
   while ( (iBeg = _buffer.indexOf(0x02)) != -1) {
@@ -89 +91 @@
     // Observations
     // ------------
-    if      (char(_buffer[1]) == 0x00) {
+    if      (_buffer.length() > 0 && char(_buffer[1]) == 0x00) {
 
       int reqLength = 2 + sizeof(recordSize) + sizeof(EPOCHHEADER);
@@ -109 +111 @@
           if (crc == crcCal) {
             for (int is = 0; is < epochHdr.n_svs; is++) {
+              obsFound = true;
               t_obs* obs = new t_obs();
               memcpy(&(obs->_o), _buffer.data() + 2 + sizeof(recordSize) + 
@@ -123 +126 @@
     // Ephemeris
     // ---------
-    else if (char(_buffer[1]) == 0x01) {
+    else if (_buffer.length() > 0 && char(_buffer[1]) == 0x01) {
       int reqLength = 2 + sizeof(recordSize) + sizeof(gpsephemeris) +
-        sizeof(crc) + 1;
+                      sizeof(crc) + 1;
 
       if (_buffer.length() >= reqLength) {
@@ -134 +137 @@
 
         if (crc == crcCal) {
+          ephFound = true;
           gpsephemeris* gpsEph = new gpsephemeris;
           memcpy(gpsEph, _buffer.data() + 2 + sizeof(recordSize), 
@@ -148 +152 @@
   }
 
-  return success;
+  if (obsFound || ephFound) {
+    return success;
+  }
+  else {
+    return failure;
+  }
 }

trunk/BNC/bncwindow.cpp

@@ -62 +62 @@
   static const QStringList labels = QString("account, Streams:     broadcaster:port/mountpoint,decoder,lat,long,nmea,ntrip,bytes").split(",");
 
-  setMinimumSize(80*ww, 65*ww);
+  setMinimumSize(85*ww, 65*ww);
 
   setWindowTitle(tr("BKG Ntrip Client (BNC) Version 1.7"));