Add init script for hmland

[hmcfgusb] / hmland.c

diff --git a/hmland.c b/hmland.c
index 519e02b997fac6c5c0114b4cf78e07c1be79b0a1..6b89ece6a56d76d3f69ed8daba597ee369743517 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>

+#include <stdarg.h>

 #include <string.h>
 #include <strings.h>
 #include <poll.h>
 #include <string.h>
 #include <strings.h>
 #include <poll.h>


@@ -33,20 +34,39 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #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 <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"
 
 #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;
 extern char *optarg;
 
 static int impersonate_hmlanif = 0;
 static int debug = 0;
 static int verbose = 0;

+static FILE *logfile = NULL;
+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;
+       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)
 
 #define        FLAG_LENGTH_BYTE        (1<<0)
 #define        FLAG_FORMAT_HEX         (1<<1)


@@ -58,6 +78,61 @@ static int verbose = 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; }
 
 #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 void write_log(char *buf, int len, char *fmt, ...)
+{
+       va_list ap;
+       int i;
+
+       if ((!logfile) && (!verbose))
+               return;
+
+       if (logfile)
+               print_timestamp(logfile);
+       if (verbose)
+               print_timestamp(stdout);
+
+       if (fmt) {
+               if (logfile) {
+                       va_start(ap, fmt);
+                       vfprintf(logfile, fmt, ap);
+                       va_end(ap);
+               }
+               if (verbose) {
+                       va_start(ap, fmt);
+                       vprintf(fmt, ap);
+                       va_end(ap);
+               }
+       }
+
+       if (buf && len) {
+               for (i = 0; i < len; i++) {
+                       if (logfile)
+                               fprintf(logfile, "%c", buf[i]);
+                       if (verbose)
+                               printf("%c", buf[i]);
+               }
+               if (logfile)
+                       fprintf(logfile, "\n");
+               if (verbose)
+                       printf("\n");
+       }
+       if (logfile)
+               fflush(logfile);
+}
+

 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',
 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',


@@ -181,6 +256,7 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data)
        uint8_t out[1024];
        uint8_t *outpos;
        uint8_t *inpos;
        uint8_t out[1024];
        uint8_t *outpos;
        uint8_t *inpos;

+       uint16_t version;

        int fd = *((int*)data);
        int w;
 
        int fd = *((int*)data);
        int w;
 


@@ -200,6 +276,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);
                                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);
                        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);


@@ -207,6 +285,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);
 
                        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);
                        break;
                case 'E':
                        format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 3, FLAG_FORMAT_HEX);


@@ -232,14 +326,44 @@ 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);
 
                        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);
                        hexdump(buf, buf_len, "Unknown> ");
                        break;
        }
                        break;
                default:
                        format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), buf_len-1, FLAG_FORMAT_HEX | FLAG_NL);
                        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;
+       }
+
+       write_log((char*)out, outpos-out-2, "LAN < ");

 
        w = write(fd, out, outpos-out);
        if (w <= 0) {
 
        w = write(fd, out, outpos-out);
        if (w <= 0) {


@@ -247,6 +371,30 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data)
                return 0;
        }
 
                return 0;
        }
 

+       /* Send all queued packets */
+       if (wait_for_h) {
+               struct queued_rx *curr_rx = qrx;
+               struct queued_rx *last_rx;
+
+               while (curr_rx) {
+                       write_log(curr_rx->rx, curr_rx->len-2, "LAN < ");
+
+                       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;
 }
 
        return 1;
 }
 


@@ -269,9 +417,6 @@ static int hmlan_parse_in(int fd, void *data)
 
                inpos = buf;
 
 
                inpos = buf;
 

-               if (debug)
-                       fprintf(stderr, "\nLAN > %s", buf);
-

                while (inpos < inend) {
                        uint8_t *instart = inpos;
 
                while (inpos < inend) {
                        uint8_t *instart = inpos;
 


@@ -294,10 +439,12 @@ static int hmlan_parse_in(int fd, void *data)
                        if (last == 0)
                                continue;
 
                        if (last == 0)
                                continue;
 

+                       write_log((char*)instart, last,  "LAN > ");
+

                        memset(out, 0, sizeof(out));
                        *outpos++ = *inpos++;
 
                        memset(out, 0, sizeof(out));
                        *outpos++ = *inpos++;
 

-                       switch(buf[0]) {
+                       switch(*instart) {

                                case 'S':
                                        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);
                                case 'S':
                                        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);


@@ -306,6 +453,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;
                                        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;
                                default:
                                        parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), FLAG_IGNORE_COMMAS);
                                        break;


@@ -314,7 +466,8 @@ static int hmlan_parse_in(int fd, void *data)
                        hmcfgusb_send(dev, out, sizeof(out), 1);
                }
        } else if (r < 0) {
                        hmcfgusb_send(dev, out, sizeof(out), 1);
                }
        } else if (r < 0) {

-               perror("read");
+               if (errno != ECONNRESET)
+                       perror("read");

                return r;
        } else {
                return 0;
                return r;
        } else {
                return 0;


@@ -323,9 +476,10 @@ static int hmlan_parse_in(int fd, void *data)
        return 1;
 }
 
        return 1;
 }
 

-static int comm(int fd_in, int fd_out, int master_socket)
+static int comm(int fd_in, int fd_out, int master_socket, int flags)

 {
        struct hmcfgusb_dev *dev;
 {
        struct hmcfgusb_dev *dev;

+       uint8_t out[0x40]; //FIXME!!!

        int quit = 0;
 
        hmcfgusb_set_debug(debug);
        int quit = 0;
 
        hmcfgusb_set_debug(debug);


@@ -336,6 +490,43 @@ static int comm(int fd_in, int fd_out, int master_socket)
                return 0;
        }
 
                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);
        if (!hmcfgusb_add_pfd(dev, fd_in, POLLIN)) {
                fprintf(stderr, "Can't add client to pollfd!\n");
                hmcfgusb_close(dev);


@@ -350,12 +541,16 @@ static int comm(int fd_in, int fd_out, int master_socket)
                }
        }
 
                }
        }
 

-       hmcfgusb_send(dev, (unsigned char*)"K", 1, 1);
+       memset(out, 0, sizeof(out));
+       out[0] = 'K';
+       wait_for_h = 1;
+       hmcfgusb_send_null_frame(dev, 1);
+       hmcfgusb_send(dev, out, sizeof(out), 1);

 
        while(!quit) {
                int fd;
 
 
        while(!quit) {
                int fd;
 

-               fd = hmcfgusb_poll(dev, 3600);
+               fd = hmcfgusb_poll(dev, 1000);  /* Wakeup device/bus at least once a second */

                if (fd >= 0) {
                        if (fd == master_socket) {
                                int client;
                if (fd >= 0) {
                        if (fd == master_socket) {
                                int client;


@@ -372,9 +567,27 @@ static int comm(int fd_in, int fd_out, int master_socket)
                        }
                } else if (fd == -1) {
                        if (errno) {
                        }
                } else if (fd == -1) {
                        if (errno) {

-                               perror("hmcfgusb_poll");
-                               quit = 1;
+                               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);

                }
        }
 
                }
        }
 


@@ -405,14 +618,36 @@ static int socket_server(char *iface, int port, int flags)
                FILE *pidfile = NULL;
 
                if (flags & FLAG_PID_FILE) {
                FILE *pidfile = NULL;
 
                if (flags & FLAG_PID_FILE) {

-                       mode_t old_umask;
-
-                       old_umask = umask(022);
-                       pidfile = fopen(PID_FILE, "w");
-                       umask(old_umask);
+                       int fd;
+
+                       fd = open(PID_FILE, O_CREAT | O_EXCL | O_WRONLY, 0644);
+                       if (fd == -1) {
+                               if (errno == EEXIST) {
+                                       pid_t old_pid;
+                                       pidfile = fopen(PID_FILE, "r");
+                                       if (!pidfile) {
+                                               perror("PID file " PID_FILE " already exists, already running?");
+                                               exit(EXIT_FAILURE);
+                                       }
+
+                                       if (fscanf(pidfile, "%u", &old_pid) != 1) {
+                                               fclose(pidfile);
+                                               fprintf(stderr, "Can't read old PID from " PID_FILE ", already running?\n");
+                                               exit(EXIT_FAILURE);
+                                       }
+
+                                       fclose(pidfile);
+
+                                       fprintf(stderr, "Already running with PID %u according to " PID_FILE "!\n", old_pid);
+                                       exit(EXIT_FAILURE);
+                               }
+                               perror("Can't create PID file " PID_FILE);
+                               exit(EXIT_FAILURE);
+                       }

 
 

+                       pidfile = fdopen(fd, "w");

                        if (!pidfile) {
                        if (!pidfile) {

-                               perror("Can't create PID file " PID_FILE);
+                               perror("Can't reopen PID file fd");

                                exit(EXIT_FAILURE);
                        }
 
                                exit(EXIT_FAILURE);
                        }
 


@@ -472,7 +707,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) {
                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;
                }
        }
                        return EXIT_FAILURE;
                }
        }


@@ -504,35 +739,31 @@ static int socket_server(char *iface, int port, int flags)
                /* FIXME: getnameinfo... */
                client_addr = ntohl(csin.sin_addr.s_addr);
 
                /* FIXME: getnameinfo... */
                client_addr = ntohl(csin.sin_addr.s_addr);
 

-               if (verbose) {
-                       printf("Client %d.%d.%d.%d connected!\n",
-                                       (client_addr & 0xff000000) >> 24,
-                                       (client_addr & 0x00ff0000) >> 16,
-                                       (client_addr & 0x0000ff00) >> 8,
-                                       (client_addr & 0x000000ff));
-               }
+               write_log(NULL, 0, "Client %d.%d.%d.%d connected!\n",
+                               (client_addr & 0xff000000) >> 24,
+                               (client_addr & 0x00ff0000) >> 16,
+                               (client_addr & 0x0000ff00) >> 8,
+                               (client_addr & 0x000000ff));

 
 

-               comm(client, client, sock);
+               comm(client, client, sock, flags);

 
                shutdown(client, SHUT_RDWR);
                close(client);
 
 
                shutdown(client, SHUT_RDWR);
                close(client);
 

-               if (verbose) {
-                       printf("Connection to %d.%d.%d.%d closed!\n",
-                                       (client_addr & 0xff000000) >> 24,
-                                       (client_addr & 0x00ff0000) >> 16,
-                                       (client_addr & 0x0000ff00) >> 8,
-                                       (client_addr & 0x000000ff));
-               }
-
+               write_log(NULL, 0, "Connection to %d.%d.%d.%d closed!\n",
+                               (client_addr & 0xff000000) >> 24,
+                               (client_addr & 0x00ff0000) >> 16,
+                               (client_addr & 0x0000ff00) >> 8,
+                               (client_addr & 0x000000ff));
+               sleep(1);

        }
 
        return EXIT_SUCCESS;
 }
 
        }
 
        return EXIT_SUCCESS;
 }
 

-static int interactive_server(void)
+static int interactive_server(int flags)

 {
 {

-       if (!comm(STDIN_FILENO, STDOUT_FILENO, -1))
+       if (!comm(STDIN_FILENO, STDOUT_FILENO, -1, flags))

                return EXIT_FAILURE;
 
        return EXIT_SUCCESS;
                return EXIT_FAILURE;
 
        return EXIT_SUCCESS;


@@ -542,14 +773,18 @@ void hmlan_syntax(char *prog)
 {
        fprintf(stderr, "Syntax: %s options\n\n", prog);
        fprintf(stderr, "Possible options:\n");
 {
        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-L logfile\tlog network-communication to logfile\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");

 
 }
 
 
 }
 


@@ -561,8 +796,8 @@ int main(int argc, char **argv)
        int flags = 0;
        char *ep;
        int opt;
        int flags = 0;
        char *ep;
        int opt;

-
-       while((opt = getopt(argc, argv, "DdhiPp:l:v")) != -1) {
+       
+       while((opt = getopt(argc, argv, "DdhiPp:Rr:l:L:vV")) != -1) {

                switch (opt) {
                        case 'D':
                                debug = 1;
                switch (opt) {
                        case 'D':
                                debug = 1;


@@ -584,12 +819,46 @@ int main(int argc, char **argv)
                                        exit(EXIT_FAILURE);
                                }
                                break;
                                        exit(EXIT_FAILURE);
                                }
                                break;

+                       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);
+                                       }
+                               }
+                               reboot_set = 1;
+                               break;

                        case 'l':
                                iface = optarg;
                                break;
                        case 'l':
                                iface = optarg;
                                break;

+                       case 'L':
+                               logfile = fopen(optarg, "a");
+                               if (!logfile) {
+                                       perror("fopen(logfile)");
+                                       exit(EXIT_FAILURE);
+                               }
+                               break;

                        case 'v':
                                verbose = 1;
                                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 '?':
                        case 'h':
                        case ':':
                        case '?':


@@ -601,7 +870,7 @@ int main(int argc, char **argv)
        }
        
        if (interactive) {
        }
        
        if (interactive) {

-               return interactive_server();
+               return interactive_server(flags);

        } else {
                return socket_server(iface, port, flags);
        }
        } else {
                return socket_server(iface, port, flags);
        }