X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/can-utils.git/blobdiff_plain/3d26e6f710c3427840b4cc4e2852f0376a0a44a2..HEAD:/asc2log.c diff --git a/asc2log.c b/asc2log.c index a4eb70a..bb1baab 100644 --- a/asc2log.c +++ b/asc2log.c @@ -1,7 +1,3 @@ -/* - * $Id$ - */ - /* * asc2log.c - convert ASC logfile to compact CAN frame logfile * @@ -12,8 +8,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, the following disclaimer and - * the referenced file 'COPYING'. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. @@ -23,8 +18,8 @@ * * Alternatively, provided that this notice is retained in full, this * software may be distributed under the terms of the GNU General - * Public License ("GPL") version 2 as distributed in the 'COPYING' - * file from the main directory of the linux kernel source. + * Public License ("GPL") version 2, in which case the provisions of the + * GPL apply INSTEAD OF those given above. * * The provided data structures and external interfaces from this code * are not restricted to be used by modules with a GPL compatible license. @@ -42,7 +37,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * Send feedback to + * Send feedback to * */ @@ -66,272 +61,283 @@ extern int optind, opterr, optopt; void print_usage(char *prg) { - fprintf(stderr, "Usage: %s\n", prg); - fprintf(stderr, "Options: -I (default stdin)\n"); - fprintf(stderr, " -O (default stdout)\n"); + fprintf(stderr, "Usage: %s\n", prg); + fprintf(stderr, "Options: -I (default stdin)\n"); + fprintf(stderr, " -O (default stdout)\n"); } void prframe(FILE *file, struct timeval *tv, int dev, struct can_frame *cf) { - fprintf(file, "(%ld.%06ld) ", tv->tv_sec, tv->tv_usec); - if (dev > 0) - fprintf(file, "can%d ", dev-1); - else - fprintf(file, "canX "); - fprint_canframe(file, cf, "\n", 0); + fprintf(file, "(%ld.%06ld) ", tv->tv_sec, tv->tv_usec); + + if (dev > 0) + fprintf(file, "can%d ", dev-1); + else + fprintf(file, "canX "); + + /* no CAN FD support so far */ + fprint_canframe(file, (struct canfd_frame *)cf, "\n", 0, CAN_MAX_DLEN); } void get_can_id(struct can_frame *cf, char *idstring, int base) { - if (idstring[strlen(idstring)-1] == 'x') { - cf->can_id = CAN_EFF_FLAG; - idstring[strlen(idstring)-1] = 0; - } else - cf->can_id = 0; + if (idstring[strlen(idstring)-1] == 'x') { + cf->can_id = CAN_EFF_FLAG; + idstring[strlen(idstring)-1] = 0; + } else + cf->can_id = 0; - cf->can_id |= strtoul(idstring, NULL, base); + cf->can_id |= strtoul(idstring, NULL, base); } void calc_tv(struct timeval *tv, struct timeval *read_tv, struct timeval *date_tv, char timestamps, int dplace) { - if (dplace == 4) /* shift values having only 4 decimal places */ - read_tv->tv_usec *= 100; /* and need for 6 */ + if (dplace == 4) /* shift values having only 4 decimal places */ + read_tv->tv_usec *= 100; /* and need for 6 */ - if (timestamps == 'a') { /* absolute */ + if (dplace == 5) /* shift values having only 5 decimal places */ + read_tv->tv_usec *= 10; /* and need for 6 */ - tv->tv_sec = date_tv->tv_sec + read_tv->tv_sec; - tv->tv_usec = date_tv->tv_usec + read_tv->tv_usec; + if (timestamps == 'a') { /* absolute */ - } else { /* relative */ + tv->tv_sec = date_tv->tv_sec + read_tv->tv_sec; + tv->tv_usec = date_tv->tv_usec + read_tv->tv_usec; - if (((!tv->tv_sec) && (!tv->tv_usec)) && - (date_tv->tv_sec || date_tv->tv_usec)) { - tv->tv_sec = date_tv->tv_sec; /* initial date/time */ - tv->tv_usec = date_tv->tv_usec; - } + } else { /* relative */ + + if (((!tv->tv_sec) && (!tv->tv_usec)) && + (date_tv->tv_sec || date_tv->tv_usec)) { + tv->tv_sec = date_tv->tv_sec; /* initial date/time */ + tv->tv_usec = date_tv->tv_usec; + } - tv->tv_sec += read_tv->tv_sec; - tv->tv_usec += read_tv->tv_usec; - } + tv->tv_sec += read_tv->tv_sec; + tv->tv_usec += read_tv->tv_usec; + } - if (tv->tv_usec > 1000000) { - tv->tv_usec -= 1000000; - tv->tv_sec++; - } + if (tv->tv_usec > 1000000) { + tv->tv_usec -= 1000000; + tv->tv_sec++; + } } int get_date(struct timeval *tv, char *date) { - char ctmp[10]; - int itmp; + char ctmp[10]; + int itmp; - struct tm tms; + struct tm tms; - if (sscanf(date, "%9s %d %9s %9s %d", ctmp, &itmp, ctmp, ctmp, &itmp) == 5) { - /* assume EN/US date due to existing am/pm field */ + if (sscanf(date, "%9s %d %9s %9s %d", ctmp, &itmp, ctmp, ctmp, &itmp) == 5) { + /* assume EN/US date due to existing am/pm field */ - if (!setlocale(LC_TIME, "en_US")) - return 1; + if (!setlocale(LC_TIME, "en_US")) + return 1; - if (!strptime(date, "%B %d %r %Y", &tms)) - return 1; + if (!strptime(date, "%B %d %r %Y", &tms)) + return 1; - } else { - /* assume DE date due to non existing am/pm field */ + } else { + /* assume DE date due to non existing am/pm field */ - if (sscanf(date, "%9s %d %9s %d", ctmp, &itmp, ctmp, &itmp) != 4) - return 1; + if (sscanf(date, "%9s %d %9s %d", ctmp, &itmp, ctmp, &itmp) != 4) + return 1; - if (!setlocale(LC_TIME, "de_DE")) - return 1; + if (!setlocale(LC_TIME, "de_DE")) + return 1; - if (!strptime(date, "%B %d %T %Y", &tms)) - return 1; - } + if (!strptime(date, "%B %d %T %Y", &tms)) + return 1; + } - //printf("h %d m %d s %d d %d m %d y %d\n", - //tms.tm_hour, tms.tm_min, tms.tm_sec, - //tms.tm_mday, tms.tm_mon+1, tms.tm_year+1900); + //printf("h %d m %d s %d d %d m %d y %d\n", + //tms.tm_hour, tms.tm_min, tms.tm_sec, + //tms.tm_mday, tms.tm_mon+1, tms.tm_year+1900); - tv->tv_sec = mktime(&tms); + tv->tv_sec = mktime(&tms); - if (tv->tv_sec < 0) - return 1; + if (tv->tv_sec < 0) + return 1; - return 0; + return 0; } int main(int argc, char **argv) { - char buf[100], tmp1[100], tmp2[100]; - - FILE *infile = stdin; - FILE *outfile = stdout; - static int verbose; - struct can_frame cf; - static struct timeval tv; /* current frame timestamp */ - static struct timeval read_tv; /* frame timestamp from ASC file */ - static struct timeval date_tv; /* date of the ASC file */ - static int dplace; /* decimal place 4 or 6 or uninitialized */ - static char base; /* 'd'ec or 'h'ex */ - static char timestamps; /* 'a'bsolute or 'r'elative */ - - int interface; - char rtr; - int dlc = 0; - int data[8]; - int i, found, opt; - - while ((opt = getopt(argc, argv, "I:O:v")) != -1) { - switch (opt) { - case 'I': - infile = fopen(optarg, "r"); - if (!infile) { - perror("infile"); - return 1; - } - break; - - case 'O': - outfile = fopen(optarg, "w"); - if (!outfile) { - perror("outfile"); - return 1; - } - break; - - case 'v': - verbose = 1; - break; - - default: - fprintf(stderr, "Unknown option %c\n", opt); - print_usage(basename(argv[0])); - return 1; - break; + char buf[100], tmp1[100], tmp2[100]; + + FILE *infile = stdin; + FILE *outfile = stdout; + static int verbose; + struct can_frame cf; + static struct timeval tv; /* current frame timestamp */ + static struct timeval read_tv; /* frame timestamp from ASC file */ + static struct timeval date_tv; /* date of the ASC file */ + static int dplace; /* decimal place 4, 5 or 6 or uninitialized */ + static char base; /* 'd'ec or 'h'ex */ + static char timestamps; /* 'a'bsolute or 'r'elative */ + + int interface; + char rtr; + int dlc = 0; + int data[8]; + int i, found, opt; + + while ((opt = getopt(argc, argv, "I:O:v?")) != -1) { + switch (opt) { + case 'I': + infile = fopen(optarg, "r"); + if (!infile) { + perror("infile"); + return 1; + } + break; + + case 'O': + outfile = fopen(optarg, "w"); + if (!outfile) { + perror("outfile"); + return 1; + } + break; + + case 'v': + verbose = 1; + break; + + case '?': + print_usage(basename(argv[0])); + return 0; + break; + + default: + fprintf(stderr, "Unknown option %c\n", opt); + print_usage(basename(argv[0])); + return 1; + break; + } } - } - - while (fgets(buf, 99, infile)) { - if (!dplace) { /* the representation of a valid CAN frame not known */ - - /* check for base and timestamp entries in the header */ - if ((!base) && - (sscanf(buf, "base %s timestamps %s", tmp1, tmp2) == 2)) { - base = tmp1[0]; - timestamps = tmp2[0]; - if (verbose) - printf("base %c timestamps %c\n", base, timestamps); - if ((base != 'h') && (base != 'd')) { - printf("invalid base %s (must be 'hex' or 'dez')!\n", - tmp1); - return 1; - } - if ((timestamps != 'a') && (timestamps != 'r')) { - printf("invalid timestamps %s (must be 'absolute'" - " or 'relative')!\n", tmp2); - return 1; - } - continue; - } - - /* check for the original logging date in the header */ - if ((!date_tv.tv_sec) && - (!strncmp(buf, "date", 4))) { - - if (get_date(&date_tv, &buf[9])) { /* skip 'date day ' */ - fprintf(stderr, "Not able to determine original log " - "file date. Using current time.\n"); - /* use current date as default */ - gettimeofday(&date_tv, NULL); + while (fgets(buf, 99, infile)) { + + if (!dplace) { /* the representation of a valid CAN frame not known */ + + /* check for base and timestamp entries in the header */ + if ((!base) && + (sscanf(buf, "base %s timestamps %s", tmp1, tmp2) == 2)) { + base = tmp1[0]; + timestamps = tmp2[0]; + if (verbose) + printf("base %c timestamps %c\n", base, timestamps); + if ((base != 'h') && (base != 'd')) { + printf("invalid base %s (must be 'hex' or 'dez')!\n", + tmp1); + return 1; + } + if ((timestamps != 'a') && (timestamps != 'r')) { + printf("invalid timestamps %s (must be 'absolute'" + " or 'relative')!\n", tmp2); + return 1; + } + continue; + } + + /* check for the original logging date in the header */ + if ((!date_tv.tv_sec) && + (!strncmp(buf, "date", 4))) { + + if (get_date(&date_tv, &buf[9])) { /* skip 'date day ' */ + fprintf(stderr, "Not able to determine original log " + "file date. Using current time.\n"); + /* use current date as default */ + gettimeofday(&date_tv, NULL); + } + if (verbose) + printf("date %ld => %s", date_tv.tv_sec, ctime(&date_tv.tv_sec)); + continue; + } + + /* check for decimal places length in valid CAN frames */ + if (sscanf(buf, "%ld.%s %d ", &tv.tv_sec, tmp2, &i) == 3){ + dplace = strlen(tmp2); + if (verbose) + printf("decimal place %d, e.g. '%s'\n", dplace, tmp2); + if (dplace < 4 || dplace > 6) { + printf("invalid dplace %d (must be 4, 5 or 6)!\n", dplace); + return 1; + } + } else + continue; /* dplace remains zero until first found CAN frame */ + } + + /* the representation of a valid CAN frame is known here */ + /* so try to get CAN frames and ErrorFrames and convert them */ + + /* 0.002367 1 390x Rx d 8 17 00 14 00 C0 00 08 00 */ + + found = 0; /* found valid CAN frame ? */ + + if (base == 'h') { /* check for CAN frames with hexadecimal values */ + + if (sscanf(buf, "%ld.%ld %d %s %*s %c %d %x %x %x %x %x %x %x %x", + &read_tv.tv_sec, &read_tv.tv_usec, &interface, + tmp1, &rtr, &dlc, + &data[0], &data[1], &data[2], &data[3], + &data[4], &data[5], &data[6], &data[7] + ) == dlc + 6 ) { + + found = 1; + get_can_id(&cf, tmp1, 16); + } + + } else { /* check for CAN frames with decimal values */ + + if (sscanf(buf, "%ld.%ld %d %s %*s %c %d %d %d %d %d %d %d %d %d", + &read_tv.tv_sec, &read_tv.tv_usec, &interface, + tmp1, &rtr, &dlc, + &data[0], &data[1], &data[2], &data[3], + &data[4], &data[5], &data[6], &data[7] + ) == dlc + 6 ) { + + found = 1; + get_can_id(&cf, tmp1, 10); + } } - if (verbose) - printf("date %ld => %s", date_tv.tv_sec, ctime(&date_tv.tv_sec)); - continue; - } - - /* check for decimal places length in valid CAN frames */ - if (sscanf(buf, "%ld.%s %d ", &tv.tv_sec, tmp2, &i) == 3){ - dplace = strlen(tmp2); - if (verbose) - printf("decimal place %d, e.g. '%s'\n", dplace, tmp2); - if ((dplace != 4) && (dplace != 6)) { - printf("invalid dplace %d (must be 4 or 6)!\n", dplace); - return 1; - } - } else - continue; /* dplace remains zero until first found CAN frame */ - } - - /* the representation of a valid CAN frame is known here */ - /* so try to get CAN frames and ErrorFrames and convert them */ - - /* 0.002367 1 390x Rx d 8 17 00 14 00 C0 00 08 00 */ - - found = 0; /* found valid CAN frame ? */ - - if (base == 'h') { /* check for CAN frames with hexadecimal values */ - - if (sscanf(buf, "%ld.%ld %d %s %*s %c %d %x %x %x %x %x %x %x %x", - &read_tv.tv_sec, &read_tv.tv_usec, &interface, - tmp1, &rtr, &dlc, - &data[0], &data[1], &data[2], &data[3], - &data[4], &data[5], &data[6], &data[7] - ) == dlc + 6 ) { - found = 1; - get_can_id(&cf, tmp1, 16); - } - - } else { /* check for CAN frames with decimal values */ - - if (sscanf(buf, "%ld.%ld %d %s %*s %c %d %d %d %d %d %d %d %d %d", - &read_tv.tv_sec, &read_tv.tv_usec, &interface, - tmp1, &rtr, &dlc, - &data[0], &data[1], &data[2], &data[3], - &data[4], &data[5], &data[6], &data[7] - ) == dlc + 6 ) { - - found = 1; - get_can_id(&cf, tmp1, 10); - } - } - - if (found) { - if (rtr == 'r') - cf.can_id |= CAN_RTR_FLAG; + if (found) { + if (rtr == 'r') + cf.can_id |= CAN_RTR_FLAG; - cf.can_dlc = dlc & 0x0FU; - for (i=0; i