print timestamps in verbose mode
[hmcfgusb] / hmland.c
index 519e02b997fac6c5c0114b4cf78e07c1be79b0a1..a9d9670186f8dc522b1bc772b3a1db689f0d3267 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -33,6 +33,8 @@
 #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>
@@ -48,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)
@@ -58,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',
@@ -238,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) {
@@ -247,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;
 }
 
@@ -269,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;
 
@@ -294,10 +381,18 @@ 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++;
 
-                       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);
@@ -306,6 +401,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;
+                               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;
@@ -314,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;
@@ -323,9 +424,10 @@ 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);
@@ -350,12 +452,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);
+       hmcfgusb_send(dev, out, sizeof(out), 1);
 
        while(!quit) {
                int fd;
 
-               fd = hmcfgusb_poll(dev, 3600);
+               fd = hmcfgusb_poll(dev, 1);     /* Wakeup device/bus at least once a second */
                if (fd >= 0) {
                        if (fd == master_socket) {
                                int client;
@@ -374,6 +480,9 @@ static int comm(int fd_in, int fd_out, int master_socket)
                        if (errno) {
                                perror("hmcfgusb_poll");
                                quit = 1;
+                       } else {
+                               /* periodically wakeup the device */
+                               hmcfgusb_send_null_frame(dev);
                        }
                }
        }
@@ -405,14 +514,36 @@ static int socket_server(char *iface, int port, int flags)
                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) {
-                               perror("Can't create PID file " PID_FILE);
+                               perror("Can't reopen PID file fd");
                                exit(EXIT_FAILURE);
                        }
 
@@ -505,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,
@@ -512,27 +644,28 @@ static int socket_server(char *iface, int port, int flags)
                                        (client_addr & 0x000000ff));
                }
 
-               comm(client, client, sock);
+               comm(client, client, sock, flags);
 
                shutdown(client, SHUT_RDWR);
                close(client);
 
                if (verbose) {
+                       print_timestamp(stdout);
                        printf("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;
@@ -562,7 +695,7 @@ int main(int argc, char **argv)
        char *ep;
        int opt;
 
-       while((opt = getopt(argc, argv, "DdhiPp:l:v")) != -1) {
+       while((opt = getopt(argc, argv, "DdhiPp:Rl:v")) != -1) {
                switch (opt) {
                        case 'D':
                                debug = 1;
@@ -584,6 +717,9 @@ 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 'l':
                                iface = optarg;
                                break;
@@ -601,7 +737,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