X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/e09806b632a86c2b18fc4b129e10ab23e898b0dc..b5e57d268fe86cf58116c03166d45c130280dfb6:/hmland.c?ds=inline diff --git a/hmland.c b/hmland.c index f963e2b..68ce00e 100644 --- a/hmland.c +++ b/hmland.c @@ -34,20 +34,36 @@ #include #include #include +#include #include #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 int reboot_seconds = 0; +static int reboot_at_hour = -1; +static int reboot_at_minute = -1; + +struct queued_rx { + char *rx; + int len; + struct queued_rx *next; +}; + +static struct queued_rx *qrx = NULL; +static int wait_for_h = 0; #define FLAG_LENGTH_BYTE (1<<0) #define FLAG_FORMAT_HEX (1<<1) @@ -55,11 +71,23 @@ static int verbose = 0; #define FLAG_COMMA_AFTER (1<<3) #define FLAG_NL (1<<4) #define FLAG_IGNORE_COMMAS (1<<5) -#define FLAG_PERIODIC_WAKEUP (1<<6) #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', @@ -240,8 +268,42 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) hexdump(buf, buf_len, "Unknown> "); break; } - if (debug) - fprintf(stderr, "LAN < %s\n", out); + + /* Queue packet until first respone to 'K' is received */ + if (wait_for_h && buf[0] != 'H') { + struct queued_rx **rxp = &qrx; + + while (*rxp) + rxp = &((*rxp)->next); + + *rxp = malloc(sizeof(struct queued_rx)); + if (!*rxp) { + perror("malloc"); + return 0; + } + + memset(*rxp, 0, sizeof(struct queued_rx)); + (*rxp)->len = outpos-out; + (*rxp)->rx = malloc((*rxp)->len); + if (!(*rxp)->rx) { + perror("malloc"); + return 0; + } + memset((*rxp)->rx, 0, (*rxp)->len); + memcpy((*rxp)->rx, out, (*rxp)->len); + + 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"); + } w = write(fd, out, outpos-out); if (w <= 0) { @@ -249,6 +311,38 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) return 0; } + /* Send all queued packets */ + if (wait_for_h) { + struct queued_rx *curr_rx = qrx; + 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"); + } + + w = write(fd, curr_rx->rx, curr_rx->len); + if (w <= 0) { + perror("write"); + } + last_rx = curr_rx; + curr_rx = curr_rx->next; + + free(last_rx->rx); + free(last_rx); + } + + qrx = NULL; + + wait_for_h = 0; + } + return 1; } @@ -271,9 +365,6 @@ static int hmlan_parse_in(int fd, void *data) inpos = buf; - if (debug) - fprintf(stderr, "\nLAN > %s", buf); - while (inpos < inend) { uint8_t *instart = inpos; @@ -296,6 +387,14 @@ 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"); + } + memset(out, 0, sizeof(out)); *outpos++ = *inpos++; @@ -308,6 +407,11 @@ static int hmlan_parse_in(int fd, void *data) parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), 0); parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE); break; + case 'Y': + parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), 0); + parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), 0); + parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE); + break; default: parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), FLAG_IGNORE_COMMAS); break; @@ -316,7 +420,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; @@ -329,7 +434,6 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) { struct hmcfgusb_dev *dev; uint8_t out[0x40]; //FIXME!!! - int poll_timeout = 3600; int quit = 0; hmcfgusb_set_debug(debug); @@ -340,6 +444,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); @@ -354,18 +495,16 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) } } - if (flags & FLAG_PERIODIC_WAKEUP) - poll_timeout = 1; - memset(out, 0, sizeof(out)); out[0] = 'K'; - hmcfgusb_send_null_frame(dev); + wait_for_h = 1; + hmcfgusb_send_null_frame(dev, 1); hmcfgusb_send(dev, out, sizeof(out), 1); while(!quit) { int fd; - fd = hmcfgusb_poll(dev, poll_timeout); + fd = hmcfgusb_poll(dev, 1); /* Wakeup device/bus at least once a second */ if (fd >= 0) { if (fd == master_socket) { int client; @@ -382,13 +521,28 @@ 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) { + printf("HM-CFG-USB running since %lu seconds, rebooting now...\n", + time(NULL) - dev->opened_at); + } + hmcfgusb_enter_bootloader(dev); + } } hmcfgusb_close(dev); @@ -507,7 +661,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; } } @@ -540,6 +694,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, @@ -553,6 +708,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, @@ -577,15 +733,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\twakeup the device (and USB-bus) every second (fix for e.g. Raspberry Pi)\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-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)\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"); } @@ -597,8 +755,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:vV")) != -1) { switch (opt) { case 'D': debug = 1; @@ -621,7 +781,26 @@ int main(int argc, char **argv) } break; case 'R': - flags |= FLAG_PERIODIC_WAKEUP; + 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); + } + } break; case 'l': iface = optarg; @@ -629,6 +808,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 '?':