update to 0.77, too much to show here

Author: ifsnop

CHANGELOG

@@ -1,10 +1,42 @@
+0.76
+- TIP: para quitar la sequencias ansi al activar dest_debug
+ o dest_screen_crc, podemos usar sed:
+ reader_network64 example.conf | sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]//g" | tee file.txt
+- BUG: al decodificar cat48 que iba encadenada en el mismo
+ paquete udp, solo se decodificaba a localhost el primer
+ datarecord, el segundo se perdía (a la función de decodifi-
+ car ast48f se enviaban unos índices antiguos del paquete.
+- SOPORTE: añadido un dest_debug, para sacar por stderr el 
+ paquete que se procesa
+0.76
+- SOPORTE: añadido dest_file_nodirectory para no crear
+ directorios con timestamp, pero si un nombre de fichero
+ con fecha.
+- NO! SOPORTE: hace rejoin de los grupos mcast cada 90 segundos.
+ Esta idea no funciona, no se puede hacer un rejoin sin cerrar
+ el socket y perder datos.
+
+0.75c
+- BUG: quitado el debug para corregir I048/090
+- BUG: reader_network falla al decodificar I048/120 (visto
+ decodificando Tanger)
+
+0.75b
+- BUG: reader_rrd3 no contempla I048/090 y I001/090
+ (modo C) negativos
+
+0.75a
+- SOPORTE: desactiva el unset de ftp_proxy para enviar a aemet
+- SOPORTE: habilita el continuar un upload abortado de forma
+ automática.
+
 0.75
 - BUG: el tamano del paquete se tiene en cuenta en el
   calculo del CRC, deberia disminuir los falsos positivos.
 - SOPORTE: uso clock_gettime instead of gettimeofday.
-- ADD: añadida filtersicsacout
-- ADD: añadido enviar versión al hacer ftp
-- ADD: añadido hensoldt 2 asterix
+- SOPORTE: añadida filtersicsacout
+- SOPORTE: añadido enviar versión al hacer ftp
+- SOPORTE: añadido hensoldt 2 asterix
 
 0.74
 - SOPORTE: añadido un conversor entre GPS y versión asterix

bin/conf/example.conf

@@ -1,4 +1,4 @@
-# example configuration reader_network 0.65
+# example configuration reader_network 0.75c
 enabled = true
 
 # multicast | broadcast | file
@@ -21,6 +21,9 @@ mode_scrm = true
 # where YY = year, MM = month, DD = day, hh = hour, mm = minutes, ss = seconds
 dest_file_timestamp = true
 
+# don't use directory structure, only filename (needs dest_file_timestamp = true)
+dest_file_nodirectory = false
+
 # recording file will be compressed with bzip2
 dest_file_compress = true
 

build.sh

@@ -128,6 +128,8 @@ done
 
 ls -la bin/
 
+#scp bin/reader_network64 10.40.210.32:/home/eval/reader_network64
+
 exit
 
 #old binaries

include/asterix.h

@@ -78,8 +78,9 @@ along with reader_network. If not, see <http://www.gnu.org/licenses/>.
 #define BDS_17 4
 #define BDS_30 8
 #define BDS_40 16
-#define BDS_50 32
-#define BDS_60 64
+#define BDS_44 32
+#define BDS_50 64
+#define BDS_60 128
 
 #define STATUS_MODEC_GARBLED 1
 #define STATUS_MODEC_NOTVALIDATED 2

include/dbp.h

@@ -37,7 +37,7 @@ struct datablock_plot {
         float y;                        //      CAT20
     };
     int modea;				//	CAT01
-    int modec;				//	CAT01
+    int modec   ;			//	CAT01 CAT48 (expresado en FL)
     int modec_status;			//	CAT01
     int modea_status;			//	CAT01
     int available;			//	CAT01 CAT48
@@ -59,6 +59,7 @@ struct datablock_plot {
             unsigned char bds_17[8];
             unsigned char bds_30[7];
             unsigned char bds_40[8];
+            unsigned char bds_44[8];
             unsigned char bds_50[8];
             unsigned char bds_60[8];
             int modes_status;

include/defines.h

@@ -3,7 +3,7 @@ reader_network - A package of utilities to record and work with
 multicast radar data in ASTERIX format. (radar as in air navigation
 surveillance).
 
-Copyright (C) 2002-2019 Diego Torres <diego dot torres at gmail dot com>
+Copyright (C) 2002-2020 Diego Torres <diego dot torres at gmail dot com>
 
 This file is part of the reader_network utils.
 
@@ -22,8 +22,8 @@ along with reader_network. If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#define VERSION "0.75"
-#define COPYRIGHT_NOTICE " v%s Copyright (C) 2002 - 2019 Diego Torres\n\n" \
+#define VERSION "0.76"
+#define COPYRIGHT_NOTICE " v%s Copyright (C) 2002 - 2020 Diego Torres\n\n" \
     "This program comes with ABSOLUTELY NO WARRANTY.\n" \
     "This is free software, and you are welcome to redistribute it\n" \
     "under certain conditions; see COPYING file for details.\n\n"

package.sh

@@ -1,6 +1,7 @@
-rm distrib/rn075.tar.bz2
-tar cvfj distrib/rn075.tar.bz2 \
+rm distrib/rn077.tar.bz2
+tar cvfj distrib/rn077.tar.bz2 \
     bin/client* \
     bin/reader_network* \
     bin/reader_rrd3* bin/cleanast* bin/scripts/* bin/conf/* bin/filter*
-cp distrib/rn075.tar.bz2 /home/eval
+cp distrib/rn077.tar.bz2 /home/eval
+scp distrib/rn077.tar.bz2 nemo:.

src/asterix.c

@@ -352,7 +352,7 @@ void decode_bds30(/*unsigned char * ptr_raw, int j, */struct datablock_plot * db
         if (dbp->modea_status & STATUS_MODEA_SMOOTHED)      strcpy(modea_l_s, "1"); else strcpy(modea_l_s, "0");
     }
     if (dbp->available & IS_MODEC) {
-        snprintf(modec_s, 6, "%d", dbp->modec*100);
+        snprintf(modec_s, 6, "%d", dbp->modec);
         if (dbp->modec_status & STATUS_MODEC_NOTVALIDATED)  strcpy(modec_v_s, "1"); else strcpy(modec_v_s, "0");
         if (dbp->modec_status & STATUS_MODEC_GARBLED)       strcpy(modec_g_s, "1"); else strcpy(modec_g_s, "0");
     }
@@ -488,7 +488,16 @@ int index = 0;
 		    //log_printf(LOG_NORMAL, "modec %02X %02X\n", ptr_raw[j], ptr_raw[j+1]);
 		    dbp.modec_status |= (ptr_raw[j] & 128) ? STATUS_MODEC_NOTVALIDATED : 0;
 		    dbp.modec_status |= (ptr_raw[j] & 64) ? STATUS_MODEC_GARBLED : 0;
-		    dbp.modec = ( (ptr_raw[j] & 63)*256 + ptr_raw[j+1]) * 1.0/4.0;// * 100;
+		    // corregir porque no se hacía el complemento a 2.
+		    // dbp.modec = ( (ptr_raw[j] & 63)*256 + ptr_raw[j+1]) * 1.0/4.0;// * 100;
+		    dbp.modec = ( (ptr_raw[j] & 63)*256 + ptr_raw[j+1]);// * 1.0/4.0;// * 100;
+	            if ( dbp.modec > 8192 ) { // es negativo, hacer el complemento a 2
+	                // log_printf(LOG_NORMAL, "[%d][%d][%d] es mayor que 8192 v1\n", dbp.sac, dbp.sic, dbp.modec);
+	                dbp.modec += -16384;
+	                // log_printf(LOG_NORMAL, "[%d][%d][%d] es mayor que 8192 v2\n", dbp.sac, dbp.sic, dbp.modec);
+                    }
+                    dbp.modec *= (100.0 * 1.0/4.0); // el resultado va en FL, así que nunca habrá decimales
+        	    // log_printf(LOG_NORMAL, "[%d][%d]I048/090[%02X][%02X] (%d)\n", dbp.sac, dbp.sic, ptr_raw[j], ptr_raw[j+1], dbp.modec);
 		    size_current += 2; j += 2;
 		    dbp.available |= IS_MODEC;
 		}
@@ -1129,7 +1138,7 @@ int index = 0;
 	dbp.tod_stamp = current_time_today; dbp.id = id; dbp.index = index;
 	dbp.radar_responses = 0;
 
-	//ast_output_datablock(ptr_raw, size_datablock, dbp.id, dbp.index);
+	// ast_output_datablock(ptr_raw, size_datablock, dbp.id, dbp.index);
 	if (sizeFSPEC == 0) {
 	    log_printf(LOG_WARNING, "ERROR_FSPEC_SIZE[%d] %s\n", sizeFSPEC, ptr_raw);
 	    return T_ERROR;
@@ -1222,7 +1231,7 @@ unsigned char *datablock_start = NULL;
 //	    return T_ERROR;
 //	}
 
-	//ast_output_datablock(ptr_raw, size_datablock - size_current - 3, id, index);
+	// ast_output_datablock(ptr_raw, size_datablock - size_current - 3, id, index);
 
         datablock_start = ptr_raw;
 	j = sizeFSPEC;
@@ -1270,7 +1279,14 @@ unsigned char *datablock_start = NULL;
 	if ( ptr_raw[0] & 4 ) {  /* I048/090 */
 	    dbp.modec_status |= (ptr_raw[j] & 128) ? STATUS_MODEC_NOTVALIDATED : 0;
 	    dbp.modec_status |= (ptr_raw[j] & 64) ? STATUS_MODEC_GARBLED : 0;
-	    dbp.modec = ( (ptr_raw[j] & 63)*256 + ptr_raw[j+1]) * 1.0/4.0;// * 100;
+	    dbp.modec = ( (ptr_raw[j] & 63)*256 + ptr_raw[j+1]);// * 1.0/4.0;// * 100;
+	    if ( dbp.modec > 8192 ) { // es negativo, hacer el complemento a 2
+	        // log_printf(LOG_NORMAL, "[%d][%d][%d] es mayor que 8192 v1\n", dbp.sac, dbp.sic, dbp.modec);
+	        dbp.modec += -16384;
+	        // log_printf(LOG_NORMAL, "[%d][%d][%d] es mayor que 8192 v2\n", dbp.sac, dbp.sic, dbp.modec);
+            }
+            dbp.modec *= (100.0 * 1.0/4.0); // el resultado va en FL, así que nunca habrá decimales
+	    // log_printf(LOG_NORMAL, "[%d][%d]I048/090[%02X][%02X] (%d)\n", dbp.sac, dbp.sic, ptr_raw[j], ptr_raw[j+1], dbp.modec);
 	    size_current += 2; j += 2;
 	    dbp.available |= IS_MODEC;
         }
@@ -1294,7 +1310,7 @@ unsigned char *datablock_start = NULL;
 	        //char * ptr_tmp;
 	        int i;
 	        //ptr_tmp = (char *) mem_alloc(6*3 + 1);
-	        //Bmemset(ptr_tmp, 0x0, 6*3 + 1);
+	        //memset(ptr_tmp, 0x0, 6*3 + 1);
 	        //for( i = 0; i < 6; i++ ) sprintf((char *)(ptr_tmp + i*3), "%02X ", (unsigned char) (ptr_raw[j+i]));
                 //log_printf(LOG_NORMAL, "I048/240[%s]\n", ptr_tmp);
                 //mem_free(ptr_tmp);
@@ -1342,6 +1358,7 @@ unsigned char *datablock_start = NULL;
                         case 0x17: ptr = dbp.bds_17; dbp.bds_available |= BDS_17; break;
                         case 0x30: ptr = dbp.bds_30; dbp.bds_available |= BDS_30; break;
                         case 0x40: ptr = dbp.bds_40; dbp.bds_available |= BDS_40; break;
+                        case 0x44: ptr = dbp.bds_44; dbp.bds_available |= BDS_44; break;
                         case 0x50: ptr = dbp.bds_50; dbp.bds_available |= BDS_50; break;
                         case 0x60: ptr = dbp.bds_60; dbp.bds_available |= BDS_60; break;
                         default:
@@ -1372,9 +1389,11 @@ unsigned char *datablock_start = NULL;
 		if ( ptr_raw[2] & 16 ) {  /* I048/100 */ j += 4; size_current += 4; }
 		if ( ptr_raw[2] & 8 ) {   /* I048/110 */ j += 2; size_current += 2; }
 		if ( ptr_raw[2] & 4 ) {   /* I048/120 */
+		    // log_printf(LOG_NORMAL, "[%02X%02X%02X]\n", ptr_raw[j],ptr_raw[j+1],ptr_raw[j+2] );
 		    int k = j;
 		    if ( ptr_raw[k] & 128 ) { j += 2; size_current += 2; }
 		    if ( ptr_raw[k] & 64 ) { int l = j; j += ptr_raw[l]*6 + 1; size_current += ptr_raw[l]*6 + 1; }
+		    j++; size_current++;
 		}
 		if ( ptr_raw[2] & 2 ) { /* I048/230 */
                     // log_printf(LOG_ERROR, "en I048/230\n");