Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc

@@ -185,6 +185,15 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
 
     // temporary buffers that we can release
     volk_gnsssdr_free(fft_codes_padded);
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 0)
+        {
+            LOG(ERROR) << "This implementation does not provide an output stream";
+        }
 }
 
 

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc

@@ -188,6 +188,15 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
 
     // temporary buffers that we can release
     volk_gnsssdr_free(fft_codes_padded);
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 0)
+        {
+            LOG(ERROR) << "This implementation does not provide an output stream";
+        }
 }
 
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc

@@ -164,6 +164,15 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
 
     // temporary buffers that we can release
     volk_gnsssdr_free(fft_codes_padded);
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 0)
+        {
+            LOG(ERROR) << "This implementation does not provide an output stream";
+        }
 }
 
 

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc

@@ -156,6 +156,15 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
 
     // temporary buffers that we can release
     volk_gnsssdr_free(fft_codes_padded);
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 0)
+        {
+            LOG(ERROR) << "This implementation does not provide an output stream";
+        }
 }
 
 

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc

@@ -166,6 +166,15 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
 
     // temporary buffers that we can release
     volk_gnsssdr_free(fft_codes_padded);
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 0)
+        {
+            LOG(ERROR) << "This implementation does not provide an output stream";
+        }
 }
 
 

src/algorithms/libs/rtklib/rtklib_stream.cc

@@ -786,7 +786,7 @@ void decodetcppath(const char *path, char *addr, char *port, char *user,
                 }
             if (user)
                 {
-                    std::strncpy(user, buff, 256);
+                    std::memcpy(user, buff, 256);
                     user[255] = '\0';
                 }
         }
@@ -1873,6 +1873,7 @@ void decodeftppath(const char *path, char *addr, char *file, char *user,
                         }
                 }
             std::strncpy(file, p + 1, 1024);
+            file[1023] = '\0';
             *p = '\0';
         }
     else
@@ -1889,11 +1890,13 @@ void decodeftppath(const char *path, char *addr, char *file, char *user,
                     if (passwd)
                         {
                             std::strncpy(passwd, q + 1, 256);
+                            passwd[255] = '\0';
                         }
                 }
             if (user)
                 {
-                    std::strncpy(user, buff, 256);
+                    std::memcpy(user, buff, 256);
+                    user[255] = '\0';
                 }
         }
     else
@@ -1902,6 +1905,7 @@ void decodeftppath(const char *path, char *addr, char *file, char *user,
         }
 
     std::strncpy(addr, p, 1024);
+    addr[1023] = '\0';
 }
 
 
@@ -1998,6 +2002,7 @@ void *ftpthread(void *arg)
 
     /* if local file exist, skip download */
     std::strncpy(tmpfile, local, 1024);
+    tmpfile[1023] = '\0';
     if ((p = strrchr(tmpfile, '.')) &&
         (!strcmp(p, ".z") || !strcmp(p, ".gz") || !strcmp(p, ".zip") ||
             !strcmp(p, ".Z") || !strcmp(p, ".GZ") || !strcmp(p, ".ZIP")))
@@ -2008,6 +2013,7 @@ void *ftpthread(void *arg)
         {
             fclose(fp);
             std::strncpy(ftp->local, tmpfile, 1024);
+            ftp->local[1023] = '\0';
             tracet(3, "ftpthread: file exists %s\n", ftp->local);
             ftp->state = 2;
             return nullptr;
@@ -2097,6 +2103,7 @@ void *ftpthread(void *arg)
                     if (strlen(tmpfile) < 1024)
                         {
                             std::strncpy(local, tmpfile, 1024);
+                            local[1023] = '\0';
                         }
                 }
             else
@@ -2110,6 +2117,7 @@ void *ftpthread(void *arg)
     if (strlen(local) < 1024)
         {
             std::strncpy(ftp->local, local, 1024);
+            ftp->local[1023] = '\0';
         }
     ftp->state = 2; /* ftp completed */
 
@@ -2812,6 +2820,7 @@ int gen_hex(const char *msg, unsigned char *buff)
     trace(4, "gen_hex: msg=%s\n", msg);
 
     strncpy(mbuff, msg, 1023);
+    mbuff[1022] = '\0';
     for (p = strtok(mbuff, " "); p && narg < 256; p = strtok(nullptr, " "))
         {
             args[narg++] = p;

src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc

@@ -256,6 +256,15 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
     tracking_fpga_sc = dll_pll_veml_make_tracking_fpga(trk_param_fpga);
     channel_ = 0;
     DLOG(INFO) << "tracking(" << tracking_fpga_sc->unique_id() << ")";
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one output stream";
+        }
 }
 
 

src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc

@@ -265,6 +265,15 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
     channel_ = 0;
 
     DLOG(INFO) << "tracking(" << tracking_fpga_sc->unique_id() << ")";
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one output stream";
+        }
 }
 
 

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc

@@ -218,6 +218,15 @@ GpsL1CaDllPllTrackingFpga::GpsL1CaDllPllTrackingFpga(
     tracking_fpga_sc = dll_pll_veml_make_tracking_fpga(trk_param_fpga);
     channel_ = 0;
     DLOG(INFO) << "tracking(" << tracking_fpga_sc->unique_id() << ")";
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one output stream";
+        }
 }
 
 

src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc

@@ -141,6 +141,15 @@ GpsL2MDllPllTrackingFpga::GpsL2MDllPllTrackingFpga(
 
     channel_ = 0;
     DLOG(INFO) << "tracking(" << tracking_fpga_sc->unique_id() << ")";
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one output stream";
+        }
 }
 
 

src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc

@@ -287,6 +287,15 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
     tracking_fpga_sc = dll_pll_veml_make_tracking_fpga(trk_param_fpga);
     channel_ = 0;
     DLOG(INFO) << "tracking(" << tracking_fpga_sc->unique_id() << ")";
+
+    if (in_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one input stream";
+        }
+    if (out_streams_ > 1)
+        {
+            LOG(ERROR) << "This implementation only supports one output stream";
+        }
 }
 
 

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h

@@ -238,8 +238,6 @@ private:
     bool d_extended_correlation_in_fpga;
     bool d_current_extended_correlation_in_fpga;
     int32_t d_next_integration_length_samples;
-    double d_extended_integration_first_acc_carrier_phase_rad;
-    double d_extended_integration_next_acc_carrier_phase_rad_step;
     uint64_t d_sample_counter_next;
     bool d_sc_demodulate_enabled;
     int32_t d_extend_fpga_integration_periods;