X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/0ddb3740ff8760cada6e15f03de911a270eb6711..c8cafbead818c84304552d269535e7342852522d:/hmland.c diff --git a/hmland.c b/hmland.c index d09b10b..6dc2cac 100644 --- a/hmland.c +++ b/hmland.c @@ -39,6 +39,7 @@ #include #include +#include "version.h" #include "hexdump.h" #include "hmcfgusb.h" @@ -52,6 +53,9 @@ static int impersonate_hmlanif = 0; static int debug = 0; static int verbose = 0; 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; @@ -208,6 +212,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; @@ -227,6 +232,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); @@ -234,6 +241,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); @@ -259,6 +282,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); @@ -443,7 +470,7 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) if (dev->bootloader) { if (verbose) - fprintf(stderr, "HM-CFG-USB in bootloader mode, restarting in normal mode...\n"); + printf("HM-CFG-USB in bootloader mode, restarting in normal mode...\n"); hmcfgusb_leave_bootloader(dev); @@ -452,6 +479,32 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) 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); @@ -475,7 +528,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; @@ -509,7 +562,7 @@ 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) { - fprintf(stderr, "HM-CFG-USB running since %lu seconds, rebooting now...\n", + printf("HM-CFG-USB running since %lu seconds, rebooting now...\n", time(NULL) - dev->opened_at); } hmcfgusb_enter_bootloader(dev); @@ -704,15 +757,17 @@ 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-r n\treboot HM-CFG-USB after n seconds (0: no reboot, default: %u)\n", DEFAULT_REBOOT_SECONDS); - 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-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"); } @@ -725,9 +780,7 @@ int main(int argc, char **argv) char *ep; int opt; - reboot_seconds = DEFAULT_REBOOT_SECONDS; - - while((opt = getopt(argc, argv, "DdhiPp:Rr:l:v")) != -1) { + while((opt = getopt(argc, argv, "DdhiPp:Rr:l:vV")) != -1) { switch (opt) { case 'D': debug = 1; @@ -755,9 +808,22 @@ int main(int argc, char **argv) case 'r': reboot_seconds = strtoul(optarg, &ep, 10); if (*ep != '\0') { - fprintf(stderr, "Can't parse reboot-timeout!\n"); - exit(EXIT_FAILURE); + 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; @@ -765,6 +831,10 @@ int main(int argc, char **argv) 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 '?':