send a full frame containing only zeroes instead of a zero-byte frame

[hmcfgusb] / hmland.c

diff --git a/hmland.c b/hmland.c
index 1a20bb93bc9c371b9d4dc037dd0df3d147626d6c..c50022c8225effc7a8814e50930bddc1f10578f4 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -34,6 +34,7 @@
 #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>
@@ -49,6 +50,15 @@ static int impersonate_hmlanif = 0;
 static int debug = 0;
 static int verbose = 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_COMMA_BEFORE       (1<<2)
@@ -59,6 +69,19 @@ 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 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',
@@ -239,8 +262,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) {
@@ -248,6 +305,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;
 }
 
@@ -270,9 +359,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;
 
@@ -295,6 +381,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++;
 
@@ -320,7 +414,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;
@@ -359,7 +454,8 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
 
        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) {
@@ -386,7 +482,7 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
                                quit = 1;
                        } else {
                                /* periodically wakeup the device */
-                               hmcfgusb_send_null_frame(dev);
+                               hmcfgusb_send_null_frame(dev, 1);
                        }
                }
        }
@@ -540,6 +636,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 +650,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,