]> git.zerfleddert.de Git - hmcfgusb/blobdiff - hmland.c
ETIMEDOUT is not a fatal error
[hmcfgusb] / hmland.c
index 1ccc843d23017f87de2ee12d04225c28615212c6..fd2d09e4881c60c4f739e68282c028ebb06272b1 100644 (file)
--- a/hmland.c
+++ b/hmland.c
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <libusb-1.0/libusb.h>
 
+#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;
@@ -68,6 +75,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',
@@ -242,6 +262,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);
@@ -278,6 +302,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 +315,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 +324,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 +334,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 +392,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 +424,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 +448,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);
@@ -438,7 +502,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 +525,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) {
+                               printf("HM-CFG-USB running since %lu seconds, rebooting now...\n",
+                                       time(NULL) - dev->opened_at);
                        }
+                       hmcfgusb_enter_bootloader(dev);
                }
        }
 
@@ -586,7 +665,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 +698,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 +712,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,
@@ -656,14 +737,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-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");
 
 }
 
@@ -675,8 +759,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;
@@ -701,12 +787,35 @@ 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);
+                                       }
+                               }
+                               break;
                        case 'l':
                                iface = optarg;
                                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 '?':
Impressum, Datenschutz