Changeset 11042 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Sep 22, 2026, 5:19:12 PM (13 days ago)

Author:

stuerze

Message:

updates regarding RTCM-SSR

Location:

trunk/BNC/src/RTCM3/clock_and_orbit

Files:

• clock_orbit.h (modified) (1 diff)
• clock_orbit_igs.cpp (modified) (1 diff)
• clock_orbit_igs.h (modified) (1 diff)
• clock_orbit_rtcm.cpp (modified) (1 diff)
• clock_orbit_rtcm.h (modified) (1 diff)
• clock_orbit_rtcm_new.cpp (modified) (2 diffs)
• clock_orbit_rtcm_new.h (modified) (1 diff)

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h

@@ -604 +604 @@
 #define E_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a) ADDBITS(4,  a)                      /* DF+015 (new RTCM) to extend DF+021*/
 #define E_SATELLITE_SET_INDICATOR(a)                    ADDBITS(1,  a)                      /* DF+016 (new RTCM) */
-#define E_SATELLITE_MASK(a)                             ADDBITS(64, a)                      /* DF394 */
+/* ADDBITS' mask "(1<<a)-1" uses a 32-bit int literal, so a plain
+   ADDBITS(64, a) is broken the same way GETSSRBITS(a, 64) was on decode
+   (see D_SATELLITE_MASK) - here even ADDBITS(32, ...) is unsafe, since
+   shifting a 32-bit int by exactly its own width is undefined behavior
+   too. Stay well clear of that edge by writing four 16-bit chunks. */
+#define E_SATELLITE_MASK(a)                             { \
+  uint64_t mask64_ = (a); \
+  ADDBITS(16, (mask64_ >> 48) & 0xFFFFU) \
+  ADDBITS(16, (mask64_ >> 32) & 0xFFFFU) \
+  ADDBITS(16, (mask64_ >> 16) & 0xFFFFU) \
+  ADDBITS(16,  mask64_        & 0xFFFFU) \
+}                                                                             /* DF394 */
 #define E_FREQUENCY_SET_INDICATOR(a)                    ADDBITS(1,  a)                      /* DF+017 (new RTCM) */
 #define E_GNSS_FREQUENCY_MASK(a)                        ADDBITS(6,  a)                      /* DF+018 (new RTCM) */

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp

@@ -945 +945 @@
 }
 
+//
+////////////////////////////////////////////////////////////////////////////
+size_t SsrCorrIgs::MakeAntenna(const struct Antenna*, SatAntennaType, char*, size_t) {
+  // This format does not encode Satellite Antenna message content; nothing
+  // to encode.
+  return 0;
+}
+

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h

@@ -227 +227 @@
   size_t MakeVTEC(const struct VTEC *v, int moremessagesfollow, char *buffer, size_t size);
   size_t MakeMetaData(const struct MetaData *md, char *buffer, size_t size);
+  size_t MakeAntenna(const struct Antenna *a, SatAntennaType type, char *buffer, size_t size);
   enum GCOB_RETURN GetSSR(struct ClockOrbit *co, struct CodeBias *cb, struct VTEC *v, 
                           struct PhaseBias *pb, struct MetaData *md, struct Antenna* a,

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp

@@ -1399 +1399 @@
 }
 
+//
+////////////////////////////////////////////////////////////////////////////
+size_t SsrCorrRtcm::MakeAntenna(const struct Antenna*, SatAntennaType, char*, size_t) {
+  // Satellite Antenna messages are not defined in (old) RTCM-SSR; nothing
+  // to encode.
+  return 0;
+}
+

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h

@@ -226 +226 @@
   size_t MakeVTEC(const struct VTEC *v, int moremessagesfollow, char *buffer, size_t size);
   size_t MakeMetaData(const struct MetaData *md, char *buffer, size_t size);
+  size_t MakeAntenna(const struct Antenna *a, SatAntennaType type, char *buffer, size_t size);
   enum GCOB_RETURN GetSSR(struct ClockOrbit *co, struct CodeBias *cb, struct VTEC *v, 
                           struct PhaseBias *pb, struct MetaData *md, struct Antenna* a,

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp

@@ -495 +495 @@
 }
 
+//
+////////////////////////////////////////////////////////////////////////////
+size_t SsrCorrRtcmNew::MakeAntenna(const struct Antenna* a, SatAntennaType type,
+  char* buffer, size_t size) {
+  unsigned int s, k, satBlockIdx, freqBlockIdx, deg, f, numSatBlocks, numFreqBlocks;
+  unsigned int satPositions[64], numSatPositions;
+  unsigned int freqPositions[ANT_MAXFREQUENCIES], numFreqPositions;
+
+  STARTDATA
+
+    for (s = 0; s < CLOCKORBIT_SATNUM; ++s) {
+      if (a->SatelliteMask[s] == 0 ||
+          !(type == SATANTTYPE_AUTO || type == corType[s][COBOFS_SATANT])) {
+        continue;
+      }
+      INITBLOCK
+        E_RTCM_MESSAGE_NUMBER(corType[s][COBOFS_SATANT])
+        E_SSR_PROVIDER_ID(a->SSRProviderID[s])
+        E_SATELLITE_ANTENNA_IOD(a->SatelliteAntennaIOD[s])
+        E_PHASE_CENTER_INFO_INDICATOR(a->PhaseCenterInformationIndicator[s])
+        E_GROUP_DELAY_INFO_INDICATOR(a->GroupDelayInformationIndicator[s])
+        E_NADIR_ANGLE_DEPENDENT_CORR_INDICATOR(a->NadirAngleDependentCorrectionIndicator[s])
+        if (a->NadirAngleDependentCorrectionIndicator[s]) {
+          E_MAXIMUM_OFF_NADIR_ANGLE(a->maximumOffNadirAngle[s])
+          E_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a->NadirAngleDependentCorrectionRangeExtension[s])
+        }
+        E_SATELLITE_SET_INDICATOR(a->SatelliteSetIndicator[s])
+        E_SATELLITE_MASK(a->SatelliteMask[s])
+
+        /* same MSB-first mask convention as D_SATELLITE_MASK/GetSSR */
+        numSatPositions = 0;
+        for (k = 0; k < 64 && satoffset[s] + k < satoffset[s + 1]; ++k) {
+          if ((a->SatelliteMask[s] >> (63 - k)) & 1ULL) {
+            satPositions[numSatPositions++] = satoffset[s] + k;
+          }
+        }
+        numSatBlocks = a->SatelliteSetIndicator[s] ? (numSatPositions ? 1 : 0) : numSatPositions;
+
+        for (satBlockIdx = 0; satBlockIdx < numSatBlocks; ++satBlockIdx) {
+          /* satellites sharing a block (SatelliteSetIndicator set) must
+             already carry identical Sat[] content - the caller is
+             responsible for that, same as the encoder trusts NumberOfSat
+             elsewhere; only the first masked satellite's data is sent */
+          const struct Antenna::SatellitePart& satBlock = a->Sat[satPositions[satBlockIdx]];
+          E_FREQUENCY_SET_INDICATOR(satBlock.FrequencySetIndicator)
+          E_GNSS_FREQUENCY_MASK(satBlock.GnssFrequencyMask)
+
+          numFreqPositions = 0;
+          for (k = 0; k < ANT_MAXFREQUENCIES; ++k) {
+            if ((satBlock.GnssFrequencyMask >> (ANT_MAXFREQUENCIES - 1 - k)) & 1U) {
+              freqPositions[numFreqPositions++] = k;
+            }
+          }
+          numFreqBlocks = satBlock.FrequencySetIndicator ? (numFreqPositions ? 1 : 0) : numFreqPositions;
+
+          for (freqBlockIdx = 0; freqBlockIdx < numFreqBlocks; ++freqBlockIdx) {
+            f = satBlock.FrequencySetIndicator ? freqPositions[0] : freqPositions[freqBlockIdx];
+            E_NADIR_CORR_INDICATOR(satBlock.Freq[f].NadirCorrectionIndicator)
+            if (satBlock.Freq[f].NadirCorrectionIndicator) {
+              E_NADIR_CORRECTION(satBlock.Freq[f].NadirCorrection)
+            }
+            if (a->NadirAngleDependentCorrectionIndicator[s]) {
+              for (deg = 0; deg <= a->maximumOffNadirAngle[s] && deg < ANT_MAXNADIRDEGREES; ++deg) {
+                E_NADIR_ANGLE_DEPENDENT_CORRECTION(satBlock.Freq[f].NadirAngleCorrection[deg],
+                  a->NadirAngleDependentCorrectionRangeExtension[s])
+              }
+            }
+          }
+        }
+      ENDBLOCK
+    }
+  return ressize;
+}
+
 enum GCOB_RETURN SsrCorrRtcmNew::GetSSR(struct ClockOrbit* co, struct CodeBias* cb, struct VTEC* v,
   struct PhaseBias* pb, struct MetaData* md, struct Antenna* a, const char* buffer, size_t size, int* bytesused) {
@@ -1152 +1226 @@
 
       for (satBlockIdx = 0; satBlockIdx < numSatBlocks; ++satBlockIdx) {
-        struct Antenna::SatellitePart satBlock;
+        /* zero-initialized, not just declared: DF+019/DF+013 unset means the
+           correction IS zero (not "not present"), per spec - a plain
+           declaration left NadirCorrection/NadirAngleCorrection as
+           uninitialized stack garbage for every satellite/frequency whose
+           indicator was 0, which is nearly all of them in real data. This
+           went unnoticed because normal call depth happened to leave zero
+           there; it surfaced via a deeper (nested) call stack during
+           MakeAntenna round-trip testing. */
+        struct Antenna::SatellitePart satBlock = {};
         D_FREQUENCY_SET_INDICATOR(satBlock.FrequencySetIndicator)
         D_GNSS_FREQUENCY_MASK(satBlock.GnssFrequencyMask)

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h

@@ -280 +280 @@
   size_t MakeVTEC(const struct VTEC *v, int moremessagesfollow, char *buffer, size_t size);
   size_t MakeMetaData(const struct MetaData *md, char *buffer, size_t size);
+  size_t MakeAntenna(const struct Antenna *a, SatAntennaType type, char *buffer, size_t size);
   enum GCOB_RETURN GetSSR(struct ClockOrbit *co, struct CodeBias *cb, struct VTEC *v, 
                           struct PhaseBias *pb, struct MetaData *md, struct Antenna* a,