X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/560c3078a267674e487703a50c90bc177e95e731..18e63b25f26a448e310adfca9fea89e4212a2cf4:/hmland.c diff --git a/hmland.c b/hmland.c index f3b7cf9..6b89ece 100644 --- a/hmland.c +++ b/hmland.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -39,16 +40,24 @@ #include #include +#include "version.h" #include "hexdump.h" #include "hmcfgusb.h" #define PID_FILE "/var/run/hmland.pid" +#define DEFAULT_REBOOT_SECONDS 86400 + extern char *optarg; static int impersonate_hmlanif = 0; static int debug = 0; static int verbose = 0; +static FILE *logfile = NULL; +static int reboot_seconds = 0; +static int reboot_at_hour = -1; +static int reboot_at_minute = -1; +static int reboot_set = 0; struct queued_rx { char *rx; @@ -82,6 +91,48 @@ static void print_timestamp(FILE *f) fprintf(f, "%s.%06ld: ", ts, tv.tv_usec); } +static void write_log(char *buf, int len, char *fmt, ...) +{ + va_list ap; + int i; + + if ((!logfile) && (!verbose)) + return; + + if (logfile) + print_timestamp(logfile); + if (verbose) + print_timestamp(stdout); + + if (fmt) { + if (logfile) { + va_start(ap, fmt); + vfprintf(logfile, fmt, ap); + va_end(ap); + } + if (verbose) { + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + } + } + + if (buf && len) { + for (i = 0; i < len; i++) { + if (logfile) + fprintf(logfile, "%c", buf[i]); + if (verbose) + printf("%c", buf[i]); + } + if (logfile) + fprintf(logfile, "\n"); + if (verbose) + printf("\n"); + } + if (logfile) + fflush(logfile); +} + static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int outlen, int len, int flags) { const uint8_t nibble[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', @@ -205,6 +256,7 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) uint8_t out[1024]; uint8_t *outpos; uint8_t *inpos; + uint16_t version; int fd = *((int*)data); int w; @@ -224,6 +276,8 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) buf[7] = 'N'; } format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 0, FLAG_LENGTH_BYTE); + version = inpos[0] << 8; + version |= inpos[1]; format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 2, FLAG_FORMAT_HEX | FLAG_COMMA_BEFORE); format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 0, FLAG_COMMA_BEFORE | FLAG_LENGTH_BYTE); format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 3, FLAG_FORMAT_HEX | FLAG_COMMA_BEFORE); @@ -231,6 +285,22 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 4, FLAG_FORMAT_HEX | FLAG_COMMA_BEFORE); format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 2, FLAG_FORMAT_HEX | FLAG_COMMA_BEFORE | FLAG_NL); + if (!reboot_set) { + int new_reboot_seconds; + + if (version < 0x03c7) { + new_reboot_seconds = DEFAULT_REBOOT_SECONDS; + } else { + new_reboot_seconds = 0; + } + + if (verbose && new_reboot_seconds && (reboot_seconds != new_reboot_seconds)) + printf("Rebooting in %u seconds due to old firmware (0.%d)\n", + new_reboot_seconds, version); + + reboot_seconds = new_reboot_seconds; + } + break; case 'E': format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 3, FLAG_FORMAT_HEX); @@ -256,6 +326,10 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 1, FLAG_FORMAT_HEX | FLAG_COMMA_BEFORE); format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 1, FLAG_FORMAT_HEX | FLAG_COMMA_BEFORE | FLAG_NL); + break; + case 'G': + format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 1, FLAG_FORMAT_HEX | FLAG_NL); + break; default: format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), buf_len-1, FLAG_FORMAT_HEX | FLAG_NL); @@ -289,15 +363,7 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) return 1; } - if (verbose) { - int i; - - print_timestamp(stdout); - printf("LAN < "); - for (i = 0; i < outpos-out-2; i++) - printf("%c", out[i]); - printf("\n"); - } + write_log((char*)out, outpos-out-2, "LAN < "); w = write(fd, out, outpos-out); if (w <= 0) { @@ -311,15 +377,7 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) struct queued_rx *last_rx; while (curr_rx) { - if (verbose) { - int i; - - print_timestamp(stdout); - printf("LAN < "); - for (i = 0; i < curr_rx->len-2; i++) - printf("%c", curr_rx->rx[i]); - printf("\n"); - } + write_log(curr_rx->rx, curr_rx->len-2, "LAN < "); w = write(fd, curr_rx->rx, curr_rx->len); if (w <= 0) { @@ -381,13 +439,7 @@ static int hmlan_parse_in(int fd, void *data) if (last == 0) continue; - if (verbose) { - print_timestamp(stdout); - printf("LAN > "); - for (i = 0; i < last; i++) - printf("%c", instart[i]); - printf("\n"); - } + write_log((char*)instart, last, "LAN > "); memset(out, 0, sizeof(out)); *outpos++ = *inpos++; @@ -438,6 +490,43 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) return 0; } + if (dev->bootloader) { + if (verbose) + printf("HM-CFG-USB in bootloader mode, restarting in normal mode...\n"); + + hmcfgusb_leave_bootloader(dev); + + hmcfgusb_close(dev); + sleep(1); + return 0; + } + + if ((reboot_at_hour != -1) && (reboot_at_minute != -1)) { + struct tm *tm_s; + time_t tm; + + tm = time(NULL); + tm_s = localtime(&tm); + if (tm_s == NULL) { + perror("localtime"); + return 0; + } + + tm_s->tm_hour = reboot_at_hour; + tm_s->tm_min = reboot_at_minute; + tm_s->tm_sec = 0; + + tm = mktime(tm_s); + reboot_seconds = tm - dev->opened_at; + + while (reboot_seconds <= 0) + reboot_seconds += 86400; + } + + if (verbose && reboot_seconds) + printf("Rebooting in %u seconds\n", reboot_seconds); + + if (!hmcfgusb_add_pfd(dev, fd_in, POLLIN)) { fprintf(stderr, "Can't add client to pollfd!\n"); hmcfgusb_close(dev); @@ -461,7 +550,7 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) while(!quit) { int fd; - fd = hmcfgusb_poll(dev, 1); /* Wakeup device/bus at least once a second */ + fd = hmcfgusb_poll(dev, 1000); /* Wakeup device/bus at least once a second */ if (fd >= 0) { if (fd == master_socket) { int client; @@ -492,6 +581,14 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) } } } + + if (reboot_seconds && ((dev->opened_at + reboot_seconds) <= time(NULL))) { + if (verbose) { + printf("HM-CFG-USB running since %lu seconds, rebooting now...\n", + time(NULL) - dev->opened_at); + } + hmcfgusb_enter_bootloader(dev); + } } hmcfgusb_close(dev); @@ -642,28 +739,22 @@ static int socket_server(char *iface, int port, int flags) /* FIXME: getnameinfo... */ client_addr = ntohl(csin.sin_addr.s_addr); - if (verbose) { - print_timestamp(stdout); - printf("Client %d.%d.%d.%d connected!\n", - (client_addr & 0xff000000) >> 24, - (client_addr & 0x00ff0000) >> 16, - (client_addr & 0x0000ff00) >> 8, - (client_addr & 0x000000ff)); - } + write_log(NULL, 0, "Client %d.%d.%d.%d connected!\n", + (client_addr & 0xff000000) >> 24, + (client_addr & 0x00ff0000) >> 16, + (client_addr & 0x0000ff00) >> 8, + (client_addr & 0x000000ff)); comm(client, client, sock, flags); shutdown(client, SHUT_RDWR); close(client); - if (verbose) { - print_timestamp(stdout); - printf("Connection to %d.%d.%d.%d closed!\n", - (client_addr & 0xff000000) >> 24, - (client_addr & 0x00ff0000) >> 16, - (client_addr & 0x0000ff00) >> 8, - (client_addr & 0x000000ff)); - } + write_log(NULL, 0, "Connection to %d.%d.%d.%d closed!\n", + (client_addr & 0xff000000) >> 24, + (client_addr & 0x00ff0000) >> 16, + (client_addr & 0x0000ff00) >> 8, + (client_addr & 0x000000ff)); sleep(1); } @@ -682,14 +773,18 @@ void hmlan_syntax(char *prog) { fprintf(stderr, "Syntax: %s options\n\n", prog); fprintf(stderr, "Possible options:\n"); - fprintf(stderr, "\t-D\tdebug mode\n"); - fprintf(stderr, "\t-d\tdaemon mode\n"); - fprintf(stderr, "\t-h\tthis help\n"); - fprintf(stderr, "\t-i\tinteractive mode (connect HM-CFG-USB to terminal)\n"); - fprintf(stderr, "\t-l ip\tlisten on given IP address only (for example 127.0.0.1)\n"); - fprintf(stderr, "\t-P\tcreate PID file " PID_FILE " in daemon mode\n"); - fprintf(stderr, "\t-p n\tlisten on port n (default 1000)\n"); - fprintf(stderr, "\t-v\tverbose mode\n"); + fprintf(stderr, "\t-D\t\tdebug mode\n"); + fprintf(stderr, "\t-d\t\tdaemon mode\n"); + fprintf(stderr, "\t-h\t\tthis help\n"); + fprintf(stderr, "\t-i\t\tinteractive mode (connect HM-CFG-USB to terminal)\n"); + fprintf(stderr, "\t-l ip\t\tlisten on given IP address only (for example 127.0.0.1)\n"); + fprintf(stderr, "\t-L logfile\tlog network-communication to logfile\n"); + fprintf(stderr, "\t-P\t\tcreate PID file " PID_FILE " in daemon mode\n"); + fprintf(stderr, "\t-p n\t\tlisten on port n (default: 1000)\n"); + fprintf(stderr, "\t-r n\t\treboot HM-CFG-USB after n seconds (0: no reboot, default: %u if FW < 0.967, 0 otherwise)\n", DEFAULT_REBOOT_SECONDS); + fprintf(stderr, "\t hh:mm\treboot HM-CFG-USB daily at hh:mm\n"); + fprintf(stderr, "\t-v\t\tverbose mode\n"); + fprintf(stderr, "\t-V\t\tshow version (" VERSION ")\n"); } @@ -701,8 +796,8 @@ int main(int argc, char **argv) int flags = 0; char *ep; int opt; - - while((opt = getopt(argc, argv, "DdhiPp:Rl:v")) != -1) { + + while((opt = getopt(argc, argv, "DdhiPp:Rr:l:L:vV")) != -1) { switch (opt) { case 'D': debug = 1; @@ -727,12 +822,43 @@ int main(int argc, char **argv) case 'R': fprintf(stderr, "-R is no longer needed (1s wakeup is default)\n"); break; + case 'r': + reboot_seconds = strtoul(optarg, &ep, 10); + if (*ep != '\0') { + if (*ep == ':') { + reboot_at_hour = reboot_seconds; + ep++; + reboot_at_minute = strtoul(ep, &ep, 10); + if (*ep != '\0') { + fprintf(stderr, "Can't parse reboot-time!\n"); + exit(EXIT_FAILURE); + } + + reboot_seconds = 0; + } else { + fprintf(stderr, "Can't parse reboot-timeout!\n"); + exit(EXIT_FAILURE); + } + } + reboot_set = 1; + break; case 'l': iface = optarg; break; + case 'L': + logfile = fopen(optarg, "a"); + if (!logfile) { + perror("fopen(logfile)"); + exit(EXIT_FAILURE); + } + break; case 'v': verbose = 1; break; + case 'V': + printf("hmland " VERSION "\n"); + printf("Copyright (c) 2013 Michael Gernoth\n\n"); + exit(EXIT_SUCCESS); case 'h': case ':': case '?':