Changeset 728 in ntrip for trunk/BNC/RTCM/RTCM2.cpp

Timestamp:

Mar 14, 2008, 4:01:49 PM (16 years ago)

Author:

weber

Message:

* empty log message *

File:

• trunk/BNC/RTCM/RTCM2.cpp (modified) (16 diffs)

trunk/BNC/RTCM/RTCM2.cpp

@@ -49 +49 @@
 //   2008/03/10  AHA  Corrected extraction of antenna serial number
 //   2008/03/10  AHA  Corrected buffer length check in getPacket()
-//   2008/03/11  AHA  Added checks for data consistency in extraction routines
 //   2008/03/11  AHA  isGPS-flag in RTCM2_Obs is now set to false on clear()
+//   2008/03/13  AHA  Added checks for data consistency in extraction routines
 //
 // (c) DLR/GSOC
@@ -296 +296 @@
    
   if (buf.size()<5) {
-    // Ignore; users should avoid this case prior to calling get()    
+    // Ignore; users should avoid this case prior to calling get()
+    
 #if ( DEBUG > 0 )    
     cerr << "Error in get(): packet too short (" << buf.size() <<")" << endl;
 #endif
+        
     return;
   };
@@ -341 +343 @@
 void ThirtyBitWord::getHeader(string& buf) {
 
-  const int wordLen = 5; // Number of bytes representing a 30-bit word
-  const int spare   = 1; // Number of spare words for resync of parity
-                         // (same value as inRTCM2packet::getPacket()) 
+  const unsigned int wordLen = 5; // Number of bytes representing a 30-bit word
+  const unsigned int spare   = 1; // Number of spare words for resync of parity
+                                  // (same value as inRTCM2packet::getPacket()) 
   unsigned int i;
   
   i=0;
+  // append spare word (to get correct parity) and first consecutive word  
+  while (i<(spare+1)*wordLen) {
+    // Process byte
+    append(buf[i]);
+    // Increment count
+    i++;
+  };
+  
+  // start searching for preamble in first word after spare word
   while (!isHeader() && i<buf.size() ) {
     // Process byte
@@ -445 +456 @@
   unsigned int n;
   
+  // Does the package content at least spare bytes and first header byte?
+  if (buf.size()<(spare+1)*wordLen) { 
+      clear();       
+      return;
+  };
+    
   // Try to read a full packet. Processed bytes are removed from the input 
   // buffer except for the latest spare*wordLen bytes to restore the parity 
-  // bytes upon subseqeunt calls of getPAcket().
+  // bytes upon subseqeunt calls of getPacket().
   
   // Locate and read the first header word
@@ -456 +473 @@
     // termination of getPacket().
     clear();
+    
 #if ( DEBUG > 0 )
     cerr << "Error in getPacket(): W.isHeader() = false  for H1" << endl;
 #endif
+    
     return; 
   };
@@ -469 +488 @@
   if (buf.size()<(spare+2)*wordLen) { 
     clear(); 
+    
 #if ( DEBUG > 0 )    
     cerr << "Error in getPacket(): buffer too short for complete H2" << endl;
 #endif
+    
     return;
   };
@@ -483 +504 @@
     clear(); 
     buf.erase(0,1); 
+    
 #if ( DEBUG > 0 )    
     cerr << "Error in getPacket(): W.validParity() = false for H2" << endl;
 #endif
+        
     return; 
   };
 
   n = nDataWords();
-
+  
   // Do we have enough bytes to read the next word? If not, the packet 
   // contents is cleared to indicate an unsuccessful termination. The
@@ -496 +519 @@
   // for use in the next call of getPacket().
   if (buf.size()<(spare+2+n)*wordLen) { 
-    clear();     
+    clear(); 
+    
 #if ( DEBUG > 0 )    
     cerr << "Error in getPacket(): buffer too short for complete " << n
          << " DWs" << endl;
 #endif
+    
     return; 
   };
@@ -513 +538 @@
       clear(); 
       buf.erase(0,1); 
+      
 #if ( DEBUG > 0 )    
     cerr << "Error in getPacket(): W.validParity() = false for DW"
          << i << endl;
 #endif
+        
       return; 
     };
@@ -527 +554 @@
   
   buf.erase(0,(n+2)*wordLen);
-  
+    
   return;
   
@@ -762 +789 @@
 void RTCM2_23::extract(const RTCM2packet& P) {
 
-  int  nad, nas;
-  
-  // Check validity and packet type
+  unsigned int       nad, nas;
+  
+  const unsigned int nF1  = 8; // bits in first field (R,AF,SF,NAD)
+  const unsigned int nF2  =16; // bits in second field (SETUP ID,R,NAS)
+  const unsigned int nBits=24; // data bits in  30bit word
+  
+  // Check validity, packet type and number of data words
   
   validMsg = (P.valid()); 
@@ -771 +802 @@
   validMsg = (P.ID()==23);  
   if (!validMsg) return;
-  
+
+  // Check number of data words (can nad be read in?)
+  
+  validMsg = (P.nDataWords()>=1);  
+  if (!validMsg){
+    cerr << "RTCM2_23::extract: P.nDataWords()>=1" << endl;
+    return;
+  }
+
   // Antenna descriptor 
   antType = "";
   nad = P.getUnsignedBits(3,5);
-  for (int i=0;i<nad;i++) 
-    antType += (char)P.getUnsignedBits(8+i*8,8);
+  
+  // Check number of data words (can antenna description be read in?) 
+  validMsg = ( P.nDataWords() >= 
+               (unsigned int)ceil((nF1+nad*8)/(double)nBits) );
+
+  if (!validMsg) return;
+  
+  for (unsigned int i=0;i<nad;i++) 
+    antType += (char)P.getUnsignedBits(nF1+i*8,8);
 
   // Optional antenna serial numbers
   if (P.getUnsignedBits(2,1)==1) {
+
+    // Check number of data words (can nas be read in?)
+    
+    validMsg = ( P.nDataWords() >=
+                 (unsigned int)ceil((nF1+nad*8+nF2)/(double)nBits) );
+    if (!validMsg) return;
+    
     nas = P.getUnsignedBits(19+8*nad,5);
+
+    // Check number of data words (can antenna serial number be read in?)
+    
+    validMsg = ( P.nDataWords() >=
+                 (unsigned int)ceil((nF1+nad*8+nF2+nas*8)/(double)nBits) );
+    if (!validMsg) return;
+
     antSN = "";
-    for (int i=0;i<nas;i++) 
-      antSN += (char)P.getUnsignedBits(24+8*nad+i*8,8);
+    for (unsigned int i=0;i<nas;i++) 
+      antSN += (char)P.getUnsignedBits(nF1+8*nad+nF2+i*8,8);
   };
 
@@ -962 +1022 @@
          << P.nDataWords() << ") detected" << endl;
 #endif
+    
     return;
   };
@@ -972 +1033 @@
          << P.nDataWords() << ") detected" << endl;
 #endif
+    
     return;
   };
@@ -1033 +1095 @@
     if ( isL1 && !isGPS) availability.set(bit_L1cphGLO);
     if (!isL1 && !isGPS) availability.set(bit_L2cphGLO);
+    
+#if ( DEBUG > 0 )
+    cerr << "RTCM2_Obs::extract(): availability " 
+         << bitset<8>(availability) << endl;  
+#endif
+    
     
     // Process all satellites
@@ -1148 +1216 @@
     if ( isL1 && !isGPS) availability.set(bit_L1rngGLO);
     if (!isL1 && !isGPS) availability.set(bit_L2rngGLO);
+
+#if ( DEBUG > 0 )
+    cerr << "RTCM2_Obs::extract(): availability " 
+         << bitset<8>(availability) << endl;  
+#endif
 
     // Process all satellites