From: Andreas Eversberg Date: Sun, 31 Jul 2011 08:48:46 +0000 (+0200) Subject: gsmmap: Dump SYSTEM INFORMATION messages while processing X-Git-Url: http://git.rot13.org/?p=osmocom-bb.git;a=commitdiff_plain;h=HEAD gsmmap: Dump SYSTEM INFORMATION messages while processing --- diff --git a/src/host/gsmmap/gsmmap.c b/src/host/gsmmap/gsmmap.c index 038f459..83f0d01 100644 --- a/src/host/gsmmap/gsmmap.c +++ b/src/host/gsmmap/gsmmap.c @@ -70,6 +70,21 @@ static void add_power() memcpy(&node_power->power, &power, sizeof(power)); } +static void print_si(void *priv, const char *fmt, ...) +{ + char buffer[1000]; + FILE *outfp = (FILE *)priv; + va_list args; + + va_start(args, fmt); + vsnprintf(buffer, sizeof(buffer) - 1, fmt, args); + buffer[sizeof(buffer) - 1] = '\0'; + va_end(args); + + if (buffer[0]) + fprintf(outfp, "%s", buffer); +} + static void add_sysinfo() { struct gsm48_sysinfo s; @@ -108,7 +123,8 @@ static void add_sysinfo() gsm48_decode_sysinfo4(&s, (struct gsm48_system_information_type_4 *) sysinfo.si4, 23); - + printf("--------------------------------------------------------------------------\n"); + gsm48_sysinfo_dump(&s, sysinfo.arfcn, print_si, stdout, NULL); mcc = get_node_mcc(s.mcc); if (!mcc) nomem(); @@ -323,21 +339,6 @@ void kml_meas(FILE *outfp, struct node_meas *meas, int n, uint16_t mcc, fprintf(outfp, "\t\t\t\t\t\n"); } -static void print_si(void *priv, const char *fmt, ...) -{ - char buffer[1000]; - FILE *outfp = (FILE *)priv; - va_list args; - - va_start(args, fmt); - vsnprintf(buffer, sizeof(buffer) - 1, fmt, args); - buffer[sizeof(buffer) - 1] = '\0'; - va_end(args); - - if (buffer[0]) - fprintf(outfp, "%s", buffer); -} - double debug_long, debug_lat, debug_x_scale; FILE *debug_fp;