X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/d84111c47f148fedbbdcadd641cb6f0c7fd5152f..62f25bae3cf25b35ecac593129e07f1b600dbe1a:/hmland.c diff --git a/hmland.c b/hmland.c index 1ccc843..29ec7a1 100644 --- a/hmland.c +++ b/hmland.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -43,11 +44,14 @@ #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 int reboot_seconds = 0; struct queued_rx { char *rx; @@ -68,6 +72,19 @@ static int wait_for_h = 0; #define CHECK_SPACE(x) if ((*outpos + x) > outend) { fprintf(stderr, "Not enough space!\n"); return 0; } #define CHECK_AVAIL(x) if ((*inpos + x) > inend) { fprintf(stderr, "Not enough input available!\n"); return 0; } +static void print_timestamp(FILE *f) +{ + struct timeval tv; + struct tm *tmp; + char ts[32]; + + gettimeofday(&tv, NULL); + tmp = localtime(&tv.tv_sec); + memset(ts, 0, sizeof(ts)); + strftime(ts, sizeof(ts)-1, "%Y-%m-%d %H:%M:%S", tmp); + fprintf(f, "%s.%06ld: ", ts, tv.tv_usec); +} + 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', @@ -278,6 +295,7 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) if (verbose) { int i; + print_timestamp(stdout); printf("LAN < "); for (i = 0; i < outpos-out-2; i++) printf("%c", out[i]); @@ -290,7 +308,7 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) return 0; } - /* Send al queued packets */ + /* Send all queued packets */ if (wait_for_h) { struct queued_rx *curr_rx = qrx; struct queued_rx *last_rx; @@ -299,6 +317,7 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) if (verbose) { int i; + print_timestamp(stdout); printf("LAN < "); for (i = 0; i < curr_rx->len-2; i++) printf("%c", curr_rx->rx[i]); @@ -308,7 +327,6 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) w = write(fd, curr_rx->rx, curr_rx->len); if (w <= 0) { perror("write"); - return 0; } last_rx = curr_rx; curr_rx = curr_rx->next; @@ -367,6 +385,7 @@ static int hmlan_parse_in(int fd, void *data) continue; if (verbose) { + print_timestamp(stdout); printf("LAN > "); for (i = 0; i < last; i++) printf("%c", instart[i]); @@ -398,7 +417,8 @@ static int hmlan_parse_in(int fd, void *data) hmcfgusb_send(dev, out, sizeof(out), 1); } } else if (r < 0) { - perror("read"); + if (errno != ECONNRESET) + perror("read"); return r; } else { return 0; @@ -421,6 +441,16 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) return 0; } + if (dev->bootloader) { + fprintf(stderr, "HM-CFG-USB in bootloader mode, restarting in normal mode...\n"); + memset(out, 0, sizeof(out)); + out[0] = 'K'; + hmcfgusb_send(dev, out, sizeof(out), 1); + hmcfgusb_close(dev); + sleep(1); + return 0; + } + if (!hmcfgusb_add_pfd(dev, fd_in, POLLIN)) { fprintf(stderr, "Can't add client to pollfd!\n"); hmcfgusb_close(dev); @@ -438,7 +468,7 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) memset(out, 0, sizeof(out)); out[0] = 'K'; wait_for_h = 1; - hmcfgusb_send_null_frame(dev); + hmcfgusb_send_null_frame(dev, 1); hmcfgusb_send(dev, out, sizeof(out), 1); while(!quit) { @@ -461,12 +491,27 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) } } else if (fd == -1) { if (errno) { - perror("hmcfgusb_poll"); - quit = 1; - } else { - /* periodically wakeup the device */ - hmcfgusb_send_null_frame(dev); + if (errno != ETIMEDOUT) { + perror("hmcfgusb_poll"); + quit = 1; + } else { + /* periodically wakeup the device */ + hmcfgusb_send_null_frame(dev, 1); + if (wait_for_h) { + memset(out, 0, sizeof(out)); + out[0] = 'K'; + hmcfgusb_send(dev, out, sizeof(out), 1); + } + } + } + } + + if (reboot_seconds && ((dev->opened_at + reboot_seconds) <= time(NULL))) { + if (verbose) { + fprintf(stderr, "HM-CFG-USB running since %lu seconds, rebooting now...\n", + time(NULL) - dev->opened_at); } + hmcfgusb_enter_bootloader(dev); } } @@ -586,7 +631,7 @@ static int socket_server(char *iface, int port, int flags) sin.sin_addr.s_addr = htonl(INADDR_ANY); } else { if (inet_pton(AF_INET, iface, &(sin.sin_addr.s_addr)) != 1) { - perror("inet_ntop"); + fprintf(stderr, "Can't convert IP %s, aborting!\n", iface); return EXIT_FAILURE; } } @@ -619,6 +664,7 @@ static int socket_server(char *iface, int port, int flags) 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, @@ -632,6 +678,7 @@ static int socket_server(char *iface, int port, int flags) close(client); if (verbose) { + print_timestamp(stdout); printf("Connection to %d.%d.%d.%d closed!\n", (client_addr & 0xff000000) >> 24, (client_addr & 0x00ff0000) >> 16, @@ -663,6 +710,7 @@ void hmlan_syntax(char *prog) 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"); } @@ -675,8 +723,10 @@ int main(int argc, char **argv) int flags = 0; char *ep; int opt; + + reboot_seconds = DEFAULT_REBOOT_SECONDS; - while((opt = getopt(argc, argv, "DdhiPp:Rl:v")) != -1) { + while((opt = getopt(argc, argv, "DdhiPp:Rr:l:v")) != -1) { switch (opt) { case 'D': debug = 1; @@ -701,6 +751,13 @@ 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') { + fprintf(stderr, "Can't parse reboot-timeout!\n"); + exit(EXIT_FAILURE); + } + break; case 'l': iface = optarg; break;