periodically reset HM-CFG-USB by enetring and leaving bootloader-mode

[hmcfgusb] / hmland.c

diff --git a/hmland.c b/hmland.c
index a9d9670186f8dc522b1bc772b3a1db689f0d3267..29ec7a18606ac1de161a6f263740ff0b1c23eb72 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -44,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;
@@ -438,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);
@@ -455,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) {
@@ -478,13 +491,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) {
+                               fprintf(stderr, "HM-CFG-USB running since %lu seconds, rebooting now...\n",
+                                       time(NULL) - dev->opened_at);
+                       }
+                       hmcfgusb_enter_bootloader(dev);
+               }
        }
 
        hmcfgusb_close(dev);
@@ -603,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;
                }
        }
@@ -682,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");
 
 }
@@ -694,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;
@@ -720,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;