Index: trunk/BNC/GPSS/gpssDecoder.h
===================================================================
--- trunk/BNC/GPSS/gpssDecoder.h	(revision 2491)
+++ trunk/BNC/GPSS/gpssDecoder.h	(revision 2492)
@@ -6,5 +6,5 @@
 
 #include "RTCM/GPSDecoder.h"
-#include "RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 
 class gpssDecoder : public QObject, public GPSDecoder {
Index: trunk/BNC/RTCM/RTCM2Decoder.h
===================================================================
--- trunk/BNC/RTCM/RTCM2Decoder.h	(revision 2491)
+++ trunk/BNC/RTCM/RTCM2Decoder.h	(revision 2492)
@@ -33,6 +33,6 @@
 #include "RTCM2.h"
 #include "RTCM2_2021.h"
-#include "../RTCM3/rtcm3torinex.h"
-#include "../RTCM3/ephemeris.h"
+#include "rtcm3torinex.h"
+#include "ephemeris.h"
 
 class RTCM2Decoder: public GPSDecoder {
Index: trunk/BNC/RTCM/rtcm_utils.cpp
===================================================================
--- trunk/BNC/RTCM/rtcm_utils.cpp	(revision 2491)
+++ trunk/BNC/RTCM/rtcm_utils.cpp	(revision 2492)
@@ -3,6 +3,6 @@
 #include <math.h>
 #include <stdio.h>
-#include <RTCM3/rtcm3torinex.h>
-#include <RTCM3/ephemeris.h>
+#include <rtcm3torinex.h>
+#include <ephemeris.h>
 
 #include "rtcm_utils.h"
Index: trunk/BNC/RTCM3/RTCM3Decoder.cpp
===================================================================
--- trunk/BNC/RTCM3/RTCM3Decoder.cpp	(revision 2491)
+++ trunk/BNC/RTCM3/RTCM3Decoder.cpp	(revision 2492)
@@ -307,10 +307,10 @@
                     obs->_o.L1            = _Parser.Data.measdata[ii][pos] + modulusAmb;
                     obs->_o.SNR1          = _Parser.Data.snrL1[ii];
-                    obs->_o.lock_timei_L1 = _Parser.lastlockl1[isat];
+                    obs->_o.lock_timei_L1 = _Parser.lastlockGPSl1[isat];
                   }
                   else if (df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) {
                     obs->_o.L2            = _Parser.Data.measdata[ii][pos] + modulusAmb;
                     obs->_o.SNR2          = _Parser.Data.snrL2[ii];
-                    obs->_o.lock_timei_L2 = _Parser.lastlockl2[isat];
+                    obs->_o.lock_timei_L2 = _Parser.lastlockGPSl2[isat];
                   }
                   else if (df & (GNSSDF_S1CDATA|GNSSDF_S1PDATA)) {
Index: trunk/BNC/RTCM3/clock_orbit_rtcm.c
===================================================================
--- trunk/BNC/RTCM3/clock_orbit_rtcm.c	(revision 2491)
+++ 	(revision )
@@ -1,987 +1,0 @@
-/* Programheader
-
-        Name:           clock_orbit_rtcm.c
-        Project:        RTCM3
-        Version:        $Id: clock_orbit_rtcm.c,v 1.11 2010/04/16 06:14:00 stoecker Exp $
-        Authors:        Dirk Stöcker
-        Description:    state space approach for RTCM3
-*/
-
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#ifndef sparc
-#include <stdint.h>
-#else
-#include <sys/types.h>
-#endif
-#include "clock_orbit_rtcm.h"
-
-static uint32_t CRC24(long size, const unsigned char *buf)
-{
-  uint32_t crc = 0;
-  int i;
-
-  while(size--)
-  {
-    crc ^= (*buf++) << (16);
-    for(i = 0; i < 8; i++)
-    {
-      crc <<= 1;
-      if(crc & 0x1000000)
-        crc ^= 0x01864cfb;
-    }
-  }
-  return crc;
-}
-
-/* NOTE: These defines are interlinked with below functions and directly modify
-the values. This may not be optimized in terms of final program code size but
-should be optimized in terms of speed.
-
-modified variables are:
-- everything defined in STARTDATA (only use ressize outside of the defines,
-  others are private)
-- buffer
-- size
-*/
-
-#ifndef NOENCODE
-#define STOREBITS \
-  while(numbits >= 8) \
-  { \
-    if(!size) return 0; \
-    *(buffer++) = bitbuffer>>(numbits-8); \
-    numbits -= 8; \
-    ++ressize; \
-    --size; \
-  }
-
-#define ADDBITS(a, b) \
-  { \
-    bitbuffer = (bitbuffer<<(a))|((b)&((1<<a)-1)); \
-    numbits += (a); \
-    STOREBITS \
-  }
-
-#define STARTDATA \
-  size_t ressize=0; \
-  char *blockstart; \
-  int numbits; \
-  uint64_t bitbuffer=0;
-
-#define INITBLOCK \
-  numbits = 0; \
-  blockstart = buffer; \
-  ADDBITS(8, 0xD3) \
-  ADDBITS(6, 0) \
-  ADDBITS(10, 0)
-
-#define ENDBLOCK \
-  if(numbits) { ADDBITS((8-numbits), 0) } \
-  { \
-    int len = buffer-blockstart-3; \
-    blockstart[1] |= len>>8; \
-    blockstart[2] = len; \
-    if(len > 1023) \
-      return 0; \
-    len = CRC24(len+3, (const unsigned char *) blockstart); \
-    ADDBITS(24, len) \
-  }
-
-#define SCALEADDBITS(a, b, c) ADDBITS(a, (int64_t)(b*c))
-
-/* standard values */
-#define T_MESSAGE_NUMBER(a)              ADDBITS(12, a) /* DF002 */
-#define T_RESERVED4                      ADDBITS(4, 0)  /* DF001 */
-#define T_RESERVED5                      ADDBITS(5, 0)  /* DF001 */
-#define T_GPS_SATELLITE_ID(a)            ADDBITS(6, a)  /* DF068 */
-#define T_GPS_IODE(a)                    ADDBITS(8, a)  /* DF071 */
-#define T_GLONASS_IOD(a)                 ADDBITS(8, a)  /* DF237 */
-
-/* defined values */
-#define T_DELTA_RADIAL(a)                SCALEADDBITS(22,    10000.0, a)
-#define T_DELTA_ALONG_TRACK(a)           SCALEADDBITS(20,     2500.0, a)
-#define T_DELTA_CROSS_TRACK(a)           SCALEADDBITS(20,     2500.0, a)
-#define T_DELTA_DOT_RADIAL(a)            SCALEADDBITS(21,  1000000.0, a)
-#define T_DELTA_DOT_ALONG_TRACK(a)       SCALEADDBITS(19,   250000.0, a)
-#define T_DELTA_DOT_CROSS_TRACK(a)       SCALEADDBITS(19,   250000.0, a)
-
-#define T_SATELLITE_REFERENCE_DATUM(a)   ADDBITS(1, a)
-#define T_DELTA_CLOCK_C0(a)              SCALEADDBITS(22,    10000.0, a)
-#define T_DELTA_CLOCK_C1(a)              SCALEADDBITS(21,  1000000.0, a)
-#define T_DELTA_CLOCK_C2(a)              SCALEADDBITS(27, 50000000.0, a)
-#define T_NO_OF_CODE_BIASES(a)           ADDBITS(5, a)
-#define T_GPS_SIGNAL_IDENTIFIER(a)       ADDBITS(5, a)
-#define T_GLONASS_SIGNAL_IDENTIFIER(a)   ADDBITS(5, a)
-#define T_CODE_BIAS(a)                   SCALEADDBITS(14,      100.0, a)
-#define T_GLONASS_SATELLITE_ID(a)        ADDBITS(5, a)
-
-#define T_GPS_EPOCH_TIME(a)              ADDBITS(20, a)
-#define T_GLONASS_EPOCH_TIME(a)          ADDBITS(17, a)
-#define T_NO_OF_SATELLITES(a)            ADDBITS(6, a)
-#define T_MULTIPLE_MESSAGE_INDICATOR(a)  ADDBITS(1, a)
-#define T_SSR_URA(a)                     ADDBITS(6, a)
-#define T_HR_CLOCK_CORRECTION(a)         SCALEADDBITS(22,    10000.0, a)
-#define T_SSR_UPDATE_INTERVAL(a)         ADDBITS(4, a)
-
-static double URAToValue(int ura)
-{
-  int urac, urav;
-  urac = ura >> 3;
-  urav = ura & 7;
-  if(!ura)
-    return 0;
-  else if(ura == 63)
-    return SSR_MAXURA;
-  return (pow(3,urac)*(1.0+urav/4.0)-1.0)/1000.0;
-}
-
-static int ValueToURA(double val)
-{
-  int ura;
-  if(!val)
-    return 0;
-  else if(val > 5.4665)
-    return 63;
-  for(ura = 1; ura < 63 && val > URAToValue(ura); ++ura)
-    ;
-  return ura;
-}
-
-size_t MakeClockOrbit(const struct ClockOrbit *co, enum ClockOrbitType type,
-int moremessagesfollow, char *buffer, size_t size)
-{
-  int gpshr=0, gpsur=0, gpsor=0, gpscl=0, gpsco=0, glohr=0, glour=0, gloor=0,
-  glocl=0, gloco=0, mmi, i;
-
-  STARTDATA
-
-  if(co->NumberOfGPSSat && co->HRDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GPSHR))
-    gpshr = 1;
-  if(co->NumberOfGPSSat && co->URADataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GPSURA))
-    gpsur = 1;
-  if(co->NumberOfGPSSat && co->OrbitDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GPSORBIT))
-    gpsor = 1;
-  if(co->NumberOfGPSSat && co->ClockDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GPSCLOCK))
-    gpscl = 1;
-  if(co->NumberOfGPSSat && co->ClockDataSupplied && co->OrbitDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GPSCOMBINED)
-  /*&& co->NumberOfGPSSat <= 28*/)
-  {
-    gpsco = 1; gpsor = 0; gpscl = 0;
-  }
-  if(co->NumberOfGLONASSSat && co->HRDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GLONASSHR))
-    glohr = 1;
-  if(co->NumberOfGLONASSSat && co->URADataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GLONASSURA))
-    glour = 1;
-  if(co->NumberOfGLONASSSat && co->OrbitDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GLONASSORBIT))
-    gloor = 1;
-  if(co->NumberOfGLONASSSat && co->ClockDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GLONASSCLOCK))
-    glocl = 1;
-  if(co->NumberOfGLONASSSat && co->ClockDataSupplied && co->OrbitDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GLONASSCOMBINED))
-  {
-    gloco = 1; gloor = 0; glocl = 0;
-  }
-
-  mmi = gpshr+gpsur+gpsor+gpscl+gpsco+glohr+glour+gloor+glocl+gloco; /* required for multimessage */
-  if(!moremessagesfollow) --mmi;
-
-  if(gpsor)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GPSORBIT)
-    T_GPS_EPOCH_TIME(co->GPSEpochTime)
-    T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
-    T_RESERVED4
-    T_NO_OF_SATELLITES(co->NumberOfGPSSat)
-    for(i = 0; i < co->NumberOfGPSSat; ++i)
-    {
-      T_GPS_SATELLITE_ID(co->Sat[i].ID)
-      T_GPS_IODE(co->Sat[i].IOD)
-      T_DELTA_RADIAL(co->Sat[i].Orbit.DeltaRadial)
-      T_DELTA_ALONG_TRACK(co->Sat[i].Orbit.DeltaAlongTrack)
-      T_DELTA_CROSS_TRACK(co->Sat[i].Orbit.DeltaCrossTrack)
-      T_DELTA_DOT_RADIAL(co->Sat[i].Orbit.DotDeltaRadial)
-      T_DELTA_DOT_ALONG_TRACK(co->Sat[i].Orbit.DotDeltaAlongTrack)
-      T_DELTA_DOT_CROSS_TRACK(co->Sat[i].Orbit.DotDeltaCrossTrack)
-    }
-    ENDBLOCK
-  }
-  if(gpscl)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GPSCLOCK)
-    T_GPS_EPOCH_TIME(co->GPSEpochTime)
-    T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_RESERVED5
-    T_NO_OF_SATELLITES(co->NumberOfGPSSat)
-    for(i = 0; i < co->NumberOfGPSSat; ++i)
-    {
-      T_GPS_SATELLITE_ID(co->Sat[i].ID)
-      T_DELTA_CLOCK_C0(co->Sat[i].Clock.DeltaA0)
-      T_DELTA_CLOCK_C1(co->Sat[i].Clock.DeltaA1)
-      T_DELTA_CLOCK_C2(co->Sat[i].Clock.DeltaA2)
-    }
-    ENDBLOCK
-  }
-  if(gpsco)
-  {
-#ifdef SPLITBLOCK
-    int nums = co->NumberOfGPSSat;
-    int left, start = 0;
-    if(nums > 28) /* split block when more than 28 sats */
-    {
-      left = nums - 28;
-      nums = 28;
-    }
-    else
-    {
-      left = 0;
-    }
-    while(nums)
-    {
-#endif
-      INITBLOCK
-      T_MESSAGE_NUMBER(COTYPE_GPSCOMBINED)
-      T_GPS_EPOCH_TIME(co->GPSEpochTime)
-      T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-#ifdef SPLITBLOCK
-      T_MULTIPLE_MESSAGE_INDICATOR(/*mmi || */ left ? 1 : 0)
-#else
-      T_MULTIPLE_MESSAGE_INDICATOR(/*mmi || */ 0)
-#endif
-      --mmi;
-      T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
-      T_RESERVED4
-#ifdef SPLITBLOCK
-      T_NO_OF_SATELLITES(nums)
-      for(i = start; i < start+nums; ++i)
-#else
-      T_NO_OF_SATELLITES(co->NumberOfGPSSat)
-      for(i = 0; i < co->NumberOfGPSSat; ++i)
-#endif
-      {
-        T_GPS_SATELLITE_ID(co->Sat[i].ID)
-        T_GPS_IODE(co->Sat[i].IOD)
-        T_DELTA_RADIAL(co->Sat[i].Orbit.DeltaRadial)
-        T_DELTA_ALONG_TRACK(co->Sat[i].Orbit.DeltaAlongTrack)
-        T_DELTA_CROSS_TRACK(co->Sat[i].Orbit.DeltaCrossTrack)
-        T_DELTA_DOT_RADIAL(co->Sat[i].Orbit.DotDeltaRadial)
-        T_DELTA_DOT_ALONG_TRACK(co->Sat[i].Orbit.DotDeltaAlongTrack)
-        T_DELTA_DOT_CROSS_TRACK(co->Sat[i].Orbit.DotDeltaCrossTrack)
-        T_DELTA_CLOCK_C0(co->Sat[i].Clock.DeltaA0)
-        T_DELTA_CLOCK_C1(co->Sat[i].Clock.DeltaA1)
-        T_DELTA_CLOCK_C2(co->Sat[i].Clock.DeltaA2)
-      }
-      ENDBLOCK
-#ifdef SPLITBLOCK
-      start += nums;
-      nums = left;
-      left = 0;
-    }
-#endif
-  }
-  if(gpshr)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GPSHR)
-    T_GPS_EPOCH_TIME(co->GPSEpochTime)
-    T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_RESERVED5
-    T_NO_OF_SATELLITES(co->NumberOfGPSSat)
-    for(i = 0; i < co->NumberOfGPSSat; ++i)
-    {
-      T_GPS_SATELLITE_ID(co->Sat[i].ID)
-      T_HR_CLOCK_CORRECTION(co->Sat[i].hrclock)
-    }
-    ENDBLOCK
-  }
-  if(gpsur)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GPSURA)
-    T_GPS_EPOCH_TIME(co->GPSEpochTime)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_RESERVED5
-    T_NO_OF_SATELLITES(co->NumberOfGPSSat)
-    for(i = 0; i < co->NumberOfGPSSat; ++i)
-    {
-      T_GPS_SATELLITE_ID(co->Sat[i].ID)
-      T_SSR_URA(ValueToURA(co->Sat[i].UserRangeAccuracy))
-    }
-    ENDBLOCK
-  }
-  if(gloor)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GLONASSORBIT)
-    T_GLONASS_EPOCH_TIME(co->GLONASSEpochTime)
-    T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
-    T_RESERVED4
-    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
-    for(i = CLOCKORBIT_NUMGPS;
-    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
-    {
-      T_GLONASS_SATELLITE_ID(co->Sat[i].ID)
-      T_GLONASS_IOD(co->Sat[i].IOD)
-      T_DELTA_RADIAL(co->Sat[i].Orbit.DeltaRadial)
-      T_DELTA_ALONG_TRACK(co->Sat[i].Orbit.DeltaAlongTrack)
-      T_DELTA_CROSS_TRACK(co->Sat[i].Orbit.DeltaCrossTrack)
-      T_DELTA_DOT_RADIAL(co->Sat[i].Orbit.DotDeltaRadial)
-      T_DELTA_DOT_ALONG_TRACK(co->Sat[i].Orbit.DotDeltaAlongTrack)
-      T_DELTA_DOT_CROSS_TRACK(co->Sat[i].Orbit.DotDeltaCrossTrack)
-    }
-    ENDBLOCK
-  }
-  if(glocl)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GLONASSCLOCK)
-    T_GLONASS_EPOCH_TIME(co->GLONASSEpochTime)
-    T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_RESERVED5
-    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
-    for(i = CLOCKORBIT_NUMGPS;
-    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
-    {
-      T_GLONASS_SATELLITE_ID(co->Sat[i].ID)
-      T_GLONASS_IOD(co->Sat[i].IOD)
-      T_DELTA_CLOCK_C0(co->Sat[i].Clock.DeltaA0)
-      T_DELTA_CLOCK_C1(co->Sat[i].Clock.DeltaA1)
-      T_DELTA_CLOCK_C2(co->Sat[i].Clock.DeltaA2)
-    }
-    ENDBLOCK
-  }
-  if(gloco)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GLONASSCOMBINED)
-    T_GLONASS_EPOCH_TIME(co->GLONASSEpochTime)
-    T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
-    T_RESERVED4
-    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
-    for(i = CLOCKORBIT_NUMGPS;
-    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
-    {
-      T_GLONASS_SATELLITE_ID(co->Sat[i].ID)
-      T_GLONASS_IOD(co->Sat[i].IOD)
-      T_DELTA_RADIAL(co->Sat[i].Orbit.DeltaRadial)
-      T_DELTA_ALONG_TRACK(co->Sat[i].Orbit.DeltaAlongTrack)
-      T_DELTA_CROSS_TRACK(co->Sat[i].Orbit.DeltaCrossTrack)
-      T_DELTA_DOT_RADIAL(co->Sat[i].Orbit.DotDeltaRadial)
-      T_DELTA_DOT_ALONG_TRACK(co->Sat[i].Orbit.DotDeltaAlongTrack)
-      T_DELTA_DOT_CROSS_TRACK(co->Sat[i].Orbit.DotDeltaCrossTrack)
-      T_DELTA_CLOCK_C0(co->Sat[i].Clock.DeltaA0)
-      T_DELTA_CLOCK_C1(co->Sat[i].Clock.DeltaA1)
-      T_DELTA_CLOCK_C2(co->Sat[i].Clock.DeltaA2)
-    }
-    ENDBLOCK
-  }
-  if(glohr)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GLONASSHR)
-    T_GLONASS_EPOCH_TIME(co->GLONASSEpochTime)
-    T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_RESERVED5
-    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
-    for(i = CLOCKORBIT_NUMGPS;
-    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
-    {
-      T_GPS_SATELLITE_ID(co->Sat[i].ID)
-      T_HR_CLOCK_CORRECTION(co->Sat[i].hrclock)
-    }
-    ENDBLOCK
-  }
-  if(glour)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(COTYPE_GLONASSURA)
-    T_GLONASS_EPOCH_TIME(co->GLONASSEpochTime)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_RESERVED5
-    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
-    for(i = CLOCKORBIT_NUMGPS;
-    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
-    {
-      T_GPS_SATELLITE_ID(co->Sat[i].ID)
-      T_SSR_URA(ValueToURA(co->Sat[i].UserRangeAccuracy))
-    }
-    ENDBLOCK
-  }
-
-  return ressize;
-}
-
-size_t MakeBias(const struct Bias *b, enum BiasType type,
-int moremessagesfollow, char *buffer, size_t size)
-{
-  int gps=0, glo=0, mmi, i, j;
-
-  STARTDATA
-
-  if(b->NumberOfGPSSat && (type == BTYPE_AUTO || type == BTYPE_GPS))
-    gps = 1;
-  if(b->NumberOfGLONASSSat && (type == BTYPE_AUTO || type == BTYPE_GLONASS))
-    glo = 1;
-
-  mmi = gps+glo; /* required for multimessage */
-  if(!moremessagesfollow) --mmi;
-
-  if(gps)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(BTYPE_GPS)
-    T_GPS_EPOCH_TIME(b->GPSEpochTime)
-    T_SSR_UPDATE_INTERVAL(b->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_RESERVED5
-    T_NO_OF_SATELLITES(b->NumberOfGPSSat)
-    for(i = 0; i < b->NumberOfGPSSat; ++i)
-    {
-      T_GPS_SATELLITE_ID(b->Sat[i].ID)
-      T_NO_OF_CODE_BIASES(b->Sat[i].NumberOfCodeBiases)
-      for(j = 0; j < b->Sat[i].NumberOfCodeBiases; ++j)
-      {
-        T_GPS_SIGNAL_IDENTIFIER(b->Sat[i].Biases[j].Type)
-        T_CODE_BIAS(b->Sat[i].Biases[j].Bias)
-      }
-    }
-    ENDBLOCK
-  }
-  if(glo)
-  {
-    INITBLOCK
-    T_MESSAGE_NUMBER(BTYPE_GLONASS)
-    T_GPS_EPOCH_TIME(b->GLONASSEpochTime)
-    T_SSR_UPDATE_INTERVAL(b->UpdateInterval)
-    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
-    --mmi;
-    T_RESERVED5
-    T_NO_OF_SATELLITES(b->NumberOfGLONASSSat)
-    for(i = CLOCKORBIT_NUMGPS;
-    i < CLOCKORBIT_NUMGPS+b->NumberOfGLONASSSat; ++i)
-    {
-      T_GLONASS_SATELLITE_ID(b->Sat[i].ID)
-      T_NO_OF_CODE_BIASES(b->Sat[i].NumberOfCodeBiases)
-      for(j = 0; j < b->Sat[i].NumberOfCodeBiases; ++j)
-      {
-        T_GLONASS_SIGNAL_IDENTIFIER(b->Sat[i].Biases[j].Type)
-        T_CODE_BIAS(b->Sat[i].Biases[j].Bias)
-      }
-    }
-    ENDBLOCK
-  }
-
-  return ressize;
-}
-
-#endif /* NOENCODE */
-
-#ifndef NODECODE
-
-#define DECODESTART \
-  int numbits=0; \
-  uint64_t bitbuffer=0;
-
-#define LOADBITS(a) \
-{ \
-  while((a) > numbits) \
-  { \
-    if(!size--) return GCOBR_SHORTMESSAGE; \
-    bitbuffer = (bitbuffer<<8)|((unsigned char)*(buffer++)); \
-    numbits += 8; \
-  } \
-}
-
-/* extract bits from data stream
-   b = variable to store result, a = number of bits */
-#define GETBITS(b, a) \
-{ \
-  LOADBITS(a) \
-  b = (bitbuffer<<(64-numbits))>>(64-(a)); \
-  numbits -= (a); \
-}
-
-/* extract signed floating value from data stream
-   b = variable to store result, a = number of bits */
-#define GETFLOATSIGN(b, a, c) \
-{ \
-  LOADBITS(a) \
-  b = ((double)(((int64_t)(bitbuffer<<(64-numbits)))>>(64-(a))))*(c); \
-  numbits -= (a); \
-}
-
-#define SKIPBITS(b) { LOADBITS(b) numbits -= (b); }
-
-/* standard values */
-#define G_HEADER(a)                      GETBITS(a,8)
-#define G_RESERVEDH(a)                   GETBITS(a,6)
-#define G_SIZE(a)                        GETBITS(a, 10)
-#define G_MESSAGE_NUMBER(a)              GETBITS(a, 12) /* DF002 */
-#define G_RESERVED4                      SKIPBITS(4)    /* DF001 */
-#define G_RESERVED5                      SKIPBITS(5)    /* DF001 */
-#define G_GPS_SATELLITE_ID(a)            GETBITS(a, 6)  /* DF068 */
-#define G_GPS_IODE(a)                    GETBITS(a, 8)  /* DF071 */
-#define G_GLONASS_IOD(a)                 GETBITS(a, 8)  /* DF237 */
-
-/* defined values */
-#define G_DELTA_RADIAL(a)                GETFLOATSIGN(a, 22, 1/10000.0)
-#define G_DELTA_ALONG_TRACK(a)           GETFLOATSIGN(a, 20, 1/2500.0)
-#define G_DELTA_CROSS_TRACK(a)           GETFLOATSIGN(a, 20, 1/2500.0)
-#define G_DELTA_DOT_RADIAL(a)            GETFLOATSIGN(a, 21, 1/1000000.0)
-#define G_DELTA_DOT_ALONG_TRACK(a)       GETFLOATSIGN(a, 19, 1/250000.0)
-#define G_DELTA_DOT_CROSS_TRACK(a)       GETFLOATSIGN(a, 19, 1/250000.0)
-
-#define G_SATELLITE_REFERENCE_DATUM(a)   GETBITS(a, 1)
-#define G_DELTA_CLOCK_C0(a)              GETFLOATSIGN(a, 22, 1/10000.0)
-#define G_DELTA_CLOCK_C1(a)              GETFLOATSIGN(a, 21, 1/1000000.0)
-#define G_DELTA_CLOCK_C2(a)              GETFLOATSIGN(a, 27, 1/50000000.0)
-#define G_NO_OF_CODE_BIASES(a)           GETBITS(a, 5)
-#define G_GPS_SIGNAL_IDENTIFIER(a)       GETBITS(a, 5)
-#define G_GLONASS_SIGNAL_IDENTIFIER(a)   GETBITS(a, 5)
-#define G_CODE_BIAS(a)                   GETFLOATSIGN(a, 14, 1/100.0)
-#define G_GLONASS_SATELLITE_ID(a)        GETBITS(a, 5)
-
-#define G_GPS_EPOCH_TIME(a, b)           {int temp; GETBITS(temp, 20) \
- if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;}
-#define G_GLONASS_EPOCH_TIME(a, b)       {int temp; GETBITS(temp, 17) \
- if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;}
-#define G_NO_OF_SATELLITES(a)            GETBITS(a, 6)
-#define G_MULTIPLE_MESSAGE_INDICATOR(a)  GETBITS(a, 1)
-#define G_SSR_URA(a)                     {int temp; GETBITS(temp, 6) \
- (a) = URAToValue(temp);}
-#define G_HR_CLOCK_CORRECTION(a)         GETFLOATSIGN(a, 22, 1/10000.0)
-#define G_SSR_UPDATE_INTERVAL(a)         GETBITS(a, 4)
-
-enum GCOB_RETURN GetClockOrbitBias(struct ClockOrbit *co, struct Bias *b,
-const char *buffer, size_t size, int *bytesused)
-{
-  int type, mmi=0, i, j, h, rs, nums, pos, id;
-  size_t sizeofrtcmblock;
-  const char *blockstart = buffer;
-  DECODESTART
-
-  if(size < 7)
-    return GCOBR_SHORTBUFFER;
-
-#ifdef DEBUG
-fprintf(stderr, "GetClockOrbitBias START: size %d, numbits %d\n",size, numbits);
-#endif
-
-  G_HEADER(h)
-  G_RESERVEDH(rs)
-  G_SIZE(sizeofrtcmblock);
-
-  if((unsigned char)h != 0xD3 || rs)
-    return GCOBR_UNKNOWNDATA;
-  if(size < sizeofrtcmblock + 3) /* 3 header bytes already removed */
-    return GCOBR_MESSAGEEXCEEDSBUFFER;
-  if(CRC24(sizeofrtcmblock+3, (const unsigned char *) blockstart) !=
-  (uint32_t)((((unsigned char)buffer[sizeofrtcmblock])<<16)|
-   (((unsigned char)buffer[sizeofrtcmblock+1])<<8)|
-   (((unsigned char)buffer[sizeofrtcmblock+2]))))
-    return GCOBR_CRCMISMATCH;
-  size = sizeofrtcmblock; /* reduce size, so overflows are detected */
-
-  G_MESSAGE_NUMBER(type)
-#ifdef DEBUG
-fprintf(stderr, "type %d size %d\n",type,sizeofrtcmblock);
-#endif
-  switch(type)
-  {
-  case COTYPE_GPSORBIT:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GPSORBIT;
-    G_GPS_EPOCH_TIME(co->GPSEpochTime, co->NumberOfGPSSat)
-    co->epochGPS[co->epochSize] = co->GPSEpochTime;   /* Weber, for latency */
-    if(co->epochSize < 100) {co->epochSize += 1;}     /* Weber, for latency */
-    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
-    G_RESERVED4
-    G_NO_OF_SATELLITES(nums)
-    co->OrbitDataSupplied |= 1;
-#ifdef DEBUG
-fprintf(stderr, "epochtime %d ui %d mmi %d sats %d/%d rd %d\n",co->GPSEpochTime,
-co->UpdateInterval,mmi,co->NumberOfGPSSat,nums, co->SatRefDatum);
-#endif
-    for(i = 0; i < nums; ++i)
-    {
-      G_GPS_SATELLITE_ID(id)
-      for(pos = 0; pos < co->NumberOfGPSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS) return GCOBR_DATAMISMATCH;
-      else if(pos == co->NumberOfGPSSat) ++co->NumberOfGPSSat;
-      co->Sat[pos].ID = id;
-
-      G_GPS_IODE(co->Sat[pos].IOD)
-      G_DELTA_RADIAL(co->Sat[pos].Orbit.DeltaRadial)
-      G_DELTA_ALONG_TRACK(co->Sat[pos].Orbit.DeltaAlongTrack)
-      G_DELTA_CROSS_TRACK(co->Sat[pos].Orbit.DeltaCrossTrack)
-      G_DELTA_DOT_RADIAL(co->Sat[pos].Orbit.DotDeltaRadial)
-      G_DELTA_DOT_ALONG_TRACK(co->Sat[pos].Orbit.DotDeltaAlongTrack)
-      G_DELTA_DOT_CROSS_TRACK(co->Sat[pos].Orbit.DotDeltaCrossTrack)
-#ifdef DEBUG
-fprintf(stderr, "id %2d iod %3d dr %8.3f da %8.3f dc %8.3f dr %8.3f da %8.3f dc %8.3f\n",
-co->Sat[pos].ID,co->Sat[pos].IOD,co->Sat[pos].Orbit.DeltaRadial,
-co->Sat[pos].Orbit.DeltaAlongTrack,co->Sat[pos].Orbit.DeltaCrossTrack,
-co->Sat[pos].Orbit.DotDeltaRadial,
-co->Sat[pos].Orbit.DotDeltaAlongTrack,
-co->Sat[pos].Orbit.DotDeltaCrossTrack);
-#endif
-    }
-    break;
-  case COTYPE_GPSCLOCK:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GPSCLOCK;
-    G_GPS_EPOCH_TIME(co->GPSEpochTime, co->NumberOfGPSSat)
-    co->epochGPS[co->epochSize] = co->GPSEpochTime;   /* Weber, for latency */
-    if(co->epochSize < 100) {co->epochSize += 1;}     /* Weber, for latency */
-    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_RESERVED5
-    G_NO_OF_SATELLITES(nums)
-    co->ClockDataSupplied |= 1;
-#ifdef DEBUG
-fprintf(stderr, "epochtime %d ui %d mmi %d sats %d/%d\n",co->GPSEpochTime,
-co->UpdateInterval,mmi,co->NumberOfGPSSat,nums);
-#endif
-    for(i = 0; i < nums; ++i)
-    {
-      G_GPS_SATELLITE_ID(id)
-      for(pos = 0; pos < co->NumberOfGPSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS) return GCOBR_DATAMISMATCH;
-      else if(pos == co->NumberOfGPSSat) ++co->NumberOfGPSSat;
-      co->Sat[pos].ID = id;
-
-      G_DELTA_CLOCK_C0(co->Sat[pos].Clock.DeltaA0)
-      G_DELTA_CLOCK_C1(co->Sat[pos].Clock.DeltaA1)
-      G_DELTA_CLOCK_C2(co->Sat[pos].Clock.DeltaA2)
-#ifdef DEBUG
-fprintf(stderr, "id %2d c0 %8.3f c1 %8.3f c2 %8.3f\n",
-co->Sat[pos].ID, co->Sat[pos].Clock.DeltaA0, co->Sat[pos].Clock.DeltaA1,
-co->Sat[pos].Clock.DeltaA2);
-#endif
-    }
-    break;
-  case COTYPE_GPSCOMBINED:
-    if(!co) return -5;
-    co->messageType = COTYPE_GPSCOMBINED;
-    G_GPS_EPOCH_TIME(co->GPSEpochTime, co->NumberOfGPSSat)
-    co->epochGPS[co->epochSize] = co->GPSEpochTime;   /* Weber, for latency */
-    if(co->epochSize < 100) {co->epochSize += 1;}     /* Weber, for latency */
-    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
-    G_RESERVED4
-    G_NO_OF_SATELLITES(nums)
-    co->OrbitDataSupplied |= 1;
-    co->ClockDataSupplied |= 1;
-    for(i = 0; i < nums; ++i)
-    {
-      G_GPS_SATELLITE_ID(id)
-      for(pos = 0; pos < co->NumberOfGPSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS) return GCOBR_DATAMISMATCH;
-      else if(pos == co->NumberOfGPSSat) ++co->NumberOfGPSSat;
-      co->Sat[pos].ID = id;
-
-      G_GPS_IODE(co->Sat[pos].IOD)
-      G_DELTA_RADIAL(co->Sat[pos].Orbit.DeltaRadial)
-      G_DELTA_ALONG_TRACK(co->Sat[pos].Orbit.DeltaAlongTrack)
-      G_DELTA_CROSS_TRACK(co->Sat[pos].Orbit.DeltaCrossTrack)
-      G_DELTA_DOT_RADIAL(co->Sat[pos].Orbit.DotDeltaRadial)
-      G_DELTA_DOT_ALONG_TRACK(co->Sat[pos].Orbit.DotDeltaAlongTrack)
-      G_DELTA_DOT_CROSS_TRACK(co->Sat[pos].Orbit.DotDeltaCrossTrack)
-      G_DELTA_CLOCK_C0(co->Sat[pos].Clock.DeltaA0)
-      G_DELTA_CLOCK_C1(co->Sat[pos].Clock.DeltaA1)
-      G_DELTA_CLOCK_C2(co->Sat[pos].Clock.DeltaA2)
-    }
-    break;
-  case COTYPE_GPSURA:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GPSURA;
-    G_GPS_EPOCH_TIME(co->GPSEpochTime, co->NumberOfGPSSat)
-    co->epochGPS[co->epochSize] = co->GPSEpochTime;   /* Weber, for latency */
-    if(co->epochSize < 100) {co->epochSize += 1;}     /* Weber, for latency */
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_RESERVED5
-    G_NO_OF_SATELLITES(nums)
-    co->URADataSupplied |= 1;
-    for(i = 0; i < nums; ++i)
-    {
-      G_GPS_SATELLITE_ID(id)
-      for(pos = 0; pos < co->NumberOfGPSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS) return GCOBR_DATAMISMATCH;
-      else if(pos == co->NumberOfGPSSat) ++co->NumberOfGPSSat;
-      co->Sat[pos].ID = id;
-
-      G_SSR_URA(co->Sat[pos].UserRangeAccuracy)
-    }
-    break;
-  case COTYPE_GPSHR:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GPSHR;
-    G_GPS_EPOCH_TIME(co->GPSEpochTime, co->NumberOfGPSSat)
-    co->epochGPS[co->epochSize] = co->GPSEpochTime;   /* Weber, for latency */
-    if(co->epochSize < 100) {co->epochSize += 1;}     /* Weber, for latency */
-    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_RESERVED5
-    G_NO_OF_SATELLITES(nums)
-    co->HRDataSupplied |= 1;
-    for(i = 0; i < nums; ++i)
-    {
-      G_GPS_SATELLITE_ID(id)
-      for(pos = 0; pos < co->NumberOfGPSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS) return GCOBR_DATAMISMATCH;
-      else if(pos == co->NumberOfGPSSat) ++co->NumberOfGPSSat;
-      co->Sat[pos].ID = id;
-
-      G_HR_CLOCK_CORRECTION(co->Sat[pos].hrclock)
-    }
-    break;
-  case COTYPE_GLONASSORBIT:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GLONASSORBIT;
-    G_GLONASS_EPOCH_TIME(co->GLONASSEpochTime, co->NumberOfGLONASSSat)
-    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
-    G_RESERVED4
-    G_NO_OF_SATELLITES(nums)
-    co->OrbitDataSupplied |= 2;
-#ifdef DEBUG
-fprintf(stderr, "epochtime %d ui %d mmi %d sats %d/%d rd %d\n",co->GLONASSEpochTime,
-co->UpdateInterval,mmi,co->NumberOfGLONASSSat,nums, co->SatRefDatum);
-#endif
-    for(i = 0; i < nums; ++i)
-    {
-      G_GLONASS_SATELLITE_ID(id)
-      for(pos = CLOCKORBIT_NUMGPS; pos < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS+CLOCKORBIT_NUMGLONASS) return GCOBR_DATAMISMATCH;
-      else if(pos == CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat) ++co->NumberOfGLONASSSat;
-      co->Sat[pos].ID = id;
-
-      G_GLONASS_IOD(co->Sat[pos].IOD)
-      G_DELTA_RADIAL(co->Sat[pos].Orbit.DeltaRadial)
-      G_DELTA_ALONG_TRACK(co->Sat[pos].Orbit.DeltaAlongTrack)
-      G_DELTA_CROSS_TRACK(co->Sat[pos].Orbit.DeltaCrossTrack)
-      G_DELTA_DOT_RADIAL(co->Sat[pos].Orbit.DotDeltaRadial)
-      G_DELTA_DOT_ALONG_TRACK(co->Sat[pos].Orbit.DotDeltaAlongTrack)
-      G_DELTA_DOT_CROSS_TRACK(co->Sat[pos].Orbit.DotDeltaCrossTrack)
-#ifdef DEBUG
-fprintf(stderr, "id %2d iod %3d dr %8.3f da %8.3f dc %8.3f dr %8.3f da %8.3f dc %8.3f\n",
-co->Sat[pos].ID,co->Sat[pos].IOD,co->Sat[pos].Orbit.DeltaRadial,
-co->Sat[pos].Orbit.DeltaAlongTrack,co->Sat[pos].Orbit.DeltaCrossTrack,
-co->Sat[pos].Orbit.DotDeltaRadial,
-co->Sat[pos].Orbit.DotDeltaAlongTrack,
-co->Sat[pos].Orbit.DotDeltaCrossTrack);
-#endif
-    }
-    break;
-  case COTYPE_GLONASSCLOCK:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GLONASSCLOCK;
-    G_GLONASS_EPOCH_TIME(co->GLONASSEpochTime, co->NumberOfGLONASSSat)
-    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_RESERVED5
-    G_NO_OF_SATELLITES(nums)
-    co->ClockDataSupplied |= 2;
-#ifdef DEBUG
-fprintf(stderr, "epochtime %d ui %d mmi %d sats %d/%d\n",co->GLONASSEpochTime,
-co->UpdateInterval,mmi,co->NumberOfGLONASSSat,nums);
-#endif
-    for(i = 0; i < nums; ++i)
-    {
-      G_GLONASS_SATELLITE_ID(id)
-      for(pos = CLOCKORBIT_NUMGPS; pos < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS+CLOCKORBIT_NUMGLONASS) return GCOBR_DATAMISMATCH;
-      else if(pos == CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat) ++co->NumberOfGLONASSSat;
-      co->Sat[pos].ID = id;
-
-      G_DELTA_CLOCK_C0(co->Sat[pos].Clock.DeltaA0)
-      G_DELTA_CLOCK_C1(co->Sat[pos].Clock.DeltaA1)
-      G_DELTA_CLOCK_C2(co->Sat[pos].Clock.DeltaA2)
-#ifdef DEBUG
-fprintf(stderr, "id %2d c0 %8.3f c1 %8.3f c2 %8.3f\n",
-co->Sat[pos].ID, co->Sat[pos].Clock.DeltaA0, co->Sat[pos].Clock.DeltaA1,
-co->Sat[pos].Clock.DeltaA2);
-#endif
-    }
-    break;
-  case COTYPE_GLONASSCOMBINED:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GLONASSCOMBINED;
-    G_GLONASS_EPOCH_TIME(co->GLONASSEpochTime, co->NumberOfGLONASSSat)
-    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
-    G_RESERVED4
-    G_NO_OF_SATELLITES(nums)
-    co->OrbitDataSupplied |= 2;
-    co->ClockDataSupplied |= 2;
-    for(i = 0; i < nums; ++i)
-    {
-      G_GLONASS_SATELLITE_ID(id)
-      for(pos = CLOCKORBIT_NUMGPS; pos < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS+CLOCKORBIT_NUMGLONASS) return GCOBR_DATAMISMATCH;
-      else if(pos == CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat) ++co->NumberOfGLONASSSat;
-      co->Sat[pos].ID = id;
-
-      G_GLONASS_IOD(co->Sat[pos].IOD)
-      G_DELTA_RADIAL(co->Sat[pos].Orbit.DeltaRadial)
-      G_DELTA_ALONG_TRACK(co->Sat[pos].Orbit.DeltaAlongTrack)
-      G_DELTA_CROSS_TRACK(co->Sat[pos].Orbit.DeltaCrossTrack)
-      G_DELTA_DOT_RADIAL(co->Sat[pos].Orbit.DotDeltaRadial)
-      G_DELTA_DOT_ALONG_TRACK(co->Sat[pos].Orbit.DotDeltaAlongTrack)
-      G_DELTA_DOT_CROSS_TRACK(co->Sat[pos].Orbit.DotDeltaCrossTrack)
-      G_DELTA_CLOCK_C0(co->Sat[pos].Clock.DeltaA0)
-      G_DELTA_CLOCK_C1(co->Sat[pos].Clock.DeltaA1)
-      G_DELTA_CLOCK_C2(co->Sat[pos].Clock.DeltaA2)
-    }
-    break;
-  case COTYPE_GLONASSURA:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GLONASSURA;
-    G_GLONASS_EPOCH_TIME(co->GLONASSEpochTime, co->NumberOfGLONASSSat)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_RESERVED5
-    G_NO_OF_SATELLITES(nums)
-    co->URADataSupplied |= 2;
-    for(i = 0; i < nums; ++i)
-    {
-      G_GLONASS_SATELLITE_ID(id)
-      for(pos = CLOCKORBIT_NUMGPS; pos < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS+CLOCKORBIT_NUMGLONASS) return GCOBR_DATAMISMATCH;
-      else if(pos == CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat) ++co->NumberOfGLONASSSat;
-      co->Sat[pos].ID = id;
-
-      G_SSR_URA(co->Sat[pos].UserRangeAccuracy)
-    }
-    break;
-  case COTYPE_GLONASSHR:
-    if(!co) return GCOBR_NOCLOCKORBITPARAMETER;
-    co->messageType = COTYPE_GLONASSHR;
-    G_GLONASS_EPOCH_TIME(co->GLONASSEpochTime, co->NumberOfGLONASSSat)
-    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_RESERVED5
-    G_NO_OF_SATELLITES(nums)
-    co->HRDataSupplied |= 2;
-    for(i = 0; i < nums; ++i)
-    {
-      G_GLONASS_SATELLITE_ID(id)
-      for(pos = CLOCKORBIT_NUMGPS; pos < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat && co->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS+CLOCKORBIT_NUMGLONASS) return GCOBR_DATAMISMATCH;
-      else if(pos == CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat) ++co->NumberOfGLONASSSat;
-      co->Sat[pos].ID = id;
-
-      G_HR_CLOCK_CORRECTION(co->Sat[pos].hrclock)
-    }
-    break;
-  case BTYPE_GPS:
-    if(!b) return GCOBR_NOBIASPARAMETER;
-    b->messageType = BTYPE_GPS;
-    G_GPS_EPOCH_TIME(b->GPSEpochTime, b->NumberOfGPSSat)
-    G_SSR_UPDATE_INTERVAL(b->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_RESERVED5
-    G_NO_OF_SATELLITES(nums)
-    for(i = 0; i < nums; ++i)
-    {
-      G_GPS_SATELLITE_ID(id)
-      for(pos = 0; pos < b->NumberOfGPSSat && b->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS) return GCOBR_DATAMISMATCH;
-      else if(pos == b->NumberOfGPSSat) ++b->NumberOfGPSSat;
-      b->Sat[pos].ID = id;
-
-      G_NO_OF_CODE_BIASES(b->Sat[pos].NumberOfCodeBiases)
-      for(j = 0; j < b->Sat[pos].NumberOfCodeBiases; ++j)
-      {
-        G_GPS_SIGNAL_IDENTIFIER(b->Sat[pos].Biases[j].Type)
-        G_CODE_BIAS(b->Sat[pos].Biases[j].Bias)
-      }
-    }
-    break;
-  case BTYPE_GLONASS:
-    if(!b) return GCOBR_NOBIASPARAMETER;
-    b->messageType = BTYPE_GLONASS;
-    G_GLONASS_EPOCH_TIME(b->GLONASSEpochTime, b->NumberOfGLONASSSat)
-    G_SSR_UPDATE_INTERVAL(b->UpdateInterval)
-    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
-    G_RESERVED5
-    G_NO_OF_SATELLITES(nums)
-    for(i = 0; i < nums; ++i)
-    {
-      G_GLONASS_SATELLITE_ID(id)
-      for(pos = CLOCKORBIT_NUMGPS; pos < b->NumberOfGLONASSSat && b->Sat[pos].ID != id; ++pos)
-        ;
-      if(pos >= CLOCKORBIT_NUMGPS+CLOCKORBIT_NUMGLONASS) return GCOBR_DATAMISMATCH;
-      else if(pos == b->NumberOfGLONASSSat) ++b->NumberOfGLONASSSat;
-      b->Sat[pos].ID = id;
-
-      G_NO_OF_CODE_BIASES(b->Sat[pos].NumberOfCodeBiases)
-      for(j = 0; j < b->Sat[pos].NumberOfCodeBiases; ++j)
-      {
-        G_GLONASS_SIGNAL_IDENTIFIER(b->Sat[pos].Biases[j].Type)
-        G_CODE_BIAS(b->Sat[pos].Biases[j].Bias)
-      }
-    }
-    break;
-  default:
-    if(bytesused)
-      *bytesused = sizeofrtcmblock+6;
-    return GCOBR_UNKNOWNTYPE;
-  }
-#ifdef DEBUG
-for(type = 0; type < (int)size && (unsigned char)buffer[type] != 0xD3; ++type)
-  numbits += 8;
-fprintf(stderr, "numbits left %d\n",numbits);
-#endif
-  if(bytesused)
-    *bytesused = sizeofrtcmblock+6;
-  return mmi ? GCOBR_MESSAGEFOLLOWS : GCOBR_OK;
-}
-#endif /* NODECODE */
Index: trunk/BNC/RTCM3/clock_orbit_rtcm.h
===================================================================
--- trunk/BNC/RTCM3/clock_orbit_rtcm.h	(revision 2491)
+++ 	(revision )
@@ -1,151 +1,0 @@
-#ifndef RTCM3_CLOCK_ORBIT_RTCM_H
-#define RTCM3_CLOCK_ORBIT_RTCM_H
-
-/* Programheader
-
-        Name:           clock_orbit_rtcm.h
-        Project:        RTCM3
-        Version:        $Id: clock_orbit_rtcm.h,v 1.9 2010/04/16 06:14:00 stoecker Exp $
-        Authors:        Dirk Stöcker
-        Description:    state space approach for RTCM3
-*/
-
-#include <string.h>
-
-enum SatelliteReferenceDatum { DATUM_ITRF=0, DATUM_LOCAL=1 };
-enum ClockOrbitType {
-     COTYPE_GPSORBIT=1057, COTYPE_GPSCLOCK=1058,
-     COTYPE_GPSCOMBINED=1060, COTYPE_GPSURA=1061, COTYPE_GPSHR=1062,
-
-     COTYPE_GLONASSORBIT=1063, COTYPE_GLONASSCLOCK=1064,
-     COTYPE_GLONASSCOMBINED=1066, COTYPE_GLONASSURA=1067, COTYPE_GLONASSHR=1068,
-
-     COTYPE_AUTO=0 };
-enum BiasType { BTYPE_GPS=1059, BTYPE_GLONASS=1065, BTYPE_AUTO = 0 };
-
-enum COR_CONSTANTS {
-  CLOCKORBIT_BUFFERSIZE=2048,
-  CLOCKORBIT_NUMGPS=32,
-  CLOCKORBIT_NUMGLONASS=24,
-  CLOCKORBIT_NUMBIAS=10
-};
-
-enum CodeType {
-  CODETYPEGPS_L1_CA          = 0,
-  CODETYPEGPS_L1_P           = 1,
-  CODETYPEGPS_L1_Z           = 2,
-  CODETYPEGPS_SEMI_CODELESS  = 6,
-  CODETYPEGPS_L2_CM          = 7,
-  CODETYPEGPS_L2_CL          = 8,
-  CODETYPEGPS_L2_CML         = 9,
-  CODETYPEGPS_L2_P           = 10,
-  CODETYPEGPS_L2_Z           = 11,
-  CODETYPEGPS_L2_Y           = 12,
-  CODETYPEGPS_L2_M           = 13,
-  CODETYPEGPS_L2_I           = 14,
-  CODETYPEGPS_L2_Q           = 15,
-  CODETYPEGPS_L2_IQ          = 16,
-
-  CODETYPEGLONASS_L1_CA      = 0,
-  CODETYPEGLONASS_L1_P       = 1,
-  CODETYPEGLONASS_L2_CA      = 2,
-  CODETYPEGLONASS_L2_P       = 3,
-};
-
-#define SSR_MAXURA 5.5 /* > 5466.5mm in meter */
-
-/* GLONASS data is stored with offset CLOCKORBIT_NUMGPS in the data structures.
-So first GLONASS satellite is at xxx->Sat[CLOCKORBIT_NUMGPS], first
-GPS satellite is xxx->Sat[0]. */
-
-struct ClockOrbit
-{
-  enum ClockOrbitType messageType;
-  int GPSEpochTime;                 /* 0 .. 604799 s */
-  int GLONASSEpochTime;             /* 0 .. 86399 s (86400 for leap second) */
-  int NumberOfGPSSat;               /* 0 .. 32 */
-  int NumberOfGLONASSSat;           /* 0 .. 24 */
-  int ClockDataSupplied;            /* boolean */
-  int HRDataSupplied;               /* boolean */
-  int OrbitDataSupplied;            /* boolean */
-  int URADataSupplied;              /* boolean */
-  int epochGPS[101];                /* Weber, for latency */
-  int epochSize;                    /* Weber, for latency */
-  int UpdateInterval;
-  enum SatelliteReferenceDatum SatRefDatum;
-  struct SatData {
-    int ID; /* GPS or GLONASS */
-    int IOD; /* GPS or GLONASS */
-    double UserRangeAccuracy; /* accuracy values in [m] */
-    double hrclock;
-    struct OrbitPart
-    {
-      double DeltaRadial;           /* m */
-      double DeltaAlongTrack;       /* m */
-      double DeltaCrossTrack;       /* m */
-      double DotDeltaRadial;        /* m/s */
-      double DotDeltaAlongTrack;    /* m/s */
-      double DotDeltaCrossTrack;    /* m/s */
-    } Orbit;
-    struct ClockPart
-    {
-      double DeltaA0;               /* m */
-      double DeltaA1;               /* m/s */
-      double DeltaA2;               /* m/ss */
-    } Clock;
-  } Sat[CLOCKORBIT_NUMGPS+CLOCKORBIT_NUMGLONASS];
-};
-
-struct Bias
-{
-  enum BiasType messageType;
-  int GPSEpochTime;                 /* 0 .. 604799 s */
-  int GLONASSEpochTime;             /* 0 .. 86399 s (86400 for leap second) */
-  int NumberOfGPSSat;               /* 0 .. 32 */
-  int NumberOfGLONASSSat;           /* 0 .. 24 */
-  int UpdateInterval;
-  struct BiasSat
-  {
-    int ID; /* GPS or GLONASS */
-    int NumberOfCodeBiases;
-    struct CodeBias
-    {
-      enum CodeType Type;
-      float         Bias;           /* m */
-    } Biases[CLOCKORBIT_NUMBIAS];
-  } Sat[CLOCKORBIT_NUMGPS+CLOCKORBIT_NUMGLONASS];
-};
-
-/* return size of resulting data or 0 in case of an error */
-size_t MakeClockOrbit(const struct ClockOrbit *co, enum ClockOrbitType type,
-       int moremessagesfollow, char *buffer, size_t size);
-size_t MakeBias(const struct Bias *b, enum BiasType type,
-       int moremessagesfollow, char *buffer, size_t size);
-
-enum GCOB_RETURN {
-  /* all well */
-  GCOBR_MESSAGEFOLLOWS = 1,
-  GCOBR_OK = 0,
-  /* unknown data, a warning */
-  GCOBR_UNKNOWNTYPE = -1,
-  GCOBR_UNKNOWNDATA = -2,
-  GCOBR_CRCMISMATCH = -3,
-  GCOBR_SHORTMESSAGE = -4,
-  /* failed to do the work */
-  GCOBR_NOCLOCKORBITPARAMETER = -10,
-  GCOBR_NOBIASPARAMETER = -11,
-  /* data mismatch - data in storage does not match new data */
-  GCOBR_TIMEMISMATCH = -20,
-  GCOBR_DATAMISMATCH = -21,
-  /* not enough data - can decode the block completely */
-  GCOBR_SHORTBUFFER = -30,
-  GCOBR_MESSAGEEXCEEDSBUFFER = -31};
-
-/* NOTE: When an error message has been emitted, the output structures may have been modified. Make a copy of the previous variant before calling the
-function to have a clean state. */
-
-/* buffer should point to a RTCM3 block */
-enum GCOB_RETURN GetClockOrbitBias(struct ClockOrbit *co, struct Bias *b,
-       const char *buffer, size_t size, int *bytesused);
-
-#endif /* RTCM3_CLOCK_ORBIT_RTCM_H */
Index: trunk/BNC/RTCM3/ephemeris.h
===================================================================
--- trunk/BNC/RTCM3/ephemeris.h	(revision 2491)
+++ trunk/BNC/RTCM3/ephemeris.h	(revision 2492)
@@ -7,5 +7,5 @@
 #include <string>
 extern "C" {
-#include "RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 }
 
Index: trunk/BNC/RTCM3/rtcm3torinex.c
===================================================================
--- trunk/BNC/RTCM3/rtcm3torinex.c	(revision 2491)
+++ 	(revision )
@@ -1,2638 +1,0 @@
-/*
-  Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.39 2010/03/05 11:11:06 stoecker Exp $
-  Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
-
-  This software is a complete NTRIP-RTCM3 to RINEX converter as well as
-  a module of the BNC tool for multiformat conversion. Contact Dirk
-  Stöcker for suggestions and bug reports related to the RTCM3 to RINEX
-  conversion problems and the author of BNC for all the other problems.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  or read http://www.gnu.org/licenses/gpl.txt
-*/
-
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-
-#ifndef NO_RTCM3_MAIN
-#include <getopt.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#endif
-
-#ifndef sparc
-#include <stdint.h>
-#endif
-
-#ifndef isinf
-#define isinf(x) 0
-#endif
-
-#include "rtcm3torinex.h"
-
-/* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.39 $";
-
-#ifndef COMPILEDATE
-#define COMPILEDATE " built " __DATE__
-#endif
-
-static uint32_t CRC24(long size, const unsigned char *buf)
-{
-  uint32_t crc = 0;
-  int i;
-
-  while(size--)
-  {
-    crc ^= (*buf++) << (16);
-    for(i = 0; i < 8; i++)
-    {
-      crc <<= 1;
-      if(crc & 0x1000000)
-        crc ^= 0x01864cfb;
-    }
-  }
-  return crc;
-}
-
-static int GetMessage(struct RTCM3ParserData *handle)
-{
-  unsigned char *m, *e;
-  int i;
-
-  m = handle->Message+handle->SkipBytes;
-  e = handle->Message+handle->MessageSize;
-  handle->NeedBytes = handle->SkipBytes = 0;
-  while(e-m >= 3)
-  {
-    if(m[0] == 0xD3)
-    {
-      handle->size = ((m[1]&3)<<8)|m[2];
-      if(e-m >= handle->size+6)
-      {
-        if((uint32_t)((m[3+handle->size]<<16)|(m[3+handle->size+1]<<8)
-        |(m[3+handle->size+2])) == CRC24(handle->size+3, m))
-        {
-          handle->SkipBytes = handle->size;
-          break;
-        }
-        else
-          ++m;
-      }
-      else
-      {
-        handle->NeedBytes = handle->size+6;
-        break;
-      }
-    }
-    else
-      ++m;
-  }
-  if(e-m < 3)
-    handle->NeedBytes = 3;
-
-  /* copy buffer to front */
-  i = m - handle->Message;
-  if(i && m < e)
-    memmove(handle->Message, m, (size_t)(handle->MessageSize-i));
-  handle->MessageSize -= i;
-
-  return !handle->NeedBytes;
-}
-
-#define LOADBITS(a) \
-{ \
-  while((a) > numbits) \
-  { \
-    if(!size--) break; \
-    bitfield = (bitfield<<8)|*(data++); \
-    numbits += 8; \
-  } \
-}
-
-/* extract bits from data stream
-   b = variable to store result, a = number of bits */
-#define GETBITS(b, a) \
-{ \
-  LOADBITS(a) \
-  b = (bitfield<<(64-numbits))>>(64-(a)); \
-  numbits -= (a); \
-}
-
-/* extract floating value from data stream
-   b = variable to store result, a = number of bits */
-#define GETFLOAT(b, a, c) \
-{ \
-  LOADBITS(a) \
-  b = ((double)((bitfield<<(64-numbits))>>(64-(a))))*(c); \
-  numbits -= (a); \
-}
-
-/* extract signed floating value from data stream
-   b = variable to store result, a = number of bits */
-#define GETFLOATSIGN(b, a, c) \
-{ \
-  LOADBITS(a) \
-  b = ((double)(((int64_t)(bitfield<<(64-numbits)))>>(64-(a))))*(c); \
-  numbits -= (a); \
-}
-
-/* extract bits from data stream
-   b = variable to store result, a = number of bits */
-#define GETBITSSIGN(b, a) \
-{ \
-  LOADBITS(a) \
-  b = ((int64_t)(bitfield<<(64-numbits)))>>(64-(a)); \
-  numbits -= (a); \
-}
-
-#define GETFLOATSIGNM(b, a, c) \
-{ int l; \
-  LOADBITS(a) \
-  l = (bitfield<<(64-numbits))>>(64-1); \
-  b = ((double)(((bitfield<<(64-(numbits-1))))>>(64-(a-1))))*(c); \
-  numbits -= (a); \
-  if(l) b *= -1.0; \
-}
-
-#define SKIPBITS(b) { LOADBITS(b) numbits -= (b); }
-
-/* extract byte-aligned byte from data stream,
-   b = variable to store size, s = variable to store string pointer */
-#define GETSTRING(b, s) \
-{ \
-  b = *(data++); \
-  s = (char *) data; \
-  data += b; \
-  size -= b+1; \
-}
-
-struct leapseconds { /* specify the day of leap second */
-  int day;        /* this is the day, where 23:59:59 exists 2 times */
-  int month;      /* not the next day! */
-  int year;
-  int taicount;
-};
-static const int months[13] = {0,31,28,31,30,31,30,31,31,30,31,30,31};
-static const struct leapseconds leap[] = {
-/*{31, 12, 1971, 11},*/
-/*{31, 12, 1972, 12},*/
-/*{31, 12, 1973, 13},*/
-/*{31, 12, 1974, 14},*/
-/*{31, 12, 1975, 15},*/
-/*{31, 12, 1976, 16},*/
-/*{31, 12, 1977, 17},*/
-/*{31, 12, 1978, 18},*/
-/*{31, 12, 1979, 19},*/
-{30, 06, 1981,20},
-{30, 06, 1982,21},
-{30, 06, 1983,22},
-{30, 06, 1985,23},
-{31, 12, 1987,24},
-{31, 12, 1989,25},
-{31, 12, 1990,26},
-{30, 06, 1992,27},
-{30, 06, 1993,28},
-{30, 06, 1994,29},
-{31, 12, 1995,30},
-{30, 06, 1997,31},
-{31, 12, 1998,32},
-{31, 12, 2005,33},
-{31, 12, 2008,34},
-{0,0,0,0} /* end marker */
-};
-#define LEAPSECONDS     14 /* only needed for approx. time */
-#define GPSLEAPSTART    19 /* 19 leap seconds existed at 6.1.1980 */
-
-static int longyear(int year, int month)
-{
-  if(!(year % 4) && (!(year % 400) || (year % 100)))
-  {
-    if(!month || month == 2)
-      return 1;
-  }
-  return 0;
-}
-
-int gnumleap(int year, int month, int day)
-{
-  int ls = 0;
-  const struct leapseconds *l;
-
-  for(l = leap; l->taicount && year >= l->year; ++l)
-  {
-    if(year > l->year || month > l->month || (month == l->month && day > l->day))
-       ls = l->taicount - GPSLEAPSTART;
-  }
-  return ls;
-}
-
-/* Convert Moscow time into UTC (fixnumleap == 1) or GPS (fixnumleap == 0) */
-void updatetime(int *week, int *secOfWeek, int mSecOfWeek, int fixnumleap)
-{
-  int y,m,d,k,l, nul;
-  unsigned int j = *week*(7*24*60*60) + *secOfWeek + 5*24*60*60+3*60*60;
-  int glo_daynumber = 0, glo_timeofday;
-  for(y = 1980; j >= (unsigned int)(k = (l = (365+longyear(y,0)))*24*60*60)
-  + gnumleap(y+1,1,1); ++y)
-  {
-    j -= k; glo_daynumber += l;
-  }
-  for(m = 1; j >= (unsigned int)(k = (l = months[m]+longyear(y, m))*24*60*60)
-  + gnumleap(y, m+1, 1); ++m)
-  {
-    j -= k; glo_daynumber += l;
-  }
-  for(d = 1; j >= 24UL*60UL*60UL + gnumleap(y, m, d+1); ++d)
-    j -= 24*60*60;
-  glo_daynumber -= 16*365+4-d;
-  nul = gnumleap(y, m, d);
-  glo_timeofday = j-nul;
-
-  if(mSecOfWeek < 5*60*1000 && glo_timeofday > 23*60*60)
-    *secOfWeek += 24*60*60;
-  else if(glo_timeofday < 5*60 && mSecOfWeek > 23*60*60*1000)
-    *secOfWeek -= 24*60*60;
-  *secOfWeek += mSecOfWeek/1000-glo_timeofday;
-  if(fixnumleap)
-    *secOfWeek -= nul;
-  if(*secOfWeek < 0) {*secOfWeek += 24*60*60*7; --*week; }
-  if(*secOfWeek >= 24*60*60*7) {*secOfWeek -= 24*60*60*7; ++*week; }
-}
-
-int RTCM3Parser(struct RTCM3ParserData *handle)
-{
-  int ret=0;
-
-#ifdef NO_RTCM3_MAIN
-  if(GetMessage(handle)) /* don't repeat */
-#else
-  while(!ret && GetMessage(handle))
-#endif /* NO_RTCM3_MAIN */
-  {
-    /* using 64 bit integer types, as it is much easier than handling
-    the long datatypes in 32 bit */
-    uint64_t numbits = 0, bitfield = 0;
-    int size = handle->size, type;
-    int syncf, old = 0;
-    unsigned char *data = handle->Message+3;
-
-    GETBITS(type,12)
-#ifdef NO_RTCM3_MAIN
-    handle->blocktype = type;
-#endif /* NO_RTCM3_MAIN */
-    switch(type)
-    {
-#ifdef NO_RTCM3_MAIN
-    default:
-      ret = type;
-      break;
-    case 1005: case 1006:
-      {
-        SKIPBITS(22)
-        GETBITSSIGN(handle->antX, 38)
-        SKIPBITS(2)
-        GETBITSSIGN(handle->antY, 38)
-        SKIPBITS(2)
-        GETBITSSIGN(handle->antZ, 38)
-        if(type == 1006)
-          GETBITS(handle->antH, 16)
-        ret = type;
-      }
-      break;
-    case 1007: case 1008: case 1033:
-      {
-        char *antenna;
-        int antnum;
-
-        SKIPBITS(12)
-        GETSTRING(antnum,antenna)
-        memcpy(handle->antenna, antenna, antnum);
-        handle->antenna[antnum] = 0;
-        ret = type;
-      }
-      break;
-#endif /* NO_RTCM3_MAIN */
-    case 1019:
-      {
-        struct gpsephemeris *ge;
-        int sv;
-
-        ge = &handle->ephemerisGPS;
-        memset(ge, 0, sizeof(*ge));
-
-        GETBITS(sv, 6)
-        ge->satellite = (sv < 40 ? sv : sv+80);
-        GETBITS(ge->GPSweek, 10)
-        ge->GPSweek += 1024;
-        GETBITS(ge->URAindex, 4)
-        GETBITS(sv, 2)
-        if(sv & 1)
-          ge->flags |= GPSEPHF_L2PCODE;
-        if(sv & 2)
-          ge->flags |= GPSEPHF_L2CACODE;
-        GETFLOATSIGN(ge->IDOT, 14, R2R_PI/(double)(1<<30)/(double)(1<<13))
-        GETBITS(ge->IODE, 8)
-        GETBITS(ge->TOC, 16)
-        ge->TOC <<= 4;
-        GETFLOATSIGN(ge->clock_driftrate, 8, 1.0/(double)(1<<30)/(double)(1<<25))
-        GETFLOATSIGN(ge->clock_drift, 16, 1.0/(double)(1<<30)/(double)(1<<13))
-        GETFLOATSIGN(ge->clock_bias, 22, 1.0/(double)(1<<30)/(double)(1<<1))
-        GETBITS(ge->IODC, 10)
-        GETFLOATSIGN(ge->Crs, 16, 1.0/(double)(1<<5))
-        GETFLOATSIGN(ge->Delta_n, 16, R2R_PI/(double)(1<<30)/(double)(1<<13))
-        GETFLOATSIGN(ge->M0, 32, R2R_PI/(double)(1<<30)/(double)(1<<1))
-        GETFLOATSIGN(ge->Cuc, 16, 1.0/(double)(1<<29))
-        GETFLOAT(ge->e, 32, 1.0/(double)(1<<30)/(double)(1<<3))
-        GETFLOATSIGN(ge->Cus, 16, 1.0/(double)(1<<29))
-        GETFLOAT(ge->sqrt_A, 32, 1.0/(double)(1<<19))
-        GETBITS(ge->TOE, 16)
-        ge->TOE <<= 4;
-
-        GETFLOATSIGN(ge->Cic, 16, 1.0/(double)(1<<29))
-        GETFLOATSIGN(ge->OMEGA0, 32, R2R_PI/(double)(1<<30)/(double)(1<<1))
-        GETFLOATSIGN(ge->Cis, 16, 1.0/(double)(1<<29))
-        GETFLOATSIGN(ge->i0, 32, R2R_PI/(double)(1<<30)/(double)(1<<1))
-        GETFLOATSIGN(ge->Crc, 16, 1.0/(double)(1<<5))
-        GETFLOATSIGN(ge->omega, 32, R2R_PI/(double)(1<<30)/(double)(1<<1))
-        GETFLOATSIGN(ge->OMEGADOT, 24, R2R_PI/(double)(1<<30)/(double)(1<<13))
-        GETFLOATSIGN(ge->TGD, 8, 1.0/(double)(1<<30)/(double)(1<<1))
-        GETBITS(ge->SVhealth, 6)
-        GETBITS(sv, 1)
-        if(sv)
-          ge->flags |= GPSEPHF_L2PCODEDATA;
-
-        ret = 1019;
-      }
-      break;
-    case 1020:
-      {
-        struct glonassephemeris *ge;
-        int i;
-
-        ge = &handle->ephemerisGLONASS;
-        memset(ge, 0, sizeof(*ge));
-
-        ge->flags |= GLOEPHF_PAVAILABLE;
-        GETBITS(ge->almanac_number, 6)
-        GETBITS(i, 5)
-        ge->frequency_number = i-7;
-        GETBITS(i, 1)
-        if(i)
-          ge->flags |= GLOEPHF_ALMANACHEALTHY;
-        GETBITS(i, 1)
-        if(i)
-          ge->flags |= GLOEPHF_ALMANACHEALTHOK;
-        GETBITS(i, 2)
-        if(i & 1)
-          ge->flags |= GLOEPHF_P10TRUE;
-        if(i & 2)
-          ge->flags |= GLOEPHF_P11TRUE;
-        GETBITS(i, 5)
-        ge->tk = i*60*60;
-        GETBITS(i, 6)
-        ge->tk += i*60;
-        GETBITS(i, 1)
-        ge->tk += i*30;
-        GETBITS(i, 1)
-        if(i)
-          ge->flags |= GLOEPHF_UNHEALTHY;
-        GETBITS(i, 1)
-        if(i)
-          ge->flags |= GLOEPHF_P2TRUE;
-        GETBITS(i, 7)
-        ge->tb = i*15*60;
-        GETFLOATSIGNM(ge->x_velocity, 24, 1.0/(double)(1<<20))
-        GETFLOATSIGNM(ge->x_pos, 27, 1.0/(double)(1<<11))
-        GETFLOATSIGNM(ge->x_acceleration, 5, 1.0/(double)(1<<30))
-        GETFLOATSIGNM(ge->y_velocity, 24, 1.0/(double)(1<<20))
-        GETFLOATSIGNM(ge->y_pos, 27, 1.0/(double)(1<<11))
-        GETFLOATSIGNM(ge->y_acceleration, 5, 1.0/(double)(1<<30))
-        GETFLOATSIGNM(ge->z_velocity, 24, 1.0/(double)(1<<20))
-        GETFLOATSIGNM(ge->z_pos, 27, 1.0/(double)(1<<11))
-        GETFLOATSIGNM(ge->z_acceleration, 5, 1.0/(double)(1<<30))
-        GETBITS(i, 1)
-        if(i)
-          ge->flags |= GLOEPHF_P3TRUE;
-        GETFLOATSIGNM(ge->gamma, 11, 1.0/(double)(1<<30)/(double)(1<<10))
-        SKIPBITS(3) /* GLONASS-M P, GLONASS-M ln (third string) */
-        GETFLOATSIGNM(ge->tau, 22, 1.0/(double)(1<<30)) /* GLONASS tau n(tb) */
-        SKIPBITS(5) /* GLONASS-M delta tau n(tb) */
-        GETBITS(ge->E, 5)
-        /* GETBITS(b, 1) / * GLONASS-M P4 */
-        /* GETBITS(b, 4) / * GLONASS-M Ft */
-        /* GETBITS(b, 11) / * GLONASS-M Nt */
-        /* GETBITS(b, 2) / * GLONASS-M M */
-        /* GETBITS(b, 1) / * GLONASS-M The Availability of Additional Data */
-        /* GETBITS(b, 11) / * GLONASS-M Na */
-        /* GETFLOATSIGNM(b, 32, 1.0/(double)(1<<30)/(double)(1<<1)) / * GLONASS tau c */
-        /* GETBITS(b, 5) / * GLONASS-M N4 */
-        /* GETFLOATSIGNM(b, 22, 1.0/(double)(1<<30)/(double)(1<<1)) / * GLONASS-M tau GPS */
-        /* GETBITS(b, 1) / * GLONASS-M ln (fifth string) */
-        ge->GPSWeek = handle->GPSWeek;
-        ge->GPSTOW = handle->GPSTOW;
-        ret = 1020;
-      }
-      break;
-    case 1001: case 1002: case 1003: case 1004:
-      if(handle->GPSWeek)
-      {
-        int lastlockl1[64];
-        int lastlockl2[64];
-        struct gnssdata *gnss;
-        int i, numsats, wasamb=0;
-
-        for(i = 0; i < 64; ++i)
-          lastlockl1[i] = lastlockl2[i] = 0;
-
-        gnss = &handle->DataNew;
-
-        SKIPBITS(12) /* id */
-        GETBITS(i,30)
-        if(i/1000 < (int)handle->GPSTOW - 86400)
-          ++handle->GPSWeek;
-        handle->GPSTOW = i/1000;
-        if(gnss->week && (gnss->timeofweek != i || gnss->week
-        != handle->GPSWeek))
-        {
-          handle->Data = *gnss;
-          memset(gnss, 0, sizeof(*gnss));
-          old = 1;
-        }
-        gnss->timeofweek = i;
-        gnss->week = handle->GPSWeek;
-
-        GETBITS(syncf,1) /* sync */
-        GETBITS(numsats,5)
-        SKIPBITS(4) /* smind, smint */
-
-        while(numsats-- && gnss->numsats < GNSS_MAXSATS)
-        {
-          int sv, code, l1range, c,l,s,ce,le,se,amb=0;
-          int fullsat, num;
-
-          GETBITS(sv, 6)
-          fullsat = sv < 40 ? sv : sv+80;
-          for(num = 0; num < gnss->numsats
-          && fullsat != gnss->satellites[num]; ++num)
-            ;
-
-          if(num == gnss->numsats)
-            gnss->satellites[gnss->numsats++] = fullsat;
-
-          /* L1 */
-          GETBITS(code, 1);
-          if(code)
-          {
-            c = GNSSDF_P1DATA;  ce = GNSSENTRY_P1DATA;
-            l = GNSSDF_L1PDATA; le = GNSSENTRY_L1PDATA;
-            s = GNSSDF_S1PDATA; se = GNSSENTRY_S1PDATA;
-          }
-          else
-          {
-            c = GNSSDF_C1DATA;  ce = GNSSENTRY_C1DATA;
-            l = GNSSDF_L1CDATA; le = GNSSENTRY_L1CDATA;
-            s = GNSSDF_S1CDATA; se = GNSSENTRY_S1CDATA;
-          }
-          GETBITS(l1range, 24);
-          GETBITSSIGN(i, 20);
-          if((i&((1<<20)-1)) != 0x80000)
-          {
-            gnss->dataflags[num] |= (c|l);
-            gnss->measdata[num][ce] = l1range*0.02;
-            gnss->measdata[num][le] = l1range*0.02+i*0.0005;
-          }
-          GETBITS(i, 7);
-          lastlockl1[sv] = i;
-          if(handle->lastlockl1[sv] > i)
-            gnss->dataflags[num] |= GNSSDF_LOCKLOSSL1;
-          if(type == 1002 || type == 1004)
-          {
-            GETBITS(amb,8);
-            if(amb && (gnss->dataflags[num] & c))
-            {
-              gnss->measdata[num][ce] += amb*299792.458;
-              gnss->measdata[num][le] += amb*299792.458;
-              ++wasamb;
-            }
-            GETBITS(i, 8);
-            if(i)
-            {
-              gnss->dataflags[num] |= s;
-              gnss->measdata[num][se] = i*0.25;
-              i /= 4*4;
-              if(i > 9) i = 9;
-              else if(i < 1) i = 1;
-              gnss->snrL1[num] = i;
-            }
-          }
-          gnss->measdata[num][le] /= GPS_WAVELENGTH_L1;
-          if(type == 1003 || type == 1004)
-          {
-            /* L2 */
-            GETBITS(code,2);
-            if(code)
-            {
-              c = GNSSDF_P2DATA;  ce = GNSSENTRY_P2DATA;
-              l = GNSSDF_L2PDATA; le = GNSSENTRY_L2PDATA;
-              s = GNSSDF_S2PDATA; se = GNSSENTRY_S2PDATA;
-            }
-            else
-            {
-              c = GNSSDF_C2DATA;  ce = GNSSENTRY_C2DATA;
-              l = GNSSDF_L2CDATA; le = GNSSENTRY_L2CDATA;
-              s = GNSSDF_S2CDATA; se = GNSSENTRY_S2CDATA;
-            }
-            GETBITSSIGN(i,14);
-            if((i&((1<<14)-1)) != 0x2000)
-            {
-              gnss->dataflags[num] |= c;
-              gnss->measdata[num][ce] = l1range*0.02+i*0.02
-              +amb*299792.458;
-            }
-            GETBITSSIGN(i,20);
-            if((i&((1<<20)-1)) != 0x80000)
-            {
-              gnss->dataflags[num] |= l;
-              gnss->measdata[num][le] = l1range*0.02+i*0.0005
-              +amb*299792.458;
-            }
-            GETBITS(i,7);
-            lastlockl2[sv] = i;
-            if(handle->lastlockl2[sv] > i)
-              gnss->dataflags[num] |= GNSSDF_LOCKLOSSL2;
-            if(type == 1004)
-            {
-              GETBITS(i, 8);
-              if(i)
-              {
-                gnss->dataflags[num] |= s;
-                gnss->measdata[num][se] = i*0.25;
-                i /= 4*4;
-                if(i > 9) i = 9;
-                else if(i < 1) i = 1;
-                gnss->snrL2[num] = i;
-              }
-            }
-            gnss->measdata[num][le] /= GPS_WAVELENGTH_L2;
-          }
-        }
-        for(i = 0; i < 64; ++i)
-        {
-          handle->lastlockl1[i] = lastlockl1[i];
-          handle->lastlockl2[i] = lastlockl2[i];
-        }
-        if(!syncf && !old)
-        {
-          handle->Data = *gnss;
-          memset(gnss, 0, sizeof(*gnss));
-        }
-        if(!syncf || old)
-        {
-          if(wasamb) /* not RINEX compatible without */
-            ret = 1;
-          else
-            ret = 2;
-        }
-#ifdef NO_RTCM3_MAIN
-        else
-          ret = type;
-#endif /* NO_RTCM3_MAIN */
-      }
-      break;
-    case 1009: case 1010: case 1011: case 1012:
-      {
-        int lastlockl1[64];
-        int lastlockl2[64];
-        struct gnssdata *gnss;
-        int i, numsats;
-        int wasamb=0;
-
-        for(i = 0; i < 64; ++i)
-          lastlockl1[i] = lastlockl2[i] = 0;
-
-        gnss = &handle->DataNew;
-
-        SKIPBITS(12) /* id */;
-        GETBITS(i,27) /* tk */
-
-        updatetime(&handle->GPSWeek, &handle->GPSTOW, i, 0); /* Moscow -> GPS */
-        i = handle->GPSTOW*1000;
-        if(gnss->week && (gnss->timeofweek != i || gnss->week
-        != handle->GPSWeek))
-        {
-          handle->Data = *gnss;
-          memset(gnss, 0, sizeof(*gnss));
-          old = 1;
-        }
-
-        gnss->timeofweek = i;
-        gnss->week = handle->GPSWeek;
-
-        GETBITS(syncf,1) /* sync */
-        GETBITS(numsats,5)
-
-        SKIPBITS(4) /* smind, smint */
-
-        while(numsats-- && gnss->numsats < GNSS_MAXSATS)
-        {
-          int sv, code, l1range, c,l,s,ce,le,se,amb=0;
-          int freq;
-          int fullsat, num;
-
-          GETBITS(sv, 6)
-          fullsat = sv-1 + PRN_GLONASS_START;
-          for(num = 0; num < gnss->numsats
-          && fullsat != gnss->satellites[num]; ++num)
-            ;
-
-          if(num == gnss->numsats)
-            gnss->satellites[gnss->numsats++] = fullsat;
-
-          /* L1 */
-          GETBITS(code, 1)
-          GETBITS(freq, 5)
-
-          gnss->channels[num] = freq - 7;
-
-          if(code)
-          {
-            c = GNSSDF_P1DATA;  ce = GNSSENTRY_P1DATA;
-            l = GNSSDF_L1PDATA; le = GNSSENTRY_L1PDATA;
-            s = GNSSDF_S1PDATA; se = GNSSENTRY_S1PDATA;
-          }
-          else
-          {
-            c = GNSSDF_C1DATA;  ce = GNSSENTRY_C1DATA;
-            l = GNSSDF_L1CDATA; le = GNSSENTRY_L1CDATA;
-            s = GNSSDF_S1CDATA; se = GNSSENTRY_S1CDATA;
-          }
-          GETBITS(l1range, 25)
-          GETBITSSIGN(i, 20)
-          if((i&((1<<20)-1)) != 0x80000)
-          {
-            /* Handle this like GPS. Actually for GLONASS L1 range is always
-               valid. To be on the save side, we handle it as invalid like we
-               do for GPS and also remove range in case of 0x80000. */
-            gnss->dataflags[num] |= (c|l);
-            gnss->measdata[num][ce] = l1range*0.02;
-            gnss->measdata[num][le] = l1range*0.02+i*0.0005;
-          }
-          GETBITS(i, 7)
-          lastlockl1[sv] = i;
-          if(handle->lastlockl1[sv] > i)
-            gnss->dataflags[num] |= GNSSDF_LOCKLOSSL1;
-          if(type == 1010 || type == 1012)
-          {
-            GETBITS(amb,7)
-            if(amb && (gnss->dataflags[num] & c))
-            {
-              gnss->measdata[num][ce] += amb*599584.916;
-              gnss->measdata[num][le] += amb*599584.916;
-              ++wasamb;
-            }
-            GETBITS(i, 8)
-            if(i)
-            {
-              gnss->dataflags[num] |= s;
-              gnss->measdata[num][se] = i*0.25;
-              i /= 4*4;
-              if(i > 9) i = 9;
-              else if(i < 1) i = 1;
-              gnss->snrL1[num] = i;
-            }
-          }
-          gnss->measdata[num][le] /= GLO_WAVELENGTH_L1(freq-7);
-          if(type == 1011 || type == 1012)
-          {
-            /* L2 */
-            GETBITS(code,2)
-            if(code)
-            {
-              c = GNSSDF_P2DATA;  ce = GNSSENTRY_P2DATA;
-              l = GNSSDF_L2PDATA; le = GNSSENTRY_L2PDATA;
-              s = GNSSDF_S2PDATA; se = GNSSENTRY_S2PDATA;
-            }
-            else
-            {
-              c = GNSSDF_C2DATA;  ce = GNSSENTRY_C2DATA;
-              l = GNSSDF_L2CDATA; le = GNSSENTRY_L2CDATA;
-              s = GNSSDF_S2CDATA; se = GNSSENTRY_S2CDATA;
-            }
-            GETBITSSIGN(i,14)
-            if((i&((1<<14)-1)) != 0x2000)
-            {
-              gnss->dataflags[num] |= c;
-              gnss->measdata[num][ce] = l1range*0.02+i*0.02
-              +amb*599584.916;
-            }
-            GETBITSSIGN(i,20)
-            if((i&((1<<20)-1)) != 0x80000)
-            {
-              gnss->dataflags[num] |= l;
-              gnss->measdata[num][le] = l1range*0.02+i*0.0005
-              +amb*599584.916;
-            }
-            GETBITS(i,7)
-            lastlockl2[sv] = i;
-            if(handle->lastlockl2[sv] > i)
-              gnss->dataflags[num] |= GNSSDF_LOCKLOSSL2;
-            if(type == 1012)
-            {
-              GETBITS(i, 8)
-              if(i)
-              {
-                gnss->dataflags[num] |= s;
-                gnss->measdata[num][se] = i*0.25;
-                i /= 4*4;
-                if(i > 9) i = 9;
-                else if(i < 1) i = 1;
-                gnss->snrL2[num] = i;
-              }
-            }
-            gnss->measdata[num][le] /= GLO_WAVELENGTH_L2(freq-7);
-          }
-          if(!sv || sv > 24) /* illegal, remove it again */
-            --gnss->numsats;
-        }
-        for(i = 0; i < 64; ++i)
-        {
-          handle->lastlockl1[i] = lastlockl1[i];
-          handle->lastlockl2[i] = lastlockl2[i];
-        }
-        if(!syncf && !old)
-        {
-          handle->Data = *gnss;
-          memset(gnss, 0, sizeof(*gnss));
-        }
-        if(!syncf || old)
-        {
-          if(wasamb) /* not RINEX compatible without */
-            ret = 1;
-          else
-            ret = 2;
-        }
-#ifdef NO_RTCM3_MAIN
-        else
-          ret = type;
-#endif /* NO_RTCM3_MAIN */
-      }
-      break;
-    }
-  }
-  return ret;
-}
-
-struct Header
-{
-  const char *version;
-  const char *pgm;
-  const char *marker;
-  const char *markertype;
-  const char *observer;
-  const char *receiver;
-  const char *antenna;
-  const char *position;
-  const char *antennaposition;
-  const char *wavelength;
-  const char *typesofobs; /* should not be modified outside */
-  const char *typesofobsG; /* should not be modified outside */
-  const char *typesofobsR; /* should not be modified outside */
-  const char *typesofobsS; /* should not be modified outside */
-  const char *timeoffirstobs; /* should not be modified outside */
-};
-
-#define MAXHEADERLINES 50
-#define MAXHEADERBUFFERSIZE 4096
-struct HeaderData
-{
-  union
-  {
-    struct Header named;
-    const char *unnamed[MAXHEADERLINES];
-  } data;
-  int  numheaders;
-};
-
-void converttime(struct converttimeinfo *c, int week, int tow)
-{
-  int i, k, doy, j; /* temporary variables */
-  j = week*(7*24*60*60) + tow + 5*24*60*60;
-  for(i = 1980; j >= (k = (365+longyear(i,0))*24*60*60); ++i)
-    j -= k;
-  c->year = i;
-  doy = 1+ (j / (24*60*60));
-  j %= (24*60*60);
-  c->hour = j / (60*60);
-  j %= (60*60);
-  c->minute = j / 60;
-  c->second = j % 60;
-  j = 0;
-  for(i = 1; j + (k = months[i] + longyear(c->year,i)) < doy; ++i)
-    j += k;
-  c->month = i;
-  c->day = doy - j;
-}
-
-#ifndef NO_RTCM3_MAIN
-void RTCM3Error(const char *fmt, ...)
-{
-  va_list v;
-  va_start(v, fmt);
-  vfprintf(stderr, fmt, v);
-  va_end(v);
-}
-#endif
-
-void RTCM3Text(const char *fmt, ...)
-{
-  va_list v;
-  va_start(v, fmt);
-  vprintf(fmt, v);
-  va_end(v);
-}
-
-static int HandleRunBy(char *buffer, int buffersize, const char **u,
-int rinex3)
-{
-  const char *user;
-  time_t t;
-  struct tm * t2;
-
-#ifdef NO_RTCM3_MAIN
-  if(revisionstr[0] == '$')
-  {
-    char *a;
-    int i=0;
-    for(a = revisionstr+11; *a && *a != ' '; ++a)
-      revisionstr[i++] = *a;
-    revisionstr[i] = 0;
-  }
-#endif
-
-  user= getenv("USER");
-  if(!user) user = "";
-  t = time(&t);
-  t2 = gmtime(&t);
-  if(u) *u = user;
-  return 1+snprintf(buffer, buffersize,
-  rinex3 ?
-  "RTCM3TORINEX %-7.7s%-20.20s%04d%02d%02d %02d%02d%02d UTC "
-  "PGM / RUN BY / DATE" :
-  "RTCM3TORINEX %-7.7s%-20.20s%04d-%02d-%02d %02d:%02d    "
-  "PGM / RUN BY / DATE", revisionstr, user, 1900+t2->tm_year,
-  t2->tm_mon+1, t2->tm_mday, t2->tm_hour, t2->tm_min, t2->tm_sec);
-}
-
-#ifdef NO_RTCM3_MAIN
-#define NUMSTARTSKIP 1
-#else
-#define NUMSTARTSKIP 3
-#endif
-
-void HandleHeader(struct RTCM3ParserData *Parser)
-{
-#ifdef NO_RTCM3_MAIN
-  int i;
-  if(Parser->rinex3)
-  {
-#define CHECKFLAGSNEW(a, b, c) \
-    { \
-      Parser->dataflag##a[Parser->numdatatypes##a] = GNSSDF_##b##DATA; \
-      Parser->datapos##a[Parser->numdatatypes##a] = GNSSENTRY_##b##DATA; \
-      ++Parser->numdatatypes##a; \
-    }
-
-    CHECKFLAGSNEW(GPS, C1,  C1C)
-    CHECKFLAGSNEW(GPS, L1C, L1C)
-    CHECKFLAGSNEW(GPS, D1C, D1C)
-    CHECKFLAGSNEW(GPS, S1C, S1C)
-    CHECKFLAGSNEW(GPS, P1,  C1P)
-    CHECKFLAGSNEW(GPS, L1P, L1P)
-    CHECKFLAGSNEW(GPS, D1P, D1P)
-    CHECKFLAGSNEW(GPS, S1P, S1P)
-    CHECKFLAGSNEW(GPS, P2,  C2P)
-    CHECKFLAGSNEW(GPS, L2P, L2P)
-    CHECKFLAGSNEW(GPS, D2P, D2P)
-    CHECKFLAGSNEW(GPS, S2P, S2P)
-    CHECKFLAGSNEW(GPS, C2,  C2X)
-    CHECKFLAGSNEW(GPS, L2C, L2X)
-    CHECKFLAGSNEW(GPS, D2C, D2X)
-    CHECKFLAGSNEW(GPS, S2C, S2X)
-    CHECKFLAGSNEW(GLO, C1,  C1C)
-    CHECKFLAGSNEW(GLO, L1C, L1C)
-    CHECKFLAGSNEW(GLO, D1C, D1C)
-    CHECKFLAGSNEW(GLO, S1C, S1C)
-    CHECKFLAGSNEW(GLO, P1,  C1P)
-    CHECKFLAGSNEW(GLO, L1P, L1P)
-    CHECKFLAGSNEW(GLO, D1P, D1P)
-    CHECKFLAGSNEW(GLO, S1P, S1P)
-    CHECKFLAGSNEW(GLO, P2,  C2P)
-    CHECKFLAGSNEW(GLO, L2P, L2P)
-    CHECKFLAGSNEW(GLO, D2P, D2P)
-    CHECKFLAGSNEW(GLO, S2P, S2P)
-    CHECKFLAGSNEW(GLO, C2,  C2C)
-    CHECKFLAGSNEW(GLO, L2C, L2C)
-    CHECKFLAGSNEW(GLO, D2C, D2C)
-    CHECKFLAGSNEW(GLO, S2C, S2C)
-  }
-  else
-  {
-#define CHECKFLAGS(a, b) \
-    { \
-      if(data[RINEXENTRY_##b##DATA]) \
-      { \
-        Parser->dataflagGPS[data[RINEXENTRY_##b##DATA]-1] = GNSSDF_##a##DATA; \
-        Parser->dataposGPS[data[RINEXENTRY_##b##DATA]-1] = GNSSENTRY_##a##DATA; \
-      } \
-      else \
-      { \
-        Parser->dataflag[Parser->numdatatypesGPS] = GNSSDF_##a##DATA; \
-        Parser->datapos[Parser->numdatatypesGPS] = GNSSENTRY_##a##DATA; \
-        data[RINEXENTRY_##b##DATA] = ++Parser->numdatatypesGPS; \
-      } \
-    }
-
-    int data[RINEXENTRY_NUMBER];
-    for(i = 0; i < RINEXENTRY_NUMBER; ++i) data[i] = 0;
-
-    CHECKFLAGS(C1,C1)
-    CHECKFLAGS(C2,C2)
-    CHECKFLAGS(P1,P1)
-    CHECKFLAGS(P2,P2)
-    CHECKFLAGS(L1C,L1)
-    CHECKFLAGS(L1P,L1)
-    CHECKFLAGS(L2C,L2)
-    CHECKFLAGS(L2P,L2)
-    CHECKFLAGS(D1C,D1)
-    CHECKFLAGS(D1P,D1)
-    CHECKFLAGS(D2C,D2)
-    CHECKFLAGS(D2P,D2)
-    CHECKFLAGS(S1C,S1)
-    CHECKFLAGS(S1P,S1)
-    CHECKFLAGS(S2C,S2)
-    CHECKFLAGS(S2P,S2)
-  }
-#else /* NO_RTCM3_MAIN */
-  struct HeaderData hdata;
-  char thebuffer[MAXHEADERBUFFERSIZE];
-  char *buffer = thebuffer;
-  size_t buffersize = sizeof(thebuffer);
-  int i;
-
-  memset(&hdata, 0, sizeof(hdata));
-
-  hdata.data.named.version = buffer;
-  i = 1+snprintf(buffer, buffersize,
-  "%9.2f           OBSERVATION DATA    M (Mixed)"
-  "           RINEX VERSION / TYPE", Parser->rinex3 ? 3.0 : 2.11);
-  buffer += i; buffersize -= i;
-
-  {
-    const char *str;
-    hdata.data.named.pgm = buffer;
-    i = HandleRunBy(buffer, buffersize, &str, Parser->rinex3);
-    buffer += i; buffersize -= i;
-    hdata.data.named.observer = buffer;
-    i = 1+snprintf(buffer, buffersize,
-    "%-20.20s                                        "
-    "OBSERVER / AGENCY", str);
-    buffer += i; buffersize -= i;
-  }
-
-  hdata.data.named.marker =
-  "RTCM3TORINEX                                                "
-  "MARKER NAME";
-
-  hdata.data.named.markertype =  !Parser->rinex3 ? 0 :
-  "GEODETIC                                                    "
-  "MARKER TYPE";
-
-  hdata.data.named.receiver =
-  "                                                            "
-  "REC # / TYPE / VERS";
-
-  hdata.data.named.antenna =
-  "                                                            "
-  "ANT # / TYPE";
-
-  hdata.data.named.position =
-  "         .0000         .0000         .0000                  "
-  "APPROX POSITION XYZ";
-
-  hdata.data.named.antennaposition =
-  "         .0000         .0000         .0000                  "
-  "ANTENNA: DELTA H/E/N";
-
-  hdata.data.named.wavelength = Parser->rinex3 ? 0 :
-  "     1     1                                                "
-  "WAVELENGTH FACT L1/2";
-
-  if(Parser->rinex3)
-  {
-#define CHECKFLAGSNEW(a, b, c) \
-    if(flags & GNSSDF_##b##DATA) \
-    { \
-      Parser->dataflag##a[Parser->numdatatypes##a] = GNSSDF_##b##DATA; \
-      Parser->datapos##a[Parser->numdatatypes##a] = GNSSENTRY_##b##DATA; \
-      ++Parser->numdatatypes##a; \
-      snprintf(tbuffer+tbufferpos, sizeof(tbuffer)-tbufferpos, " "#c); \
-      tbufferpos += 4; \
-    }
-
-    int flags = Parser->startflags;
-    char tbuffer[6*RINEXENTRY_NUMBER+1];
-    int tbufferpos = 0;
-    for(i = 0; i < Parser->Data.numsats; ++i)
-      flags |= Parser->Data.dataflags[i];
-
-    CHECKFLAGSNEW(GPS, C1,  C1C)
-    CHECKFLAGSNEW(GPS, L1C, L1C)
-    CHECKFLAGSNEW(GPS, D1C, D1C)
-    CHECKFLAGSNEW(GPS, S1C, S1C)
-    CHECKFLAGSNEW(GPS, P1,  C1P)
-    CHECKFLAGSNEW(GPS, L1P, L1P)
-    CHECKFLAGSNEW(GPS, D1P, D1P)
-    CHECKFLAGSNEW(GPS, S1P, S1P)
-
-    hdata.data.named.typesofobsS = buffer;
-    i = 1+snprintf(buffer, buffersize,
-    "S  %3d%-52.52s  SYS / # / OBS TYPES", Parser->numdatatypesGPS, tbuffer);
-    buffer += i; buffersize -= i;
-
-    CHECKFLAGSNEW(GPS, P2,  C2P)
-    CHECKFLAGSNEW(GPS, L2P, L2P)
-    CHECKFLAGSNEW(GPS, D2P, D2P)
-    CHECKFLAGSNEW(GPS, S2P, S2P)
-    CHECKFLAGSNEW(GPS, C2,  C2X)
-    CHECKFLAGSNEW(GPS, L2C, L2X)
-    CHECKFLAGSNEW(GPS, D2C, D2X)
-    CHECKFLAGSNEW(GPS, S2C, S2X)
-
-    hdata.data.named.typesofobsG = buffer;
-    i = 1+snprintf(buffer, buffersize,
-    "G  %3d%-52.52s  SYS / # / OBS TYPES", Parser->numdatatypesGPS, tbuffer);
-    if(Parser->numdatatypesGPS>13)
-    {
-      i += snprintf(buffer+i-1, buffersize,
-      "\n      %-52.52s  SYS / # / OBS TYPES", tbuffer+13*4);
-    }
-    buffer += i; buffersize -= i;
-
-    tbufferpos = 0;
-
-    CHECKFLAGSNEW(GLO, C1,  C1C)
-    CHECKFLAGSNEW(GLO, L1C, L1C)
-    CHECKFLAGSNEW(GLO, D1C, D1C)
-    CHECKFLAGSNEW(GLO, S1C, S1C)
-    CHECKFLAGSNEW(GLO, P1,  C1P)
-    CHECKFLAGSNEW(GLO, L1P, L1P)
-    CHECKFLAGSNEW(GLO, D1P, D1P)
-    CHECKFLAGSNEW(GLO, S1P, S1P)
-    CHECKFLAGSNEW(GLO, P2,  C2P)
-    CHECKFLAGSNEW(GLO, L2P, L2P)
-    CHECKFLAGSNEW(GLO, D2P, D2P)
-    CHECKFLAGSNEW(GLO, S2P, S2P)
-    CHECKFLAGSNEW(GLO, C2,  C2C)
-    CHECKFLAGSNEW(GLO, L2C, L2C)
-    CHECKFLAGSNEW(GLO, D2C, D2C)
-    CHECKFLAGSNEW(GLO, S2C, S2C)
-
-    hdata.data.named.typesofobsR = buffer;
-    i = 1+snprintf(buffer, buffersize,
-    "R  %3d%-52.52s  SYS / # / OBS TYPES", Parser->numdatatypesGLO, tbuffer);
-    if(Parser->numdatatypesGLO>13)
-    {
-      i += snprintf(buffer+i-1, buffersize,
-      "\n      %-52.52s  SYS / # / OBS TYPES", tbuffer+13*4);
-    }
-    buffer += i; buffersize -= i;
-  }
-  else
-  {
-#define CHECKFLAGS(a, b) \
-    if(flags & GNSSDF_##a##DATA) \
-    { \
-      if(data[RINEXENTRY_##b##DATA]) \
-      { \
-        Parser->dataflagGPS[data[RINEXENTRY_##b##DATA]-1] = GNSSDF_##a##DATA; \
-        Parser->dataposGPS[data[RINEXENTRY_##b##DATA]-1] = GNSSENTRY_##a##DATA; \
-      } \
-      else \
-      { \
-        Parser->dataflag[Parser->numdatatypesGPS] = GNSSDF_##a##DATA; \
-        Parser->datapos[Parser->numdatatypesGPS] = GNSSENTRY_##a##DATA; \
-        data[RINEXENTRY_##b##DATA] = ++Parser->numdatatypesGPS; \
-        snprintf(tbuffer+tbufferpos, sizeof(tbuffer)-tbufferpos, "    "#b); \
-        tbufferpos += 6; \
-      } \
-    }
-
-    int flags = Parser->startflags;
-    int data[RINEXENTRY_NUMBER];
-    char tbuffer[6*RINEXENTRY_NUMBER+1];
-    int tbufferpos = 0;
-    for(i = 0; i < RINEXENTRY_NUMBER; ++i)
-      data[i] = 0;
-    for(i = 0; i < Parser->Data.numsats; ++i)
-      flags |= Parser->Data.dataflags[i];
-
-    CHECKFLAGS(C1,C1)
-    CHECKFLAGS(C2,C2)
-    CHECKFLAGS(P1,P1)
-    CHECKFLAGS(P2,P2)
-    CHECKFLAGS(L1C,L1)
-    CHECKFLAGS(L1P,L1)
-    CHECKFLAGS(L2C,L2)
-    CHECKFLAGS(L2P,L2)
-    CHECKFLAGS(D1C,D1)
-    CHECKFLAGS(D1P,D1)
-    CHECKFLAGS(D2C,D2)
-    CHECKFLAGS(D2P,D2)
-    CHECKFLAGS(S1C,S1)
-    CHECKFLAGS(S1P,S1)
-    CHECKFLAGS(S2C,S2)
-    CHECKFLAGS(S2P,S2)
-
-    hdata.data.named.typesofobs = buffer;
-    i = 1+snprintf(buffer, buffersize,
-    "%6d%-54.54s# / TYPES OF OBSERV", Parser->numdatatypesGPS, tbuffer);
-    if(Parser->numdatatypesGPS>9)
-    {
-      i += snprintf(buffer+i-1, buffersize,
-      "\n      %-54.54s# / TYPES OF OBSERV", tbuffer+9*6);
-    }
-    buffer += i; buffersize -= i;
-  }
-
-  {
-    struct converttimeinfo cti;
-    converttime(&cti, Parser->Data.week,
-    (int)floor(Parser->Data.timeofweek/1000.0));
-    hdata.data.named.timeoffirstobs = buffer;
-    i = 1+snprintf(buffer, buffersize,
-    "  %4d    %2d    %2d    %2d    %2d   %10.7f     GPS         "
-    "TIME OF FIRST OBS", cti.year, cti.month, cti.day, cti.hour,
-    cti.minute, cti.second + fmod(Parser->Data.timeofweek/1000.0,1.0));
-
-    buffer += i; buffersize -= i;
-  }
-
-  hdata.numheaders = 15;
-
-  if(Parser->headerfile)
-  {
-    FILE *fh;
-    if((fh = fopen(Parser->headerfile, "r")))
-    {
-      size_t siz;
-      char *lastblockstart;
-      if((siz = fread(buffer, 1, buffersize-1, fh)) > 0)
-      {
-        buffer[siz] = '\n';
-        if(siz == buffersize)
-        {
-          RTCM3Error("Header file is too large. Only %d bytes read.",
-          (int)siz);
-        }
-        /* scan the file line by line and enter the entries in the list */
-        /* warn for "# / TYPES OF OBSERV" and "TIME OF FIRST OBS" */
-        /* overwrites entries, except for comments */
-        lastblockstart = buffer;
-        for(i = 0; i < (int)siz; ++i)
-        {
-          if(buffer[i] == '\n')
-          { /* we found a line */
-            char *end;
-            while(buffer[i+1] == '\r')
-              ++i; /* skip \r in case there are any */
-            end = buffer+i;
-            while(*end == '\t' || *end == ' ' || *end == '\r' || *end == '\n')
-              *(end--) = 0;
-            if(end-lastblockstart < 60+5) /* short line */
-              RTCM3Error("Short Header line '%s' ignored.\n", lastblockstart);
-            else
-            {
-              int pos;
-              if(!strcmp("COMMENT", lastblockstart+60))
-                pos = hdata.numheaders;
-              else
-              {
-                for(pos = 0; pos < hdata.numheaders; ++pos)
-                {
-                  if(!strcmp(hdata.data.unnamed[pos]+60, lastblockstart+60))
-                    break;
-                }
-                if(!strcmp("# / TYPES OF OBSERV", lastblockstart+60)
-                || !strcmp("TIME OF FIRST OBS", lastblockstart+60))
-                {
-                  RTCM3Error("Overwriting header '%s' is dangerous.\n",
-                  lastblockstart+60);
-                }
-              }
-              if(pos >= MAXHEADERLINES)
-              {
-                RTCM3Error("Maximum number of header lines of %d reached.\n",
-                MAXHEADERLINES);
-              }
-              else if(!strcmp("END OF HEADER", lastblockstart+60))
-              {
-                RTCM3Error("End of header ignored.\n");
-              }
-              else
-              {
-                hdata.data.unnamed[pos] = lastblockstart;
-                if(pos == hdata.numheaders)
-                  ++hdata.numheaders;
-              }
-            }
-            lastblockstart = buffer+i+1;
-          }
-        }
-      }
-      else
-      {
-        RTCM3Error("Could not read data from headerfile '%s'.\n",
-        Parser->headerfile);
-      }
-      fclose(fh);
-    }
-    else
-    {
-      RTCM3Error("Could not open header datafile '%s'.\n",
-      Parser->headerfile);
-    }
-  }
-
-  for(i = 0; i < hdata.numheaders; ++i)
-  {
-    if(hdata.data.unnamed[i] && hdata.data.unnamed[i][0])
-      RTCM3Text("%s\n", hdata.data.unnamed[i]);
-  }
-  RTCM3Text("                                                            "
-  "END OF HEADER\n");
-#endif
-}
-
-static void ConvLine(FILE *file, const char *fmt, ...)
-{
-  char buffer[100], *b;
-  va_list v;
-  va_start(v, fmt);
-  vsnprintf(buffer, sizeof(buffer), fmt, v);
-  for(b = buffer; *b; ++b)
-  {
-    if(*b == 'e') *b = 'D';
-  }
-  fprintf(file, "%s", buffer);
-  va_end(v);
-}
-
-void HandleByte(struct RTCM3ParserData *Parser, unsigned int byte)
-{
-  Parser->Message[Parser->MessageSize++] = byte;
-  if(Parser->MessageSize >= Parser->NeedBytes)
-  {
-    int r;
-    while((r = RTCM3Parser(Parser)))
-    {
-      if(r == 1020 || r == 1019)
-      {
-        FILE *file = 0;
-
-        if(Parser->rinex3 && !(file = Parser->gpsfile))
-        {
-          const char *n = Parser->gpsephemeris ? Parser->gpsephemeris : Parser->glonassephemeris;
-          if(n)
-          {
-            if(!(Parser->gpsfile = fopen(n, "w")))
-            {
-              RTCM3Error("Could not open ephemeris output file.\n");
-            }
-            else
-            {
-              char buffer[100];
-              fprintf(Parser->gpsfile,
-              "%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n", 3.0, "", "");
-              HandleRunBy(buffer, sizeof(buffer), 0, Parser->rinex3);
-              fprintf(Parser->gpsfile, "%s\n%60sEND OF HEADER\n", buffer, "");
-            }
-            Parser->gpsephemeris = 0;
-            Parser->glonassephemeris = 0;
-            file = Parser->gpsfile;
-          }
-        }
-        else
-        {
-          if(r == 1020)
-          {
-            if(Parser->glonassephemeris)
-            {
-              if(!(Parser->glonassfile = fopen(Parser->glonassephemeris, "w")))
-              {
-                RTCM3Error("Could not open GLONASS ephemeris output file.\n");
-              }
-              else
-              {
-                char buffer[100];
-                fprintf(Parser->glonassfile,
-                "%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n", 2.1, "", "");
-                HandleRunBy(buffer, sizeof(buffer), 0, Parser->rinex3);
-                fprintf(Parser->glonassfile, "%s\n%60sEND OF HEADER\n", buffer, "");
-              }
-              Parser->glonassephemeris = 0;
-            }
-            file = Parser->glonassfile;
-          }
-          else if(r == 1019)
-          {
-            if(Parser->gpsephemeris)
-            {
-              if(!(Parser->gpsfile = fopen(Parser->gpsephemeris, "w")))
-              {
-                RTCM3Error("Could not open GPS ephemeris output file.\n");
-              }
-              else
-              {
-                char buffer[100];
-                fprintf(Parser->gpsfile,
-                "%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n", 2.1, "", "");
-                HandleRunBy(buffer, sizeof(buffer), 0, Parser->rinex3);
-                fprintf(Parser->gpsfile, "%s\n%60sEND OF HEADER\n", buffer, "");
-              }
-              Parser->gpsephemeris = 0;
-            }
-            file = Parser->gpsfile;
-          }
-        }
-        if(file)
-        {
-          if(r == 1020)
-          {
-            struct glonassephemeris *e = &Parser->ephemerisGLONASS;
-            int w = e->GPSWeek, tow = e->GPSTOW, i;
-            struct converttimeinfo cti;
-
-            updatetime(&w, &tow, e->tb*1000, 1);  /* Moscow - > UTC */
-            converttime(&cti, w, tow);
-
-            i = e->tk-3*60*60; if(i < 0) i += 86400;
-
-            if(Parser->rinex3)
-              ConvLine(file, "R%02d %04d %02d %02d %02d %02d %02d%19.12e%19.12e%19.12e\n",
-              e->almanac_number, cti.year, cti.month, cti.day, cti.hour, cti.minute,
-              cti.second, -e->tau, e->gamma, (double) i);
-            else
-              ConvLine(file, "%02d %02d %02d %02d %02d %02d%5.1f%19.12e%19.12e%19.12e\n",
-              e->almanac_number, cti.year%100, cti.month, cti.day, cti.hour, cti.minute,
-              (double) cti.second, -e->tau, e->gamma, (double) i);
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n", e->x_pos,
-            e->x_velocity, e->x_acceleration, (e->flags & GLOEPHF_UNHEALTHY) ? 1.0 : 0.0);
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n", e->y_pos,
-            e->y_velocity, e->y_acceleration, (double) e->frequency_number);
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n", e->z_pos,
-            e->z_velocity, e->z_acceleration, (double) e->E);
-          }
-          else /* if(r == 1019) */
-          {
-            struct gpsephemeris *e = &Parser->ephemerisGPS;
-            double d;                 /* temporary variable */
-            unsigned long int i;       /* temporary variable */
-            struct converttimeinfo cti;
-            converttime(&cti, e->GPSweek, e->TOC);
-
-            if(Parser->rinex3)
-              ConvLine(file, "G%02d %04d %02d %02d %02d %02d %02d%19.12e%19.12e%19.12e\n",
-              e->satellite, cti.year, cti.month, cti.day, cti.hour,
-              cti.minute, cti.second, e->clock_bias, e->clock_drift,
-              e->clock_driftrate);
-            else
-              ConvLine(file, "%02d %02d %02d %02d %02d %02d%05.1f%19.12e%19.12e%19.12e\n",
-              e->satellite, cti.year%100, cti.month, cti.day, cti.hour,
-              cti.minute, (double) cti.second, e->clock_bias, e->clock_drift,
-              e->clock_driftrate);
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n", (double)e->IODE,
-            e->Crs, e->Delta_n, e->M0);
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n", e->Cuc,
-            e->e, e->Cus, e->sqrt_A);
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n",
-            (double) e->TOE, e->Cic, e->OMEGA0, e->Cis);
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n", e->i0,
-            e->Crc, e->omega, e->OMEGADOT);
-            d = 0;
-            i = e->flags;
-            if(i & GPSEPHF_L2CACODE)
-              d += 2.0;
-            if(i & GPSEPHF_L2PCODE)
-              d += 1.0;
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n", e->IDOT, d,
-            (double) e->GPSweek, i & GPSEPHF_L2PCODEDATA ? 1.0 : 0.0);
-            if(e->URAindex <= 6) /* URA index */
-              d = ceil(10.0*pow(2.0, 1.0+((double)e->URAindex)/2.0))/10.0;
-            else
-              d = ceil(10.0*pow(2.0, ((double)e->URAindex)/2.0))/10.0;
-            /* 15 indicates not to use satellite. We can't handle this special
-               case, so we create a high "non"-accuracy value. */
-            ConvLine(file, "   %19.12e%19.12e%19.12e%19.12e\n", d,
-            ((double) e->SVhealth), e->TGD, ((double) e->IODC));
-
-            ConvLine(file, "   %19.12e%19.12e\n", ((double)e->TOW), 0.0);
-            /* TOW */
-          }
-        }
-      }
-      else
-      {
-        int i, j, o;
-        struct converttimeinfo cti;
-
-        if(Parser->init < NUMSTARTSKIP) /* skip first epochs to detect correct data types */
-        {
-          ++Parser->init;
-
-          if(Parser->init == NUMSTARTSKIP)
-            HandleHeader(Parser);
-          else
-          {
-            for(i = 0; i < Parser->Data.numsats; ++i)
-              Parser->startflags |= Parser->Data.dataflags[i];
-            continue;
-          }
-        }
-        if(r == 2 && !Parser->validwarning)
-        {
-          RTCM3Text("No valid RINEX! All values are modulo 299792.458!"
-          "           COMMENT\n");
-          Parser->validwarning = 1;
-        }
-
-        converttime(&cti, Parser->Data.week,
-        (int)floor(Parser->Data.timeofweek/1000.0));
-        if(Parser->rinex3)
-        {
-          RTCM3Text("> %04d %02d %02d %02d %02d%11.7f  0%3d\n",
-          cti.year, cti.month, cti.day, cti.hour, cti.minute, cti.second
-          + fmod(Parser->Data.timeofweek/1000.0,1.0), Parser->Data.numsats);
-          for(i = 0; i < Parser->Data.numsats; ++i)
-          {
-            int glo = 0;
-            if(Parser->Data.satellites[i] <= PRN_GPS_END)
-              RTCM3Text("G%02d", Parser->Data.satellites[i]);
-            else if(Parser->Data.satellites[i] >= PRN_GLONASS_START
-            && Parser->Data.satellites[i] <= PRN_GLONASS_END)
-            {
-              RTCM3Text("R%02d", Parser->Data.satellites[i] - (PRN_GLONASS_START-1));
-              glo = 1;
-            }
-            else if(Parser->Data.satellites[i] >= PRN_WAAS_START
-            && Parser->Data.satellites[i] <= PRN_WAAS_END)
-              RTCM3Text("S%02d", Parser->Data.satellites[i] - PRN_WAAS_START+20);
-            else
-              RTCM3Text("%3d", Parser->Data.satellites[i]);
-
-            if(glo)
-            {
-              for(j = 0; j < Parser->numdatatypesGLO; ++j)
-              {
-                int df = Parser->dataflagGLO[j];
-                int pos = Parser->dataposGLO[j];
-                if((Parser->Data.dataflags[i] & df)
-                && !isnan(Parser->Data.measdata[i][pos])
-                && !isinf(Parser->Data.measdata[i][pos]))
-                {
-                  char lli = ' ';
-                  char snr = ' ';
-                  if(df & (GNSSDF_L1CDATA|GNSSDF_L1PDATA))
-                  {
-                    if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL1)
-                      lli = '1';
-                    snr = '0'+Parser->Data.snrL1[i];
-                  }
-                  if(df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA))
-                  {
-                    if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL2)
-                      lli = '1';
-                    snr = '0'+Parser->Data.snrL2[i];
-                  }
-                  RTCM3Text("%14.3f%c%c",
-                  Parser->Data.measdata[i][pos],lli,snr);
-                }
-                else
-                { /* no or illegal data */
-                  RTCM3Text("                ");
-                }
-              }
-            }
-            else
-            {
-              for(j = 0; j < Parser->numdatatypesGPS; ++j)
-              {
-                int df = Parser->dataflagGPS[j];
-                int pos = Parser->dataposGPS[j];
-                if((Parser->Data.dataflags[i] & df)
-                && !isnan(Parser->Data.measdata[i][pos])
-                && !isinf(Parser->Data.measdata[i][pos]))
-                {
-                  char lli = ' ';
-                  char snr = ' ';
-                  if(df & (GNSSDF_L1CDATA|GNSSDF_L1PDATA))
-                  {
-                    if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL1)
-                      lli = '1';
-                    snr = '0'+Parser->Data.snrL1[i];
-                  }
-                  if(df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA))
-                  {
-                    if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL2)
-                      lli = '1';
-                    snr = '0'+Parser->Data.snrL2[i];
-                  }
-                  RTCM3Text("%14.3f%c%c",
-                  Parser->Data.measdata[i][pos],lli,snr);
-                }
-                else
-                { /* no or illegal data */
-                  RTCM3Text("                ");
-                }
-              }
-            }
-            RTCM3Text("\n");
-          }
-        }
-        else
-        {
-          RTCM3Text(" %02d %2d %2d %2d %2d %10.7f  0%3d",
-          cti.year%100, cti.month, cti.day, cti.hour, cti.minute, cti.second
-          + fmod(Parser->Data.timeofweek/1000.0,1.0), Parser->Data.numsats);
-          for(i = 0; i < 12 && i < Parser->Data.numsats; ++i)
-          {
-            if(Parser->Data.satellites[i] <= PRN_GPS_END)
-              RTCM3Text("G%02d", Parser->Data.satellites[i]);
-            else if(Parser->Data.satellites[i] >= PRN_GLONASS_START
-            && Parser->Data.satellites[i] <= PRN_GLONASS_END)
-              RTCM3Text("R%02d", Parser->Data.satellites[i] - (PRN_GLONASS_START-1));
-            else if(Parser->Data.satellites[i] >= PRN_WAAS_START
-            && Parser->Data.satellites[i] <= PRN_WAAS_END)
-              RTCM3Text("S%02d", Parser->Data.satellites[i] - PRN_WAAS_START+20);
-            else
-              RTCM3Text("%3d", Parser->Data.satellites[i]);
-          }
-          RTCM3Text("\n");
-          o = 12;
-          j = Parser->Data.numsats - 12;
-          while(j > 0)
-          {
-            RTCM3Text("                                ");
-            for(i = o; i < o+12 && i < Parser->Data.numsats; ++i)
-            {
-              if(Parser->Data.satellites[i] <= PRN_GPS_END)
-                RTCM3Text("G%02d", Parser->Data.satellites[i]);
-              else if(Parser->Data.satellites[i] >= PRN_GLONASS_START
-              && Parser->Data.satellites[i] <= PRN_GLONASS_END)
-                RTCM3Text("R%02d", Parser->Data.satellites[i] - (PRN_GLONASS_START-1));
-              else if(Parser->Data.satellites[i] >= PRN_WAAS_START
-              && Parser->Data.satellites[i] <= PRN_WAAS_END)
-                RTCM3Text("S%02d", Parser->Data.satellites[i] - PRN_WAAS_START+20);
-              else
-                RTCM3Text("%3d", Parser->Data.satellites[i]);
-            }
-            RTCM3Text("\n");
-            j -= 12;
-            o += 12;
-          }
-          for(i = 0; i < Parser->Data.numsats; ++i)
-          {
-            for(j = 0; j < Parser->numdatatypesGPS; ++j)
-            {
-              int v = 0;
-              int df = Parser->dataflag[j];
-              int pos = Parser->datapos[j];
-              if((Parser->Data.dataflags[i] & df)
-              && !isnan(Parser->Data.measdata[i][pos])
-              && !isinf(Parser->Data.measdata[i][pos]))
-              {
-                v = 1;
-              }
-              else
-              {
-                df = Parser->dataflagGPS[j];
-                pos = Parser->dataposGPS[j];
-
-                if((Parser->Data.dataflags[i] & df)
-                && !isnan(Parser->Data.measdata[i][pos])
-                && !isinf(Parser->Data.measdata[i][pos]))
-                {
-                  v = 1;
-                }
-              }
-
-              if(!v)
-              { /* no or illegal data */
-                RTCM3Text("                ");
-              }
-              else
-              {
-                char lli = ' ';
-                char snr = ' ';
-                if(df & (GNSSDF_L1CDATA|GNSSDF_L1PDATA))
-                {
-                  if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL1)
-                    lli = '1';
-                  snr = '0'+Parser->Data.snrL1[i];
-                }
-                if(df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA))
-                {
-                  if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL2)
-                    lli = '1';
-                  snr = '0'+Parser->Data.snrL2[i];
-                }
-                RTCM3Text("%14.3f%c%c",
-                Parser->Data.measdata[i][pos],lli,snr);
-              }
-              if(j%5 == 4 || j == Parser->numdatatypesGPS-1)
-                RTCM3Text("\n");
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-#ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2010/03/05 11:11:06 $";
-
-/* The string, which is send as agent in HTTP request */
-#define AGENTSTRING "NTRIP NtripRTCM3ToRINEX"
-
-#define MAXDATASIZE 1000 /* max number of bytes we can get at once */
-
-static const char encodingTable [64] = {
-  'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
-  'Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f',
-  'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-  'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/'
-};
-
-/* does not buffer overrun, but breaks directly after an error */
-/* returns the number of required bytes */
-static int encode(char *buf, int size, const char *user, const char *pwd)
-{
-  unsigned char inbuf[3];
-  char *out = buf;
-  int i, sep = 0, fill = 0, bytes = 0;
-
-  while(*user || *pwd)
-  {
-    i = 0;
-    while(i < 3 && *user) inbuf[i++] = *(user++);
-    if(i < 3 && !sep)    {inbuf[i++] = ':'; ++sep; }
-    while(i < 3 && *pwd)  inbuf[i++] = *(pwd++);
-    while(i < 3)         {inbuf[i++] = 0; ++fill; }
-    if(out-buf < size-1)
-      *(out++) = encodingTable[(inbuf [0] & 0xFC) >> 2];
-    if(out-buf < size-1)
-      *(out++) = encodingTable[((inbuf [0] & 0x03) << 4)
-               | ((inbuf [1] & 0xF0) >> 4)];
-    if(out-buf < size-1)
-    {
-      if(fill == 2)
-        *(out++) = '=';
-      else
-        *(out++) = encodingTable[((inbuf [1] & 0x0F) << 2)
-                 | ((inbuf [2] & 0xC0) >> 6)];
-    }
-    if(out-buf < size-1)
-    {
-      if(fill >= 1)
-        *(out++) = '=';
-      else
-        *(out++) = encodingTable[inbuf [2] & 0x3F];
-    }
-    bytes += 4;
-  }
-  if(out-buf < size)
-    *out = 0;
-  return bytes;
-}
-
-static int stop = 0;
-
-struct Args
-{
-  const char *server;
-  const char *port;
-  int         mode;
-  int         timeout;
-  int         rinex3;
-  const char *user;
-  const char *password;
-  const char *proxyhost;
-  const char *proxyport;
-  const char *nmea;
-  const char *data;
-  const char *headerfile;
-  const char *gpsephemeris;
-  const char *glonassephemeris;
-};
-
-/* option parsing */
-#ifdef NO_LONG_OPTS
-#define LONG_OPT(a)
-#else
-#define LONG_OPT(a) a
-static struct option opts[] = {
-{ "data",             required_argument, 0, 'd'},
-{ "server",           required_argument, 0, 's'},
-{ "password",         required_argument, 0, 'p'},
-{ "port",             required_argument, 0, 'r'},
-{ "timeout",          required_argument, 0, 't'},
-{ "header",           required_argument, 0, 'f'},
-{ "user",             required_argument, 0, 'u'},
-{ "gpsephemeris",     required_argument, 0, 'E'},
-{ "glonassephemeris", required_argument, 0, 'G'},
-{ "rinex3",           no_argument,       0, '3'},
-{ "proxyport",        required_argument, 0, 'R'},
-{ "proxyhost",        required_argument, 0, 'S'},
-{ "nmea",             required_argument, 0, 'n'},
-{ "mode",             required_argument, 0, 'M'},
-{ "help",             no_argument,       0, 'h'},
-{0,0,0,0}};
-#endif
-#define ARGOPT "-d:s:p:r:t:f:u:E:G:M:S:R:n:h3"
-
-enum MODE { HTTP = 1, RTSP = 2, NTRIP1 = 3, AUTO = 4, END };
-
-static const char *geturl(const char *url, struct Args *args)
-{
-  static char buf[1000];
-  static char *Buffer = buf;
-  static char *Bufend = buf+sizeof(buf);
-
-  if(strncmp("ntrip:", url, 6))
-    return "URL must start with 'ntrip:'.";
-  url += 6; /* skip ntrip: */
-
-  if(*url != '@' && *url != '/')
-  {
-    /* scan for mountpoint */
-    args->data = Buffer;
-    while(*url && *url != '@' &&  *url != ';' &&*url != '/' && Buffer != Bufend)
-      *(Buffer++) = *(url++);
-    if(Buffer == args->data)
-      return "Mountpoint required.";
-    else if(Buffer >= Bufend-1)
-      return "Parsing buffer too short.";
-    *(Buffer++) = 0;
-  }
-
-  if(*url == '/') /* username and password */
-  {
-    ++url;
-    args->user = Buffer;
-    while(*url && *url != '@' && *url != ';' && *url != ':' && Buffer != Bufend)
-      *(Buffer++) = *(url++);
-    if(Buffer == args->user)
-      return "Username cannot be empty.";
-    else if(Buffer >= Bufend-1)
-      return "Parsing buffer too short.";
-    *(Buffer++) = 0;
-
-    if(*url == ':') ++url;
-
-    args->password = Buffer;
-    while(*url && *url != '@' && *url != ';' && Buffer != Bufend)
-      *(Buffer++) = *(url++);
-    if(Buffer == args->password)
-      return "Password cannot be empty.";
-    else if(Buffer >= Bufend-1)
-      return "Parsing buffer too short.";
-    *(Buffer++) = 0;
-  }
-
-  if(*url == '@') /* server */
-  {
-    ++url;
-    if(*url != '@' && *url != ':')
-    {
-      args->server = Buffer;
-      while(*url && *url != '@' && *url != ':' && *url != ';' && Buffer != Bufend)
-        *(Buffer++) = *(url++);
-      if(Buffer == args->server)
-        return "Servername cannot be empty.";
-      else if(Buffer >= Bufend-1)
-        return "Parsing buffer too short.";
-      *(Buffer++) = 0;
-    }
-
-    if(*url == ':')
-    {
-      ++url;
-      args->port = Buffer;
-      while(*url && *url != '@' && *url != ';' && Buffer != Bufend)
-        *(Buffer++) = *(url++);
-      if(Buffer == args->port)
-        return "Port cannot be empty.";
-      else if(Buffer >= Bufend-1)
-        return "Parsing buffer too short.";
-      *(Buffer++) = 0;
-    }
-
-    if(*url == '@') /* proxy */
-    {
-      ++url;
-      args->proxyhost = Buffer;
-      while(*url && *url != ':' && *url != ';' && Buffer != Bufend)
-        *(Buffer++) = *(url++);
-      if(Buffer == args->proxyhost)
-        return "Proxy servername cannot be empty.";
-      else if(Buffer >= Bufend-1)
-        return "Parsing buffer too short.";
-      *(Buffer++) = 0;
-
-      if(*url == ':')
-      {
-        ++url;
-        args->proxyport = Buffer;
-        while(*url && *url != ';' && Buffer != Bufend)
-          *(Buffer++) = *(url++);
-        if(Buffer == args->proxyport)
-          return "Proxy port cannot be empty.";
-        else if(Buffer >= Bufend-1)
-          return "Parsing buffer too short.";
-        *(Buffer++) = 0;
-      }
-    }
-  }
-  if(*url == ';') /* NMEA */
-  {
-    args->nmea = ++url;
-    while(*url)
-      ++url;
-  }
-
-  return *url ? "Garbage at end of server string." : 0;
-}
-
-static int getargs(int argc, char **argv, struct Args *args)
-{
-  int res = 1;
-  int getoptr;
-  int help = 0;
-  char *t;
-
-  args->server = "www.euref-ip.net";
-  args->port = "2101";
-  args->timeout = 60;
-  args->user = "";
-  args->password = "";
-  args->data = 0;
-  args->headerfile = 0;
-  args->gpsephemeris = 0;
-  args->glonassephemeris = 0;
-  args->rinex3 = 0;
-  args->nmea = 0;
-  args->proxyhost = 0;
-  args->proxyport = "2101";
-  args->mode = AUTO;
-  help = 0;
-
-  do
-  {
-
-#ifdef NO_LONG_OPTS
-    switch((getoptr = getopt(argc, argv, ARGOPT)))
-#else
-    switch((getoptr = getopt_long(argc, argv, ARGOPT, opts, 0)))
-#endif
-    {
-    case 's': args->server = optarg; break;
-    case 'u': args->user = optarg; break;
-    case 'p': args->password = optarg; break;
-    case 'd': args->data = optarg; break;
-    case 'f': args->headerfile = optarg; break;
-    case 'E': args->gpsephemeris = optarg; break;
-    case 'G': args->glonassephemeris = optarg; break;
-    case 'r': args->port = optarg; break;
-    case '3': args->rinex3 = 1; break;
-    case 'S': args->proxyhost = optarg; break;
-    case 'n': args->nmea = optarg; break;
-    case 'R': args->proxyport = optarg; break;
-    case 'h': help=1; break;
-    case 'M':
-      args->mode = 0;
-      if (!strcmp(optarg,"n") || !strcmp(optarg,"ntrip1"))
-        args->mode = NTRIP1;
-      else if(!strcmp(optarg,"h") || !strcmp(optarg,"http"))
-        args->mode = HTTP;
-      else if(!strcmp(optarg,"r") || !strcmp(optarg,"rtsp"))
-        args->mode = RTSP;
-      else if(!strcmp(optarg,"a") || !strcmp(optarg,"auto"))
-        args->mode = AUTO;
-      else args->mode = atoi(optarg);
-      if((args->mode == 0) || (args->mode >= END))
-      {
-        fprintf(stderr, "Mode %s unknown\n", optarg);
-        res = 0;
-      }
-      break;
-    case 't':
-      args->timeout = strtoul(optarg, &t, 10);
-      if((t && *t) || args->timeout < 0)
-        res = 0;
-      break;
-
-    case 1:
-      {
-        const char *err;
-        if((err = geturl(optarg, args)))
-        {
-          RTCM3Error("%s\n\n", err);
-          res = 0;
-        }
-      }
-      break;
-    case -1: break;
-    }
-  } while(getoptr != -1 || !res);
-
-  datestr[0] = datestr[7];
-  datestr[1] = datestr[8];
-  datestr[2] = datestr[9];
-  datestr[3] = datestr[10];
-  datestr[5] = datestr[12];
-  datestr[6] = datestr[13];
-  datestr[8] = datestr[15];
-  datestr[9] = datestr[16];
-  datestr[4] = datestr[7] = '-';
-  datestr[10] = 0;
-
-  if(args->gpsephemeris && args->glonassephemeris && args->rinex3)
-  {
-    RTCM3Error("RINEX3 produces a combined ephemeris file, but 2 files were specified.\n"
-    "Please specify only one navigation file.\n");
-    res = 0;
-  }
-  else if(!res || help)
-  {
-    RTCM3Error("Version %s (%s) GPL" COMPILEDATE
-    "\nUsage: %s -s server -u user ...\n"
-    " -d " LONG_OPT("--data             ") "the requested data set\n"
-    " -f " LONG_OPT("--headerfile       ") "file for RINEX header information\n"
-    " -s " LONG_OPT("--server           ") "the server name or address\n"
-    " -p " LONG_OPT("--password         ") "the login password\n"
-    " -r " LONG_OPT("--port             ") "the server port number (default 2101)\n"
-    " -t " LONG_OPT("--timeout          ") "timeout in seconds (default 60)\n"
-    " -u " LONG_OPT("--user             ") "the user name\n"
-    " -E " LONG_OPT("--gpsephemeris     ") "output file for GPS ephemeris data\n"
-    " -G " LONG_OPT("--glonassephemeris ") "output file for GLONASS ephemeris data\n"
-    " -3 " LONG_OPT("--rinex3           ") "output RINEX type 3 data\n"
-    " -S " LONG_OPT("--proxyhost        ") "proxy name or address\n"
-    " -R " LONG_OPT("--proxyport        ") "proxy port, optional (default 2101)\n"
-    " -n " LONG_OPT("--nmea             ") "NMEA string for sending to server\n"
-    " -M " LONG_OPT("--mode             ") "mode for data request\n"
-    "     Valid modes are:\n"
-    "     1, h, http     NTRIP Version 2.0 Caster in TCP/IP mode\n"
-    "     2, r, rtsp     NTRIP Version 2.0 Caster in RTSP/RTP mode\n"
-    "     3, n, ntrip1   NTRIP Version 1.0 Caster\n"
-    "     4, a, auto     automatic detection (default)\n"
-    "or using an URL:\n%s ntrip:data[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]\n"
-    , revisionstr, datestr, argv[0], argv[0]);
-    exit(1);
-  }
-  return res;
-}
-
-/* let the output complete a block if necessary */
-static void signalhandler(int sig)
-{
-  if(!stop)
-  {
-    RTCM3Error("Stop signal number %d received. "
-    "Trying to terminate gentle.\n", sig);
-    stop = 1;
-    alarm(1);
-  }
-}
-
-#ifndef WINDOWSVERSION
-static void WaitMicro(int mic)
-{
-  struct timeval tv;
-  tv.tv_sec = mic/1000000;
-  tv.tv_usec = mic%1000000;
-#ifdef DEBUG
-  fprintf(stderr, "Waiting %d micro seconds\n", mic);
-#endif
-  select(0, 0, 0, 0, &tv);
-}
-#else /* WINDOWSVERSION */
-void WaitMicro(int mic)
-{
-   Sleep(mic/1000);
-}
-#endif /* WINDOWSVERSION */
-
-#define ALARMTIME   (2*60)
-
-/* for some reason we had to abort hard (maybe waiting for data */
-#ifdef __GNUC__
-static __attribute__ ((noreturn)) void signalhandler_alarm(
-int sig __attribute__((__unused__)))
-#else /* __GNUC__ */
-static void signalhandler_alarm(int sig)
-#endif /* __GNUC__ */
-{
-  RTCM3Error("Programm forcefully terminated.\n");
-  exit(1);
-}
-
-int main(int argc, char **argv)
-{
-  struct Args args;
-  struct RTCM3ParserData Parser;
-
-  setbuf(stdout, 0);
-  setbuf(stdin, 0);
-  setbuf(stderr, 0);
-
-  {
-    char *a;
-    int i=0;
-    for(a = revisionstr+11; *a && *a != ' '; ++a)
-      revisionstr[i++] = *a;
-    revisionstr[i] = 0;
-  }
-
-  signal(SIGINT, signalhandler);
-  signal(SIGALRM,signalhandler_alarm);
-  signal(SIGQUIT,signalhandler);
-  signal(SIGTERM,signalhandler);
-  signal(SIGPIPE,signalhandler);
-  memset(&Parser, 0, sizeof(Parser));
-  {
-    time_t tim;
-    tim = time(0) - ((10*365+2+5)*24*60*60+LEAPSECONDS);
-    Parser.GPSWeek = tim/(7*24*60*60);
-    Parser.GPSTOW = tim%(7*24*60*60);
-  }
-
-  if(getargs(argc, argv, &args))
-  {
-    int sockfd, numbytes;
-    char buf[MAXDATASIZE];
-    struct sockaddr_in their_addr; /* connector's address information */
-    struct hostent *he;
-    struct servent *se;
-    const char *server, *port, *proxyserver = 0;
-    char proxyport[6];
-    char *b;
-    long i;
-    struct timeval tv;
-
-    alarm(ALARMTIME);
-
-    Parser.headerfile = args.headerfile;
-    Parser.glonassephemeris = args.glonassephemeris;
-    Parser.gpsephemeris = args.gpsephemeris;
-    Parser.rinex3 = args.rinex3;
-
-    if(args.proxyhost)
-    {
-      int p;
-      if((i = strtol(args.port, &b, 10)) && (!b || !*b))
-        p = i;
-      else if(!(se = getservbyname(args.port, 0)))
-      {
-        RTCM3Error("Can't resolve port %s.", args.port);
-        exit(1);
-      }
-      else
-      {
-        p = ntohs(se->s_port);
-      }
-      snprintf(proxyport, sizeof(proxyport), "%d", p);
-      port = args.proxyport;
-      proxyserver = args.server;
-      server = args.proxyhost;
-    }
-    else
-    {
-      server = args.server;
-      port = args.port;
-    }
-
-    memset(&their_addr, 0, sizeof(struct sockaddr_in));
-    if((i = strtol(port, &b, 10)) && (!b || !*b))
-      their_addr.sin_port = htons(i);
-    else if(!(se = getservbyname(port, 0)))
-    {
-      RTCM3Error("Can't resolve port %s.", port);
-      exit(1);
-    }
-    else
-    {
-      their_addr.sin_port = se->s_port;
-    }
-    if(!(he=gethostbyname(server)))
-    {
-      RTCM3Error("Server name lookup failed for '%s'.\n", server);
-      exit(1);
-    }
-    if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
-    {
-      perror("socket");
-      exit(1);
-    }
-
-    tv.tv_sec  = args.timeout;
-    tv.tv_usec = 0;
-    if(setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval) ) == -1)
-    {
-      RTCM3Error("Function setsockopt: %s\n", strerror(errno));
-      exit(1);
-    }
-
-    their_addr.sin_family = AF_INET;
-    their_addr.sin_addr = *((struct in_addr *)he->h_addr);
-
-    if(args.data && args.mode == RTSP)
-    {
-      struct sockaddr_in local;
-      int sockudp, localport;
-      int cseq = 1;
-      socklen_t len;
-
-      if((sockudp = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
-      {
-        perror("socket");
-        exit(1);
-      }
-      /* fill structure with local address information for UDP */
-      memset(&local, 0, sizeof(local));
-      local.sin_family = AF_INET;
-      local.sin_port = htons(0);
-      local.sin_addr.s_addr = htonl(INADDR_ANY);
-      len = sizeof(local);
-      /* bind() in order to get a random RTP client_port */
-      if((bind(sockudp, (struct sockaddr *)&local, len)) < 0)
-      {
-        perror("bind");
-        exit(1);
-      }
-      if((getsockname(sockudp, (struct sockaddr*)&local, &len)) != -1)
-      {
-        localport = ntohs(local.sin_port);
-      }
-      else
-      {
-        perror("local access failed");
-        exit(1);
-      }
-      if(connect(sockfd, (struct sockaddr *)&their_addr,
-      sizeof(struct sockaddr)) == -1)
-      {
-        perror("connect");
-        exit(1);
-      }
-      i=snprintf(buf, MAXDATASIZE-40, /* leave some space for login */
-      "SETUP rtsp://%s%s%s/%s RTSP/1.0\r\n"
-      "CSeq: %d\r\n"
-      "Ntrip-Version: Ntrip/2.0\r\n"
-      "Ntrip-Component: Ntripclient\r\n"
-      "User-Agent: %s/%s\r\n"
-      "Transport: RTP/GNSS;unicast;client_port=%u\r\n"
-      "Authorization: Basic ",
-      args.server, proxyserver ? ":" : "", proxyserver ? args.port : "",
-      args.data, cseq++, AGENTSTRING, revisionstr, localport);
-      if(i > MAXDATASIZE-40 || i < 0) /* second check for old glibc */
-      {
-        RTCM3Error("Requested data too long\n");
-        exit(1);
-      }
-      i += encode(buf+i, MAXDATASIZE-i-4, args.user, args.password);
-      if(i > MAXDATASIZE-4)
-      {
-        RTCM3Error("Username and/or password too long\n");
-        exit(1);
-      }
-      buf[i++] = '\r';
-      buf[i++] = '\n';
-      buf[i++] = '\r';
-      buf[i++] = '\n';
-      if(args.nmea)
-      {
-        int j = snprintf(buf+i, MAXDATASIZE-i, "%s\r\n", args.nmea);
-        if(j >= 0 && j < MAXDATASIZE-i)
-          i += j;
-        else
-        {
-          RTCM3Error("NMEA string too long\n");
-          exit(1);
-        }
-      }
-      if(send(sockfd, buf, (size_t)i, 0) != i)
-      {
-        perror("send");
-        exit(1);
-      }
-      if((numbytes=recv(sockfd, buf, MAXDATASIZE-1, 0)) != -1)
-      {
-        if(numbytes >= 17 && !strncmp(buf, "RTSP/1.0 200 OK\r\n", 17))
-        {
-          int serverport = 0, session = 0;
-          const char *portcheck = "server_port=";
-          const char *sessioncheck = "session: ";
-          int l = strlen(portcheck)-1;
-          int j=0;
-          for(i = 0; j != l && i < numbytes-l; ++i)
-          {
-            for(j = 0; j < l && tolower(buf[i+j]) == portcheck[j]; ++j)
-              ;
-          }
-          if(i == numbytes-l)
-          {
-            RTCM3Error("No server port number found\n");
-            exit(1);
-          }
-          else
-          {
-            i+=l;
-            while(i < numbytes && buf[i] >= '0' && buf[i] <= '9')
-              serverport = serverport * 10 + buf[i++]-'0';
-            if(buf[i] != '\r' && buf[i] != ';')
-            {
-              RTCM3Error("Could not extract server port\n");
-              exit(1);
-            }
-          }
-          l = strlen(sessioncheck)-1;
-          j=0;
-          for(i = 0; j != l && i < numbytes-l; ++i)
-          {
-            for(j = 0; j < l && tolower(buf[i+j]) == sessioncheck[j]; ++j)
-              ;
-          }
-          if(i == numbytes-l)
-          {
-            RTCM3Error("No session number found\n");
-            exit(1);
-          }
-          else
-          {
-            i+=l;
-            while(i < numbytes && buf[i] >= '0' && buf[i] <= '9')
-              session = session * 10 + buf[i++]-'0';
-            if(buf[i] != '\r')
-            {
-              RTCM3Error("Could not extract session number\n");
-              exit(1);
-            }
-          }
-
-          i = snprintf(buf, MAXDATASIZE,
-          "PLAY rtsp://%s%s%s/%s RTSP/1.0\r\n"
-          "CSeq: %d\r\n"
-          "Session: %d\r\n"
-          "\r\n",
-          args.server, proxyserver ? ":" : "", proxyserver ? args.port : "",
-          args.data, cseq++, session);
-
-          if(i > MAXDATASIZE || i < 0) /* second check for old glibc */
-          {
-            RTCM3Error("Requested data too long\n");
-            exit(1);
-          }
-          if(send(sockfd, buf, (size_t)i, 0) != i)
-          {
-            perror("send");
-            exit(1);
-          }
-          if((numbytes=recv(sockfd, buf, MAXDATASIZE-1, 0)) != -1)
-          {
-            if(numbytes >= 17 && !strncmp(buf, "RTSP/1.0 200 OK\r\n", 17))
-            {
-              struct sockaddr_in addrRTP;
-              /* fill structure with caster address information for UDP */
-              memset(&addrRTP, 0, sizeof(addrRTP));
-              addrRTP.sin_family = AF_INET;
-              addrRTP.sin_port   = htons(serverport);
-              their_addr.sin_addr = *((struct in_addr *)he->h_addr);
-              len = sizeof(addrRTP);
-              int ts = 0;
-              int sn = 0;
-              int ssrc = 0;
-              int init = 0;
-              int u, v, w;
-              while(!stop && (i = recvfrom(sockudp, buf, 1526, 0,
-              (struct sockaddr*) &addrRTP, &len)) > 0)
-              {
-                alarm(ALARMTIME);
-                if(i >= 12+1 && (unsigned char)buf[0] == (2 << 6) && buf[1] == 0x60)
-                {
-                  u= ((unsigned char)buf[2]<<8)+(unsigned char)buf[3];
-                  v = ((unsigned char)buf[4]<<24)+((unsigned char)buf[5]<<16)
-                  +((unsigned char)buf[6]<<8)+(unsigned char)buf[7];
-                  w = ((unsigned char)buf[8]<<24)+((unsigned char)buf[9]<<16)
-                  +((unsigned char)buf[10]<<8)+(unsigned char)buf[11];
-
-                  if(init)
-                  {
-                    int z;
-                    if(u < -30000 && sn > 30000) sn -= 0xFFFF;
-                    if(ssrc != w || ts > v)
-                    {
-                      RTCM3Error("Illegal UDP data received.\n");
-                      exit(1);
-                    }
-                    if(u > sn) /* don't show out-of-order packets */
-                    for(z = 12; z < i && !stop; ++z)
-                      HandleByte(&Parser, (unsigned int) buf[z]);
-                  }
-                  sn = u; ts = v; ssrc = w; init = 1;
-                }
-                else
-                {
-                  RTCM3Error("Illegal UDP header.\n");
-                  exit(1);
-                }
-              }
-            }
-            i = snprintf(buf, MAXDATASIZE,
-            "TEARDOWN rtsp://%s%s%s/%s RTSP/1.0\r\n"
-            "CSeq: %d\r\n"
-            "Session: %d\r\n"
-            "\r\n",
-            args.server, proxyserver ? ":" : "", proxyserver ? args.port : "",
-            args.data, cseq++, session);
-
-            if(i > MAXDATASIZE || i < 0) /* second check for old glibc */
-            {
-              RTCM3Error("Requested data too long\n");
-              exit(1);
-            }
-            if(send(sockfd, buf, (size_t)i, 0) != i)
-            {
-              perror("send");
-              exit(1);
-            }
-          }
-          else
-          {
-            RTCM3Error("Could not start data stream.\n");
-            exit(1);
-          }
-        }
-        else
-        {
-          RTCM3Error("Could not setup initial control connection.\n");
-          exit(1);
-        }
-      }
-      else
-      {
-        perror("recv");
-        exit(1);
-      }
-    }
-    else
-    {
-      if(connect(sockfd, (struct sockaddr *)&their_addr,
-      sizeof(struct sockaddr)) == -1)
-      {
-        perror("connect");
-        exit(1);
-      }
-      if(!args.data)
-      {
-        i = snprintf(buf, MAXDATASIZE,
-        "GET %s%s%s%s/ HTTP/1.0\r\n"
-        "Host: %s\r\n%s"
-        "User-Agent: %s/%s\r\n"
-        "Connection: close\r\n"
-        "\r\n"
-        , proxyserver ? "http://" : "", proxyserver ? proxyserver : "",
-        proxyserver ? ":" : "", proxyserver ? proxyport : "",
-        args.server, args.mode == NTRIP1 ? "" : "Ntrip-Version: Ntrip/2.0\r\n",
-        AGENTSTRING, revisionstr);
-      }
-      else
-      {
-        i=snprintf(buf, MAXDATASIZE-40, /* leave some space for login */
-        "GET %s%s%s%s/%s HTTP/1.0\r\n"
-        "Host: %s\r\n%s"
-        "User-Agent: %s/%s\r\n"
-        "Connection: close\r\n"
-        "Authorization: Basic "
-        , proxyserver ? "http://" : "", proxyserver ? proxyserver : "",
-        proxyserver ? ":" : "", proxyserver ? proxyport : "",
-        args.data, args.server,
-        args.mode == NTRIP1 ? "" : "Ntrip-Version: Ntrip/2.0\r\n",
-        AGENTSTRING, revisionstr);
-        if(i > MAXDATASIZE-40 || i < 0) /* second check for old glibc */
-        {
-          RTCM3Error("Requested data too long\n");
-          exit(1);
-        }
-        i += encode(buf+i, MAXDATASIZE-i-4, args.user, args.password);
-        if(i > MAXDATASIZE-4)
-        {
-          RTCM3Error("Username and/or password too long\n");
-          exit(1);
-        }
-        buf[i++] = '\r';
-        buf[i++] = '\n';
-        buf[i++] = '\r';
-        buf[i++] = '\n';
-        if(args.nmea)
-        {
-          int j = snprintf(buf+i, MAXDATASIZE-i, "%s\r\n", args.nmea);
-          if(j >= 0 && j < MAXDATASIZE-i)
-            i += j;
-          else
-          {
-            RTCM3Error("NMEA string too long\n");
-            exit(1);
-          }
-        }
-      }
-      if(send(sockfd, buf, (size_t)i, 0) != i)
-      {
-        perror("send");
-        exit(1);
-      }
-      if(args.data)
-      {
-        int k = 0;
-        int chunkymode = 0;
-        int starttime = time(0);
-        int lastout = starttime;
-        int totalbytes = 0;
-        int chunksize = 0;
-
-        while(!stop && (numbytes=recv(sockfd, buf, MAXDATASIZE-1, 0)) != -1)
-        {
-          if(numbytes > 0)
-            alarm(ALARMTIME);
-          else
-          {
-            WaitMicro(100);
-            continue;
-          }
-          if(!k)
-          {
-            if(numbytes > 17 && (!strncmp(buf, "HTTP/1.1 200 OK\r\n", 17)
-            || !strncmp(buf, "HTTP/1.0 200 OK\r\n", 17)))
-            {
-              const char *datacheck = "Content-Type: gnss/data\r\n";
-              const char *chunkycheck = "Transfer-Encoding: chunked\r\n";
-              int l = strlen(datacheck)-1;
-              int j=0;
-              for(i = 0; j != l && i < numbytes-l; ++i)
-              {
-                for(j = 0; j < l && buf[i+j] == datacheck[j]; ++j)
-                  ;
-              }
-              if(i == numbytes-l)
-              {
-                RTCM3Error("No 'Content-Type: gnss/data' found\n");
-                exit(1);
-              }
-              l = strlen(chunkycheck)-1;
-              j=0;
-              for(i = 0; j != l && i < numbytes-l; ++i)
-              {
-                for(j = 0; j < l && buf[i+j] == chunkycheck[j]; ++j)
-                  ;
-              }
-              if(i < numbytes-l)
-                chunkymode = 1;
-            }
-            else if(numbytes < 12 || strncmp("ICY 200 OK\r\n", buf, 12))
-            {
-              RTCM3Error("Could not get the requested data: ");
-              for(k = 0; k < numbytes && buf[k] != '\n' && buf[k] != '\r'; ++k)
-              {
-                RTCM3Error("%c", isprint(buf[k]) ? buf[k] : '.');
-              }
-              RTCM3Error("\n");
-              exit(1);
-            }
-            else if(args.mode != NTRIP1)
-            {
-              if(args.mode != AUTO)
-              {
-                RTCM3Error("NTRIP version 2 HTTP connection failed%s.\n",
-                args.mode == AUTO ? ", falling back to NTRIP1" : "");
-              }
-              if(args.mode == HTTP)
-                exit(1);
-            }
-            ++k;
-          }
-          else
-          {
-            if(chunkymode)
-            {
-              int stop = 0;
-              int pos = 0;
-              while(!stop && pos < numbytes)
-              {
-                switch(chunkymode)
-                {
-                case 1: /* reading number starts */
-                  chunksize = 0;
-                  ++chunkymode; /* no break */
-                case 2: /* during reading number */
-                  i = buf[pos++];
-                  if(i >= '0' && i <= '9') chunksize = chunksize*16+i-'0';
-                  else if(i >= 'a' && i <= 'f') chunksize = chunksize*16+i-'a'+10;
-                  else if(i >= 'A' && i <= 'F') chunksize = chunksize*16+i-'A'+10;
-                  else if(i == '\r') ++chunkymode;
-                  else if(i == ';') chunkymode = 5;
-                  else stop = 1;
-                  break;
-                case 3: /* scanning for return */
-                  if(buf[pos++] == '\n') chunkymode = chunksize ? 4 : 1;
-                  else stop = 1;
-                  break;
-                case 4: /* output data */
-                  i = numbytes-pos;
-                  if(i > chunksize) i = chunksize;
-                  {
-                    int z;
-                    for(z = 0; z < i && !stop; ++z)
-                      HandleByte(&Parser, (unsigned int) buf[pos+z]);
-                  }
-                  totalbytes += i;
-                  chunksize -= i;
-                  pos += i;
-                  if(!chunksize)
-                    chunkymode = 1;
-                  break;
-                case 5:
-                  if(i == '\r') chunkymode = 3;
-                  break;
-                }
-              }
-              if(stop)
-              {
-                RTCM3Error("Error in chunky transfer encoding\n");
-                break;
-              }
-            }
-            else
-            {
-              totalbytes += numbytes;
-              {
-                int z;
-                for(z = 0; z < numbytes && !stop; ++z)
-                  HandleByte(&Parser, (unsigned int) buf[z]);
-              }
-            }
-            if(totalbytes < 0) /* overflow */
-            {
-              totalbytes = 0;
-              starttime = time(0);
-              lastout = starttime;
-            }
-          }
-        }
-      }
-      else
-      {
-        while(!stop && (numbytes=recv(sockfd, buf, MAXDATASIZE-1, 0)) > 0)
-        {
-          alarm(ALARMTIME);
-          fwrite(buf, (size_t)numbytes, 1, stdout);
-        }
-      }
-      close(sockfd);
-    }
-  }
-  return 0;
-}
-#endif /* NO_RTCM3_MAIN */
Index: trunk/BNC/RTCM3/rtcm3torinex.h
===================================================================
--- trunk/BNC/RTCM3/rtcm3torinex.h	(revision 2491)
+++ 	(revision )
@@ -1,256 +1,0 @@
-#ifndef RTCM3TORINEX_H
-#define RTCM3TORINEX_H
-
-/*
-  Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.h,v 1.12 2010/03/05 11:11:06 stoecker Exp $
-  Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  or read http://www.gnu.org/licenses/gpl.txt
-*/
-
-#include <stdio.h>
-
-#define GNSS_MAXSATS 64
-
-#define PRN_GPS_START             1
-#define PRN_GPS_END               32
-#define PRN_GLONASS_START         38
-#define PRN_GLONASS_END           61
-#define PRN_WAAS_START            120
-#define PRN_WAAS_END              138
-
-#define GNSSENTRY_C1DATA     0
-#define GNSSENTRY_C2DATA     1
-#define GNSSENTRY_P1DATA     2
-#define GNSSENTRY_P2DATA     3
-#define GNSSENTRY_L1CDATA    4
-#define GNSSENTRY_L1PDATA    5
-#define GNSSENTRY_L2CDATA    6
-#define GNSSENTRY_L2PDATA    7
-#define GNSSENTRY_D1CDATA    8
-#define GNSSENTRY_D1PDATA    9
-#define GNSSENTRY_D2CDATA    10
-#define GNSSENTRY_D2PDATA    11
-#define GNSSENTRY_S1CDATA    12
-#define GNSSENTRY_S1PDATA    13
-#define GNSSENTRY_S2CDATA    14
-#define GNSSENTRY_S2PDATA    15
-#define GNSSENTRY_NUMBER     16 /* number of types!!! */
-
-/* Data flags. These flags are used in the dataflags field of gpsdata structure
-   and are used the determine, which data fields are filled with valid data. */
-#define GNSSDF_C1DATA         (1<<GNSSENTRY_C1DATA)
-#define GNSSDF_C2DATA         (1<<GNSSENTRY_C2DATA)
-#define GNSSDF_P1DATA         (1<<GNSSENTRY_P1DATA)
-#define GNSSDF_P2DATA         (1<<GNSSENTRY_P2DATA)
-#define GNSSDF_L1CDATA        (1<<GNSSENTRY_L1CDATA)
-#define GNSSDF_L1PDATA        (1<<GNSSENTRY_L1PDATA)
-#define GNSSDF_L2CDATA        (1<<GNSSENTRY_L2CDATA)
-#define GNSSDF_L2PDATA        (1<<GNSSENTRY_L2PDATA)
-#define GNSSDF_D1CDATA        (1<<GNSSENTRY_D1CDATA)
-#define GNSSDF_D1PDATA        (1<<GNSSENTRY_D1PDATA)
-#define GNSSDF_D2CDATA        (1<<GNSSENTRY_D2CDATA)
-#define GNSSDF_D2PDATA        (1<<GNSSENTRY_D2PDATA)
-#define GNSSDF_S1CDATA        (1<<GNSSENTRY_S1CDATA)
-#define GNSSDF_S1PDATA        (1<<GNSSENTRY_S1PDATA)
-#define GNSSDF_S2CDATA        (1<<GNSSENTRY_S2CDATA)
-#define GNSSDF_S2PDATA        (1<<GNSSENTRY_S2PDATA)
-
-#define RINEXENTRY_C1DATA     0
-#define RINEXENTRY_C2DATA     1
-#define RINEXENTRY_P1DATA     2
-#define RINEXENTRY_P2DATA     3
-#define RINEXENTRY_L1DATA     4
-#define RINEXENTRY_L2DATA     5
-#define RINEXENTRY_D1DATA     6
-#define RINEXENTRY_D2DATA     7
-#define RINEXENTRY_S1DATA     8
-#define RINEXENTRY_S2DATA     9
-#define RINEXENTRY_NUMBER     10
-
-#define LIGHTSPEED         2.99792458e8    /* m/sec */
-#define GPS_FREQU_L1       1575420000.0  /* Hz */
-#define GPS_FREQU_L2       1227600000.0  /* Hz */
-#define GPS_WAVELENGTH_L1  (LIGHTSPEED / GPS_FREQU_L1) /* m */
-#define GPS_WAVELENGTH_L2  (LIGHTSPEED / GPS_FREQU_L2) /* m */
-
-#define GLO_FREQU_L1_BASE  1602000000.0  /* Hz */
-#define GLO_FREQU_L2_BASE  1246000000.0  /* Hz */
-#define GLO_FREQU_L1_STEP      562500.0  /* Hz */
-#define GLO_FREQU_L2_STEP      437500.0  /* Hz */
-#define GLO_FREQU_L1(a)      (GLO_FREQU_L1_BASE+(a)*GLO_FREQU_L1_STEP)
-#define GLO_FREQU_L2(a)      (GLO_FREQU_L2_BASE+(a)*GLO_FREQU_L2_STEP)
-#define GLO_WAVELENGTH_L1(a) (LIGHTSPEED / GLO_FREQU_L1(a)) /* m */
-#define GLO_WAVELENGTH_L2(a) (LIGHTSPEED / GLO_FREQU_L2(a)) /* m */
-
-/* Additional flags for the data field, which tell us more. */
-#define GNSSDF_LOCKLOSSL1     (1<<29)  /* lost lock on L1 */
-#define GNSSDF_LOCKLOSSL2     (1<<30)  /* lost lock on L2 */
-
-struct converttimeinfo {
-  int second;    /* seconds of GPS time [0..59] */
-  int minute;    /* minutes of GPS time [0..59] */
-  int hour;      /* hour of GPS time [0..24] */
-  int day;       /* day of GPS time [1..28..30(31)*/
-  int month;     /* month of GPS time [1..12]*/
-  int year;      /* year of GPS time [1980..] */
-};
-
-struct gnssdata {
-  int    flags;              /* GPSF_xxx */
-  int    week;               /* week number of GPS date */
-  int    numsats;
-  double timeofweek;         /* milliseconds in GPS week */
-  double measdata[GNSS_MAXSATS][GNSSENTRY_NUMBER];  /* data fields */ 
-  int    dataflags[GNSS_MAXSATS];      /* GPSDF_xxx */
-  int    satellites[GNSS_MAXSATS];     /* SV - IDs */
-  int    channels[GNSS_MAXSATS];       /* Glonass channels - valid of Glonass SV only */
-  int    snrL1[GNSS_MAXSATS];          /* Important: all the 5 SV-specific fields must */
-  int    snrL2[GNSS_MAXSATS];          /* have the same SV-order */
-};
-
-#define GPSEPHF_L2PCODEDATA    (1<<0) /* set, if NAV data OFF on L2 P-code, s1w4b01 */
-#define GPSEPHF_L2PCODE        (1<<1) /* set, if P-code available, s1w3b12 */
-#define GPSEPHF_L2CACODE       (1<<2) /* set, if CA-code available, s1w3b11 */
-#define GPSEPHF_VALIDATED      (1<<3) /* data is completely valid */
-
-#define R2R_PI          3.1415926535898
-
-struct gpsephemeris {
-  int    flags;            /* GPSEPHF_xxx */
-  int    satellite;        /*  SV ID   ICD-GPS data position */
-  int    IODE;             /*          [s2w3b01-08]              */
-  int    URAindex;         /*  [1..15] [s1w3b13-16]              */
-  int    SVhealth;         /*          [s1w3b17-22]              */
-  int    GPSweek;          /*          [s1w3b01-10]              */
-  int    IODC;             /*          [s1w3b23-32,w8b01-08]     */
-  int    TOW;              /*  [s]     [s1w2b01-17]              */
-  int    TOC;              /*  [s]     [s1w8b09-24]              */
-  int    TOE;              /*  [s]     [s2w10b1-16]              */
-  double clock_bias;       /*  [s]     [s1w10b1-22, af0]         */
-  double clock_drift;      /*  [s/s]   [s1w9b09-24, af1]         */
-  double clock_driftrate;  /*  [s/s^2] [s1w9b01-08, af2]         */
-  double Crs;              /*  [m]     [s2w3b09-24]              */
-  double Delta_n;          /*  [rad/s] [s2w4b01-16 * Pi]         */
-  double M0;               /*  [rad]   [s2w4b17-24,w5b01-24 * Pi]*/
-  double Cuc;              /*  [rad]   [s2w6b01-16]              */
-  double e;                /*          [s2w6b17-24,w6b01-24]     */
-  double Cus;              /*  [rad]   [s2w8b01-16]              */
-  double sqrt_A;           /*  [m^0.5] [s2w8b16-24,w9b01-24]     */
-  double Cic;              /*  [rad]   [s3w3b01-16]              */
-  double OMEGA0;           /*  [rad]   [s3w3b17-24,w4b01-24 * Pi]*/
-  double Cis;              /*  [rad]   [s3w5b01-16]              */
-  double i0;               /*  [rad]   [s3w5b17-24,w6b01-24 * Pi]*/
-  double Crc;              /*  [m]     [s3w701-16]               */
-  double omega;            /*  [rad]   [s3w7b17-24,w8b01-24 * Pi]*/
-  double OMEGADOT;         /*  [rad/s] [s3w9b01-24 * Pi]         */
-  double IDOT;             /*  [rad/s] [s3w10b9-22 * Pi]         */
-  double TGD;              /*  [s]     [s1w7b17-24]              */
-};
-
-#define GLOEPHF_UNHEALTHY       (1<<0) /* set if unhealty satellite, f2b78 */
-#define GLOEPHF_ALMANACHEALTHOK (1<<1) /* set if ALM health is available */
-#define GLOEPHF_ALMANACHEALTHY  (1<<2) /* set if Cn word is true */
-#define GLOEPHF_PAVAILABLE      (1<<3) /* set if the 3 P flags are available */
-#define GLOEPHF_P10TRUE         (1<<4)
-#define GLOEPHF_P11TRUE         (1<<5)
-#define GLOEPHF_P2TRUE          (1<<6)
-#define GLOEPHF_P3TRUE          (1<<7)
-
-struct glonassephemeris {
-  int    GPSWeek;
-  int    GPSTOW;
-  int    flags;              /* GLOEPHF_xxx */
-  int    almanac_number;
-  int    frequency_number;   /* ICD-GLONASS data position */
-  int    tb;                 /* [s]     [f2b70-76] */
-  int    tk;                 /* [s]     [f1b65-76] */
-  int    E;                  /* [days]  [f4b49-53] */
-  double tau;                /* [s]     [f4b59-80] */
-  double gamma;              /*         [f3b69-79] */
-  double x_pos;              /* [km]    [f1b09-35] */
-  double x_velocity;         /* [km/s]  [f1b41-64] */
-  double x_acceleration;     /* [km/s^2][f1b36-40] */
-  double y_pos;              /* [km]    [f2b09-35] */
-  double y_velocity;         /* [km/s]  [f2b41-64] */
-  double y_acceleration;     /* [km/s^2][f2b36-40] */
-  double z_pos;              /* [km]    [f3b09-35] */
-  double z_velocity;         /* [km/s]  [f3b41-64] */
-  double z_acceleration;     /* [km/s^2][f3b36-40] */
-};
-
-struct RTCM3ParserData {
-  unsigned char Message[2048]; /* input-buffer */
-  int    MessageSize;   /* current buffer size */
-  int    NeedBytes;     /* bytes wanted for next run */
-  int    SkipBytes;     /* bytes to skip in next round */
-  int    GPSWeek;
-  int    GPSTOW;        /* in seconds */
-  struct gnssdata Data;
-  struct gpsephemeris ephemerisGPS;
-  struct glonassephemeris ephemerisGLONASS;
-  struct gnssdata DataNew;
-  int    size;
-  int    lastlockl1[64];
-  int    lastlockl2[64];
-#ifdef NO_RTCM3_MAIN
-  double antX;
-  double antY;
-  double antZ;
-  double antH;
-  char   antenna[256+1];
-  int    blocktype;
-#endif /* NO_RTCM3_MAIN */
-  int    datapos[RINEXENTRY_NUMBER];
-  int    dataflag[RINEXENTRY_NUMBER];
-  /* for RINEX2 GPS and GLO are both handled in GPS */
-  int    dataposGPS[RINEXENTRY_NUMBER]; /* SBAS has same entries */
-  int    dataflagGPS[RINEXENTRY_NUMBER];
-  int    dataposGLO[RINEXENTRY_NUMBER]; /* only used for RINEX3 */
-  int    dataflagGLO[RINEXENTRY_NUMBER];
-  int    numdatatypesGPS;
-  int    numdatatypesGLO; /* only used for RINEX3 */
-  int    validwarning;
-  int    init;
-  int    startflags;
-  int    rinex3;
-  const char * headerfile;
-  const char * glonassephemeris;
-  const char * gpsephemeris;
-  FILE *glonassfile;
-  FILE *gpsfile;
-};
-
-#ifndef PRINTFARG
-#ifdef __GNUC__
-#define PRINTFARG(a,b) __attribute__ ((format(printf, a, b)))
-#else /* __GNUC__ */
-#define PRINTFARG(a,b)
-#endif /* __GNUC__ */
-#endif /* PRINTFARG */
-
-int gnumleap(int year, int month, int day);
-void updatetime(int *week, int *tow, int tk, int fixnumleap);
-void converttime(struct converttimeinfo *c, int week, int tow);
-
-void HandleHeader(struct RTCM3ParserData *Parser);
-int RTCM3Parser(struct RTCM3ParserData *handle);
-void HandleByte(struct RTCM3ParserData *Parser, unsigned int byte);
-void PRINTFARG(1,2) RTCM3Error(const char *fmt, ...);
-void PRINTFARG(1,2) RTCM3Text(const char *fmt, ...);
-
-#endif /* RTCM3TORINEX_H */
Index: trunk/BNC/RTIGS/RTIGSDecoder.h
===================================================================
--- trunk/BNC/RTIGS/RTIGSDecoder.h	(revision 2491)
+++ trunk/BNC/RTIGS/RTIGSDecoder.h	(revision 2492)
@@ -33,5 +33,5 @@
 // 2/1/2008 SPG Start
 extern "C" {
-	#include "../RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 }
 
Index: trunk/BNC/bnc.pro
===================================================================
--- trunk/BNC/bnc.pro	(revision 2491)
+++ trunk/BNC/bnc.pro	(revision 2492)
@@ -29,5 +29,5 @@
 # Include Path
 # ------------
-INCLUDEPATH = . ./newmat ./RTCM3
+INCLUDEPATH = . ./newmat ./RTCM3 ./RTCM3/clock_and_orbit ./RTCM3/rtcm3torinex
 
 HEADERS = bnchelp.html bncgetthread.h    bncwindow.h   bnctabledlg.h  \
@@ -43,6 +43,7 @@
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
-          RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex.h                   \
-          RTCM3/RTCM3coDecoder.h RTCM3/clock_orbit_rtcm.h             \
+          RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex/rtcm3torinex.h      \
+          RTCM3/RTCM3coDecoder.h                                      \
+          RTCM3/clock_and_orbit/clock_orbit_rtcm.h                    \
           RTCM3/ephemeris.h RTCM3/timeutils.h                         \
           RTIGS/RTIGSDecoder.h RTIGS/rtigs_records.h                  \
@@ -68,9 +69,10 @@
           bncserialport.cpp bncnetquerys.cpp bncfigure.cpp            \
           bncfigurelate.cpp bncpppclient.cpp bnctime.cpp              \
-          bancroft.cpp bncmodel.cpp bncfigureppp.cpp                  \ 
+          bancroft.cpp bncmodel.cpp bncfigureppp.cpp                  \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \
-          RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex.c                 \
-          RTCM3/RTCM3coDecoder.cpp RTCM3/clock_orbit_rtcm.c           \
+          RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex/rtcm3torinex.c    \
+          RTCM3/RTCM3coDecoder.cpp                                    \
+          RTCM3/clock_and_orbit/clock_orbit_rtcm.c                    \
           RTCM3/ephemeris.cpp RTCM3/timeutils.cpp                     \
           RTIGS/RTIGSDecoder.cpp RTIGS/cgps_transform.cpp             \
Index: trunk/BNC/bncgetthread.h
===================================================================
--- trunk/BNC/bncgetthread.h	(revision 2491)
+++ trunk/BNC/bncgetthread.h	(revision 2492)
@@ -32,5 +32,5 @@
 
 #include "RTCM/GPSDecoder.h"
-#include "RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 #include "bncconst.h"
 #include "bncnetquery.h"
Index: trunk/BNC/bncrinex.cpp
===================================================================
--- trunk/BNC/bncrinex.cpp	(revision 2491)
+++ trunk/BNC/bncrinex.cpp	(revision 2492)
@@ -57,5 +57,5 @@
 #include "bncsettings.h"
 #include "bncversion.h"
-#include "RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 
 using namespace std;
