]> git.zerfleddert.de Git - hmcfgusb/blobdiff - hmland.c
hmuartlgw: Add timeout during module initialization
[hmcfgusb] / hmland.c
index f3353f6c1d943def551c27b731ef1e654ae26a1b..38e4d6baa499a03536a5bfd95ac0c25bbc1dcbe1 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -1,6 +1,6 @@
 /* HM-CFG-LAN emulation for HM-CFG-USB
  *
- * Copyright (c) 2013 Michael Gernoth <michael@gernoth.net>
+ * Copyright (c) 2013-16 Michael Gernoth <michael@gernoth.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
+#include <stdarg.h>
 #include <string.h>
 #include <strings.h>
 #include <poll.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 "version.h"
 #include "hexdump.h"
 #include "hmcfgusb.h"
+#include "util.h"
 
 #define PID_FILE "/var/run/hmland.pid"
 
+#define POLL_TIMEOUT_MS                250     /* Wake up device/bus at least once every 250ms */
+#define DEFAULT_REBOOT_SECONDS 86400
+#define LAN_READ_CHUNK_SIZE    2048
+/* Don't allow remote clients to consume all of our memory */
+#define LAN_MAX_LINE_LENGTH    4096
+#define LAN_MAX_BUF_LENGTH     1048576
+
 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;
+static uint8_t *lan_read_buf = NULL;
+static int lan_read_buflen = 0;
+static char *serial = NULL;
+
+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)
@@ -59,10 +87,63 @@ 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; }
 
+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',
-               'A', 'B', 'C', 'D', 'E', 'F'};
        uint8_t *buf_out = *outpos;
        uint8_t *outend = *outpos + outlen;
        uint8_t *inend = *inpos + inlen;
@@ -84,9 +165,9 @@ static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int out
                CHECK_AVAIL(len);
                CHECK_SPACE(len*2);
                for (i = 0; i < len; i++) {
-                       **outpos = nibble[((**inpos) & 0xf0) >> 4];
+                       **outpos = nibble_to_ascii(((**inpos) & 0xf0) >> 4);
                        *outpos += 1;
-                       **outpos = nibble[((**inpos) & 0xf)];
+                       **outpos = nibble_to_ascii(((**inpos) & 0xf));
                        *inpos += 1; *outpos += 1;
                }
        } else {
@@ -114,21 +195,6 @@ static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int out
        return *outpos - buf_out;
 }
 
-static uint8_t ascii_to_nibble(uint8_t a)
-{
-       uint8_t c = 0x00;
-
-       if ((a >= '0') && (a <= '9')) {
-               c = a - '0';
-       } else if ((a >= 'A') && (a <= 'F')) {
-               c = (a - 'A') + 10;
-       } else if ((a >= 'a') && (a <= 'f')) {
-               c = (a - 'a') + 10;
-       }
-
-       return c;
-}
-
 static int parse_part_in(uint8_t **inpos, int inlen, uint8_t **outpos, int outlen, int flags)
 {
        uint8_t *buf_out = *outpos;
@@ -182,6 +248,7 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data)
        uint8_t out[1024];
        uint8_t *outpos;
        uint8_t *inpos;
+       uint16_t version;
        int fd = *((int*)data);
        int w;
 
@@ -201,12 +268,35 @@ 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);
+                       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)), 3, FLAG_FORMAT_HEX | FLAG_COMMA_BEFORE);
                        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 (version < 0x03c7) {
+                               format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 2, FLAG_FORMAT_HEX | FLAG_COMMA_BEFORE | FLAG_NL);
+                       } else {
+                               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)), 1, 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':
@@ -233,14 +323,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);
 
+                       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;
        }
-       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) {
@@ -248,74 +368,129 @@ 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) {
+                       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;
 }
 
-static int hmlan_parse_in(int fd, void *data)
+static int hmlan_parse_one(uint8_t *cmd, int last, void *data)
 {
        struct hmcfgusb_dev *dev = data;
-       uint8_t buf[1025];
        uint8_t out[0x40]; //FIXME!!!
        uint8_t *outpos;
-       uint8_t *inpos;
-       int i;
-       int last;
-       int r;
+       uint8_t *inpos = cmd;
 
-       memset(buf, 0, sizeof(buf));
+       outpos = out;
 
-       r = read(fd, buf, sizeof(buf)-1);
-       if (r > 0) {
-               uint8_t *inend = buf + r;
+       if (last == 0)
+               return 1;
 
-               inpos = buf;
+       write_log((char*)cmd, last,  "LAN > ");
 
-               if (debug)
-                       fprintf(stderr, "\nLAN > %s", buf);
+       memset(out, 0, sizeof(out));
+       *outpos++ = *inpos++;
+
+       switch(*cmd) {
+               case 'S':
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE);
+                       break;
+               case 'Y':
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE);
+                       break;
+               case '+':
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), 0);
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE);
+               default:
+                       parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_IGNORE_COMMAS);
+                       break;
+       }
 
-               while (inpos < inend) {
-                       uint8_t *instart = inpos;
+       hmcfgusb_send(dev, out, sizeof(out), 1);
 
-                       if ((*inpos == '\r') || (*inpos == '\n')) {
-                               inpos++;
-                               continue;
-                       }
-                       
-                       outpos = out;
+       return 1;
+}
 
-                       last = inend - inpos;
+static int hmlan_parse_in(int fd, void *data)
+{
+       uint8_t *newbuf;
+       int r;
+       int i;
 
-                       for (i = 0; i < last; i++) {
-                               if ((inpos[i] == '\r') || (inpos[i] == '\n')) {
-                                       last = i;
+       newbuf = realloc(lan_read_buf, lan_read_buflen + LAN_READ_CHUNK_SIZE);
+       if (!newbuf) {
+               perror("realloc");
+               return 0;
+       }
+       lan_read_buf = newbuf;
+       r = read(fd, lan_read_buf + lan_read_buflen, LAN_READ_CHUNK_SIZE);
+       if (r > 0) {
+               lan_read_buflen += r;
+               if (lan_read_buflen > LAN_MAX_BUF_LENGTH) {
+                       if (verbose)
+                               printf("Our buffer is bigger than %d bytes (%d bytes), closing connection!\n", LAN_MAX_BUF_LENGTH, lan_read_buflen);
+                       return -1;
+               }
+               while(lan_read_buflen > 0) {
+                       int found = 0;
+
+                       for (i = 0; i < lan_read_buflen; i++) {
+                               if ((lan_read_buf[i] == '\r') || (lan_read_buf[i] == '\n')) {
+                                       if (i > 0)
+                                               hmlan_parse_one(lan_read_buf, i, data);
+                                       memmove(lan_read_buf, lan_read_buf + i + 1, lan_read_buflen - (i + 1));
+                                       lan_read_buflen -= (i + 1);
+                                       found = 1;
                                        break;
                                }
+                               if (i > LAN_MAX_LINE_LENGTH) {
+                                       if (verbose)
+                                               printf("Client sent more than %d bytes without newline, closing connection!\n", LAN_MAX_LINE_LENGTH);
+                                       return -1;
+                               }
                        }
-
-                       if (last == 0)
-                               continue;
-
-                       memset(out, 0, sizeof(out));
-                       *outpos++ = *inpos++;
-
-                       switch(buf[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);
-                                       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)), 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;
+                       if (!found)
+                               break;
+                       newbuf = realloc(lan_read_buf, lan_read_buflen);
+                       if (lan_read_buflen && !newbuf) {
+                               perror("realloc");
+                               return 0;
                        }
-
-                       hmcfgusb_send(dev, out, sizeof(out), 1);
+                       lan_read_buf = newbuf;
                }
        } else if (r < 0) {
-               perror("read");
+               if (errno != ECONNRESET)
+                       perror("read");
                return r;
        } else {
                return 0;
@@ -324,19 +499,57 @@ static int hmlan_parse_in(int fd, void *data)
        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;
+       uint8_t out[0x40]; //FIXME!!!
        int quit = 0;
 
        hmcfgusb_set_debug(debug);
 
-       dev = hmcfgusb_init(hmlan_format_out, &fd_out);
+       dev = hmcfgusb_init(hmlan_format_out, &fd_out, serial);
        if (!dev) {
                fprintf(stderr, "Can't initialize HM-CFG-USB!\n");
                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);
@@ -351,12 +564,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;
 
-               fd = hmcfgusb_poll(dev, 3600);
+               fd = hmcfgusb_poll(dev, POLL_TIMEOUT_MS);
                if (fd >= 0) {
                        if (fd == master_socket) {
                                int client;
@@ -373,9 +590,27 @@ static int comm(int fd_in, int fd_out, int master_socket)
                        }
                } 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);
                }
        }
 
@@ -474,8 +709,6 @@ static int socket_server(char *iface, int port, int flags)
                exit(EXIT_FAILURE);
        }
 
-       impersonate_hmlanif = 1;
-
        sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
        if (sock == -1) {
                perror("Can't open socket");
@@ -495,7 +728,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;
                }
        }
@@ -527,35 +760,36 @@ static int socket_server(char *iface, int port, int flags)
                /* 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);
 
-               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));
-               }
-
+               if (lan_read_buf)
+                       free(lan_read_buf);
+               lan_read_buf = NULL;
+               lan_read_buflen = 0;
+
+               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;
 }
 
-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;
@@ -565,14 +799,20 @@ 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\tpretend to be HM-LAN-IF for compatibility with client-software (previous default)\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-S serial\tuse HM-CFG-USB with given serial (for multiple hmland instances)\n");
+       fprintf(stderr, "\t-v\t\tverbose mode\n");
+       fprintf(stderr, "\t-V\t\tshow version (" VERSION ")\n");
 
 }
 
@@ -584,8 +824,8 @@ int main(int argc, char **argv)
        int flags = 0;
        char *ep;
        int opt;
-
-       while((opt = getopt(argc, argv, "DdhiPp:l:v")) != -1) {
+       
+       while((opt = getopt(argc, argv, "DdhIiPp:Rr:l:L:S:vV")) != -1) {
                switch (opt) {
                        case 'D':
                                debug = 1;
@@ -594,6 +834,9 @@ int main(int argc, char **argv)
                        case 'd':
                                flags |= FLAG_DAEMON;
                                break;
+                       case 'I':
+                               impersonate_hmlanif = 1;
+                               break;
                        case 'i':
                                interactive = 1;
                                break;
@@ -607,12 +850,49 @@ int main(int argc, char **argv)
                                        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':
+                               logfile = fopen(optarg, "a");
+                               if (!logfile) {
+                                       perror("fopen(logfile)");
+                                       exit(EXIT_FAILURE);
+                               }
+                               break;
+                       case 'S':
+                               serial = optarg;
+                               break;
                        case 'v':
                                verbose = 1;
                                break;
+                       case 'V':
+                               printf("hmland " VERSION "\n");
+                               printf("Copyright (c) 2013-16 Michael Gernoth\n\n");
+                               exit(EXIT_SUCCESS);
                        case 'h':
                        case ':':
                        case '?':
@@ -624,7 +904,7 @@ int main(int argc, char **argv)
        }
        
        if (interactive) {
-               return interactive_server();
+               return interactive_server(flags);
        } else {
                return socket_server(iface, port, flags);
        }
Impressum, Datenschutz