Skip to content

Commit fd15e85

Browse files
ifsnopifsnop
committed
remove verbose output from reader_network & asterix decoding
1 parent c8c481b commit fd15e85

File tree

2 files changed

+24
-27
lines changed

2 files changed

+24
-27
lines changed

‎src/asterix.c‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ reader_network - A package of utilities to record and work with
33
multicast radar data in ASTERIX format. (radar as in air navigation
44
surveillance).
55
6-
Copyright (C) 2002-2015 Diego Torres <diego dot torres at gmail dot com>
6+
Copyright (C) 2002-2019 Diego Torres <diego dot torres at gmail dot com>
77
88
This file is part of the reader_network utils.
99
@@ -412,7 +412,7 @@ int index = 0;
412412
struct datablock_plot dbp;
413413

414414
memset(&dbp, 0, sizeof(struct datablock_plot));
415-
log_printf(LOG_NORMAL, "a)CAT01] fspec %02X\n", ptr_raw[0]);
415+
// log_printf(LOG_NORMAL, "a)CAT01] fspec %02X\n", ptr_raw[0]);
416416

417417
sizeFSPEC = ast_get_size_FSPEC(ptr_raw, size_datablock);
418418
dbp.cat = CAT_01;
@@ -442,13 +442,13 @@ int index = 0;
442442
}
443443
if ( ptr_raw[0] & 64 ) { //I001/010
444444
if ( ptr_raw[j] & 128 ) { // track
445-
log_printf(LOG_NORMAL, "b)CAT01] type %02X TRACK\n", ptr_raw[j]);
445+
// log_printf(LOG_NORMAL, "b)CAT01] type %02X TRACK\n", ptr_raw[j]);
446446
dbp.available |= IS_TRACK;
447447
size_current = size_datablock - 3; //exit without further decompression
448448

449449
} else { // plot
450450
dbp.available |= IS_TYPE;
451-
log_printf(LOG_NORMAL, "c)CAT01] type %02X\n", ptr_raw[j]);
451+
// log_printf(LOG_NORMAL, "c)CAT01] type %02X\n", ptr_raw[j]);
452452

453453
if ( (!(ptr_raw[j] & 32)) && (!(ptr_raw[j] & 16)) ) {
454454
dbp.type = NO_DETECTION;
@@ -525,7 +525,7 @@ int index = 0;
525525
ast_output_datablock(ptr_raw, j , dbp.id, dbp.index);
526526
// if ( (dbp.available & IS_TYPE) && (dbp.available & IS_TOD) ) {
527527
if ( dbp.available & IS_TYPE ) {
528-
log_printf(LOG_NORMAL, "%3.3f %3.3f %3.3f\n", dbp.tod_stamp, dbp.tod, dbp.tod_stamp - dbp.tod);
528+
// log_printf(LOG_NORMAL, "dbp tod_stamp(%3.3f) tod(%3.3f) diff(%3.3f)\n", dbp.tod_stamp, dbp.tod, dbp.tod_stamp - dbp.tod);
529529
/* if ((dbp.tod_stamp - dbp.tod < 0) || ((dbp.tod_stamp - dbp.tod > 5)) ) {
530530
log_printf(LOG_NORMAL, "%3.3f %3.3f %3.3f\n", dbp.tod_stamp, dbp.tod, dbp.tod_stamp - dbp.tod);
531531
exit(EXIT_FAILURE);
@@ -562,39 +562,36 @@ int ast_procesarCAT02(unsigned char *ptr_raw, ssize_t size_datablock, unsigned l
562562
dbp.id = id;
563563
dbp.index = 0;
564564
sizeFSPEC = ast_get_size_FSPEC(ptr_raw, size_datablock);
565-
566-
log_printf(LOG_ERROR, "a)CAT02] (%d) %02X %02X\n", sizeFSPEC, ptr_raw[sizeFSPEC], ptr_raw[sizeFSPEC+1] );
565+
// log_printf(LOG_ERROR, "a)CAT02] (%d) %02X %02X\n", sizeFSPEC, ptr_raw[sizeFSPEC], ptr_raw[sizeFSPEC+1] );
567566

568567
if ( (ptr_raw[0] & 128) && // sac/sic
569568
(ptr_raw[0] & 64) && // msg type
570569
(ptr_raw[0] & 16) ) { // timeofday
571-
572-
log_printf(LOG_ERROR, "b)CAT02] (%d) %02X %02X \n", sizeFSPEC, ptr_raw[sizeFSPEC], ptr_raw[sizeFSPEC+1] );
570+
571+
// log_printf(LOG_ERROR, "b)CAT02] (%d) %02X %02X \n", sizeFSPEC, ptr_raw[sizeFSPEC], ptr_raw[sizeFSPEC+1] );
573572
if (ptr_raw[0] & 32) pos++;
574573

575574
pos += sizeFSPEC + 3; //FSPEC SACSIC MSGTYPE
576-
577-
log_printf(LOG_ERROR, "c)CAT02] (%d) %02X %02X \n", sizeFSPEC, ptr_raw[sizeFSPEC], ptr_raw[sizeFSPEC+1] );
578-
575+
// log_printf(LOG_ERROR, "c)CAT02] (%d) %02X %02X \n", sizeFSPEC, ptr_raw[sizeFSPEC], ptr_raw[sizeFSPEC+1] );
579576
ttod_put_full(ptr_raw[sizeFSPEC], ptr_raw[sizeFSPEC + 1], ptr_raw + pos);
580577

581578
dbp.cat = CAT_02;
582579
dbp.sac = ptr_raw[sizeFSPEC]; dbp.sic = ptr_raw[sizeFSPEC+1];
583580
dbp.available = IS_TOD | IS_TYPE | IS_SACSIC;
584581
dbp.tod = ((float)(ptr_raw[pos]*256*256 + ptr_raw[pos+1]*256 + ptr_raw[pos+2]))/128.0;
585582
if (dbp.sac == 104 && dbp.sic==1) {
586-
log_printf(LOG_ERROR, "d)CAT02] datablock follows:\n");
587-
ast_output_datablock(ptr_raw, size_datablock - 3, dbp.id, dbp.index);
583+
// log_printf(LOG_ERROR, "d)CAT02] datablock follows:\n");
584+
// ast_output_datablock(ptr_raw, size_datablock - 3, dbp.id, dbp.index);
588585
}
589586
switch(ptr_raw[sizeFSPEC+2]) {
590-
case 1: dbp.type = TYPE_C2_NORTH_MARKER; break;
591-
case 2: dbp.type = TYPE_C2_SECTOR_CROSSING; break;
592-
case 3: dbp.type = TYPE_C2_SOUTH_MARKER; break;
587+
case 1: dbp.type = TYPE_C2_NORTH_MARKER; break;
588+
case 2: dbp.type = TYPE_C2_SECTOR_CROSSING; break;
589+
case 3: dbp.type = TYPE_C2_SOUTH_MARKER; break;
593590
case 8: dbp.type = TYPE_C2_START_BLIND_ZONE_FILTERING; break;
594591
case 9: dbp.type = TYPE_C2_STOP_BLIND_ZONE_FILTERING; break;
595-
default: dbp.type = NO_DETECTION; break;
592+
default: dbp.type = NO_DETECTION; break;
596593
}
597-
log_printf(LOG_ERROR, "e)CAT02] dbp.type(%d) db.tod(%3.3f) dbp.available(%d)\n", dbp.type, dbp.tod, dbp.available);
594+
// log_printf(LOG_ERROR, "e)CAT02] dbp.type(%d) db.tod(%3.3f) dbp.available(%d)\n", dbp.type, dbp.tod, dbp.available);
598595
if (enviar) {
599596
usleep(10);
600597
if (sendto(s_output_multicast, &dbp, sizeof(dbp), 0, (struct sockaddr *) &srvaddr, sizeof(srvaddr)) < 0) { // CAT002

‎src/reader_network.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ reader_network - A package of utilities to record and work with
33
multicast radar data in ASTERIX format. (radar as in air navigation
44
surveillance).
55
6-
Copyright (C) 2002-2014 Diego Torres <diego dot torres at gmail dot com>
6+
Copyright (C) 2002-2019 Diego Torres <diego dot torres at gmail dot com>
77
88
This file is part of the reader_network utils.
99
@@ -997,8 +997,8 @@ unsigned long count2_plot_filtered = 0;
997997
fs.filter_type = dest_filter_flags;
998998

999999
if ( dest_localhost || dest_filter_flags ) {
1000-
log_printf(LOG_NORMAL, "\n==================================================================\n");
1001-
ast_output_datablock(ast_ptr_raw + ast_pos, ast_size_datablock, count2_plot_processed, 0);
1000+
//log_printf(LOG_NORMAL, "\n==================================================================\n");
1001+
//ast_output_datablock(ast_ptr_raw + ast_pos, ast_size_datablock, count2_plot_processed, 0);
10021002

10031003
if (ast_ptr_raw[ast_pos] == '\x01') {
10041004
count2_plot_processed++;
@@ -1325,8 +1325,8 @@ unsigned long count2_plot_filtered = 0;
13251325
}
13261326
is_processed = true;
13271327

1328-
log_printf(LOG_VERBOSE,"-----udp(%d) ast_size_datablock(%d)\n", udp_size, ast_size_datablock);
1329-
ast_output_datablock(ast_ptr_raw, udp_size, 0, 0);
1328+
//log_printf(LOG_VERBOSE,"-----udp(%d) ast_size_datablock(%d)\n", udp_size, ast_size_datablock);
1329+
//ast_output_datablock(ast_ptr_raw, udp_size, 0, 0);
13301330

13311331
do {
13321332
unsigned int crc = 0;
@@ -1336,6 +1336,7 @@ unsigned long count2_plot_filtered = 0;
13361336
if (mode_scrm || dest_screen_crc) {
13371337
crc = crc32(ast_ptr_raw_tmp, ast_size_datablock);
13381338
if (dest_screen_crc) {
1339+
ast_output_datablock(ast_ptr_raw_tmp, ast_size_datablock, count2_plot_processed, 0);
13391340
log_printf(LOG_VERBOSE, "%3.4f [%08X]\n", current_time_today, crc);
13401341
}
13411342
}
@@ -1360,7 +1361,7 @@ unsigned long count2_plot_filtered = 0;
13601361
// RBTreePrint(tree);
13611362
}
13621363

1363-
ast_output_datablock(ast_ptr_raw_tmp, ast_size_datablock, count2_plot_processed, 0);
1364+
//ast_output_datablock(ast_ptr_raw_tmp, ast_size_datablock, count2_plot_processed, 0);
13641365
if (dest_localhost && record) {
13651366
if (ast_ptr_raw_tmp[0] == '\x01')
13661367
ast_procesarCAT01(ast_ptr_raw_tmp + 3, ast_size_datablock, count2_plot_processed, true);
@@ -1431,8 +1432,7 @@ unsigned long count2_plot_filtered = 0;
14311432
salir=1;
14321433
}
14331434
} while (salir==0);
1434-
log_printf(LOG_NORMAL, "\n==================================================================\n");
1435-
1435+
//log_printf(LOG_NORMAL, "\n==================================================================\n");
14361436
// j=radar_count/5; // no seguir buscando, ya ha sido procesado
14371437
// } else {
14381438
// log_printf(LOG_VERBOSE, "%02d) rcv(%s) cfg(%s) counter(%ld)\n",j, inet_ntoa(cast_group.sin_addr), radar_definition[j*5+3], count2_udp_received);

0 commit comments

Comments
 (0)