Changeset 1827 in ntrip

Timestamp:

May 5, 2009, 9:00:56 AM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk

Files:

• BNC/RTCM3/clock_orbit_rtcm.c (modified) (4 diffs)
• BNS/RTCM/clock_orbit_rtcm.c (modified) (4 diffs)

trunk/BNC/RTCM3/clock_orbit_rtcm.c

@@ -3 +3 @@
         Name:           clock_orbit_rtcm.c
         Project:        RTCM3
-        Version:        $Id: clock_orbit_rtcm.c,v 1.5 2009/04/30 08:41:49 stoecker Exp $
+        Version:        $Id: clock_orbit_rtcm.c,v 1.6 2009/05/04 12:53:42 stoecker Exp $
         Authors:        Dirk Stöcker
         Description:    state space approach for RTCM3
@@ -79 +79 @@
     blockstart[1] |= len>>8; \
     blockstart[2] = len; \
+    if(len > 1023) \
+      return 0; \
     len = CRC24(len+3, (const unsigned char *) blockstart); \
     ADDBITS(24, len) \
@@ -144 +146 @@
     gpscl = 1;
   if(co->NumberOfGPSSat && co->ClockDataSupplied && co->OrbitDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GPSCOMBINED))
+  && (type == COTYPE_AUTO || type == COTYPE_GPSCOMBINED)
+  && co->NumberOfGPSSat < 28)
   {
     gpsco = 1; gpsor = 0; gpscl = 0;
@@ -397 +400 @@
     ENDBLOCK
   }
-
 
   return ressize;

trunk/BNS/RTCM/clock_orbit_rtcm.c

@@ -3 +3 @@
         Name:           clock_orbit_rtcm.c
         Project:        RTCM3
-        Version:        $Id: clock_orbit_rtcm.c,v 1.5 2009/04/30 08:41:49 stoecker Exp $
+        Version:        $Id: clock_orbit_rtcm.c,v 1.6 2009/05/04 12:53:42 stoecker Exp $
         Authors:        Dirk Stöcker
         Description:    state space approach for RTCM3
@@ -79 +79 @@
     blockstart[1] |= len>>8; \
     blockstart[2] = len; \
+    if(len > 1023) \
+      return 0; \
     len = CRC24(len+3, (const unsigned char *) blockstart); \
     ADDBITS(24, len) \
@@ -144 +146 @@
     gpscl = 1;
   if(co->NumberOfGPSSat && co->ClockDataSupplied && co->OrbitDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GPSCOMBINED))
+  && (type == COTYPE_AUTO || type == COTYPE_GPSCOMBINED)
+  && co->NumberOfGPSSat < 28)
   {
     gpsco = 1; gpsor = 0; gpscl = 0;
@@ -397 +400 @@
     ENDBLOCK
   }
-
 
   return ressize;