Changeset 7486 in ntrip for trunk/BNC

Timestamp:

Oct 6, 2015, 4:07:16 PM (9 years ago)

Author:

stuerze

Message:

minor addition to prevent a crash after failed decoding

File:

• trunk/BNC/src/bncgetthread.cpp (modified) (21 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -35 +35 @@
  * Created:    24-Dec-2005
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -85 +85 @@
 // Constructor 2
 ////////////////////////////////////////////////////////////////////////////
-bncGetThread::bncGetThread(const QUrl& mountPoint, 
+bncGetThread::bncGetThread(const QUrl& mountPoint,
                            const QByteArray& format,
                            const QByteArray& latitude,
                            const QByteArray& longitude,
-                           const QByteArray& nmea, 
+                           const QByteArray& nmea,
                            const QByteArray& ntripVersion) {
   _rawFile      = 0;
@@ -119 +119 @@
   setTerminationEnabled(true);
 
-  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
+  connect(this, SIGNAL(newMessage(QByteArray,bool)),
           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
 
@@ -172 +172 @@
     QString hlp = settings.value("serialBaudRate").toString();
     if      (hlp == "110") {
-      _serialPort->setBaudRate(BAUD110);   
+      _serialPort->setBaudRate(BAUD110);
     }
     else if (hlp == "300") {
-      _serialPort->setBaudRate(BAUD300);   
+      _serialPort->setBaudRate(BAUD300);
     }
     else if (hlp == "600") {
-      _serialPort->setBaudRate(BAUD600);   
+      _serialPort->setBaudRate(BAUD600);
     }
     else if (hlp == "1200") {
-      _serialPort->setBaudRate(BAUD1200);   
+      _serialPort->setBaudRate(BAUD1200);
     }
     else if (hlp == "2400") {
-      _serialPort->setBaudRate(BAUD2400);   
+      _serialPort->setBaudRate(BAUD2400);
     }
     else if (hlp == "4800") {
-      _serialPort->setBaudRate(BAUD4800);   
+      _serialPort->setBaudRate(BAUD4800);
     }
     else if (hlp == "9600") {
-      _serialPort->setBaudRate(BAUD9600);   
+      _serialPort->setBaudRate(BAUD9600);
     }
     else if (hlp == "19200") {
-      _serialPort->setBaudRate(BAUD19200);   
+      _serialPort->setBaudRate(BAUD19200);
     }
     else if (hlp == "38400") {
-      _serialPort->setBaudRate(BAUD38400);   
+      _serialPort->setBaudRate(BAUD38400);
     }
     else if (hlp == "57600") {
-      _serialPort->setBaudRate(BAUD57600);   
+      _serialPort->setBaudRate(BAUD57600);
     }
     else if (hlp == "115200") {
-      _serialPort->setBaudRate(BAUD115200);   
+      _serialPort->setBaudRate(BAUD115200);
     }
 
@@ -209 +209 @@
     hlp = settings.value("serialParity").toString();
     if      (hlp == "NONE") {
-      _serialPort->setParity(PAR_NONE);    
+      _serialPort->setParity(PAR_NONE);
     }
     else if (hlp == "ODD") {
-      _serialPort->setParity(PAR_ODD);    
+      _serialPort->setParity(PAR_ODD);
     }
     else if (hlp == "EVEN") {
-      _serialPort->setParity(PAR_EVEN);    
+      _serialPort->setParity(PAR_EVEN);
     }
     else if (hlp == "SPACE") {
-      _serialPort->setParity(PAR_SPACE);    
+      _serialPort->setParity(PAR_SPACE);
     }
 
@@ -225 +225 @@
     hlp = settings.value("serialDataBits").toString();
     if      (hlp == "5") {
-      _serialPort->setDataBits(DATA_5);   
+      _serialPort->setDataBits(DATA_5);
     }
     else if (hlp == "6") {
-      _serialPort->setDataBits(DATA_6);   
+      _serialPort->setDataBits(DATA_6);
     }
     else if (hlp == "7") {
-      _serialPort->setDataBits(DATA_7);   
+      _serialPort->setDataBits(DATA_7);
     }
     else if (hlp == "8") {
-      _serialPort->setDataBits(DATA_8);   
+      _serialPort->setDataBits(DATA_8);
     }
     hlp = settings.value("serialStopBits").toString();
     if      (hlp == "1") {
-      _serialPort->setStopBits(STOP_1);    
+      _serialPort->setStopBits(STOP_1);
     }
     else if (hlp == "2") {
-      _serialPort->setStopBits(STOP_2);    
+      _serialPort->setStopBits(STOP_2);
     }
 
@@ -248 +248 @@
     hlp = settings.value("serialFlowControl").toString();
     if (hlp == "XONXOFF") {
-      _serialPort->setFlowControl(FLOW_XONXOFF);    
+      _serialPort->setFlowControl(FLOW_XONXOFF);
     }
     else if (hlp == "HARDWARE") {
-      _serialPort->setFlowControl(FLOW_HARDWARE);    
+      _serialPort->setFlowControl(FLOW_HARDWARE);
     }
     else {
-      _serialPort->setFlowControl(FLOW_OFF);    
+      _serialPort->setFlowControl(FLOW_OFF);
     }
 
@@ -265 +265 @@
       emit(newMessage((_staID + ": Cannot open serial port\n"), true));
     }
-    connect(_serialPort, SIGNAL(readyRead()), 
+    connect(_serialPort, SIGNAL(readyRead()),
             this, SLOT(slotSerialReadyRead()));
 
@@ -323 +323 @@
     RTCM3Decoder* newDecoder = new RTCM3Decoder(_staID, _rawFile);
     _decoder = newDecoder;
-    connect((RTCM3Decoder*) newDecoder, SIGNAL(newMessage(QByteArray,bool)), 
+    connect((RTCM3Decoder*) newDecoder, SIGNAL(newMessage(QByteArray,bool)),
             this, SIGNAL(newMessage(QByteArray,bool)));
   }
@@ -341 +341 @@
 
   msleep(100); //sleep 0.1 sec
-  
-  _decoder->initRinex(_staID, _mountPoint, _latitude, _longitude, 
+
+  _decoder->initRinex(_staID, _mountPoint, _latitude, _longitude,
                                _nmea, _ntripVersion);
 
@@ -393 +393 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncGetThread::terminate() {
@@ -478 +478 @@
       // -----------
       if (_rawOutput) {
-        BNC_CORE->writeRawData(data, _staID, _format); 
+        BNC_CORE->writeRawData(data, _staID, _format);
       }
 
@@ -485 +485 @@
         _serialPort->write(data);
       }
-      
+
       // Decode Data
       // -----------
@@ -496 +496 @@
       t_irc irc = decoder()->Decode(data.data(), data.size(), errmsg);
 
+      if (irc == failure) {
+        continue;
+      }
+
       // Perform various scans and checks
       // --------------------------------
@@ -502 +506 @@
         _latencyChecker->checkObsLatency(decoder()->_obsList);
         _latencyChecker->checkCorrLatency(decoder()->corrGPSEpochTime());
-        
+
         emit newLatency(_staID, _latencyChecker->currentLatency());
       }
 
-      miscScanRTCM();            
+      miscScanRTCM();
 
       // Loop over all observations (observations output)
@@ -542 +546 @@
             long oldTime = it.value();
             if      (obsTime <  oldTime) {
-              emit( newMessage(_staID + 
+              emit( newMessage(_staID +
                  ": old observation " + prn.toAscii(), false));
               continue;
             }
             else if (obsTime == oldTime) {
-              emit( newMessage(_staID + 
+              emit( newMessage(_staID +
                  ": observation coming more than once " + prn.toAscii(), false));
               continue;
@@ -581 +585 @@
 }
 
-// Try Re-Connect 
+// Try Re-Connect
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncGetThread::tryReconnect() {
@@ -715 +719 @@
         emit(newMessage(_staID + ": Received message type " + type.toAscii(), true));
       }
-  
+
       // Check Observation Types
       // -----------------------
@@ -777 +781 @@
         }
         if (!allFound) {
-          QString msg; 
+          QString msg;
           QTextStream str(&msg);
           QString s;
@@ -818 +822 @@
           emit(newMessage(_staID + ": Antenna height above marker "  + ant4 + "m", true));
         }
-        emit(newAntCrd(_staID, decoder()->_antList[ii].xx, 
-                       decoder()->_antList[ii].yy, decoder()->_antList[ii].zz, 
+        emit(newAntCrd(_staID, decoder()->_antList[ii].xx,
+                       decoder()->_antList[ii].yy, decoder()->_antList[ii].zz,
                        hh, antT));
       }
@@ -854 +858 @@
           hh = decoder()->_antList[ii].height;
         }
-        emit(newAntCrd(_staID, decoder()->_antList[ii].xx, 
-                       decoder()->_antList[ii].yy, decoder()->_antList[ii].zz, 
+        emit(newAntCrd(_staID, decoder()->_antList[ii].xx,
+                       decoder()->_antList[ii].yy, decoder()->_antList[ii].zz,
                        hh, antT));
   }