]> cvs.zerfleddert.de Git - hmcfgusb/blobdiff - hmland.c
add -R as workaround for Raspberry Pi
[hmcfgusb] / hmland.c
index 24fa34e4c28925c674e6871fad856fecfc2eac2c..15b46ab7a5c4b0dbfd2404a55fd2f14b393c95ea 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -32,6 +32,8 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <libusb-1.0/libusb.h>
@@ -39,6 +41,8 @@
 #include "hexdump.h"
 #include "hmcfgusb.h"
 
+#define PID_FILE "/var/run/hmland.pid"
+
 extern char *optarg;
 
 static int impersonate_hmlanif = 0;
@@ -51,6 +55,7 @@ static int verbose = 0;
 #define        FLAG_COMMA_AFTER        (1<<3)
 #define        FLAG_NL                 (1<<4)
 #define        FLAG_IGNORE_COMMAS      (1<<5)
+#define        FLAG_PERIODIC_WAKEUP    (1<<6)
 
 #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; }
@@ -294,7 +299,7 @@ static int hmlan_parse_in(int fd, void *data)
                        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);
@@ -320,9 +325,11 @@ 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 poll_timeout = 3600;
        int quit = 0;
 
        hmcfgusb_set_debug(debug);
@@ -347,12 +354,17 @@ static int comm(int fd_in, int fd_out, int master_socket)
                }
        }
 
-       hmcfgusb_send(dev, (unsigned char*)"K", 1, 1);
+       if (flags & FLAG_PERIODIC_WAKEUP)
+               poll_timeout = 1;
+
+       memset(out, 0, sizeof(out));
+       out[0] = 'K';
+       hmcfgusb_send(dev, out, sizeof(out), 1);
 
        while(!quit) {
                int fd;
 
-               fd = hmcfgusb_poll(dev, 3600);
+               fd = hmcfgusb_poll(dev, poll_timeout);
                if (fd >= 0) {
                        if (fd == master_socket) {
                                int client;
@@ -371,6 +383,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);
                        }
                }
        }
@@ -379,7 +394,18 @@ static int comm(int fd_in, int fd_out, int master_socket)
        return 1;
 }
 
-static int socket_server(int port, int daemon)
+void sigterm_handler(int sig)
+{
+       if (unlink(PID_FILE) == -1)
+               perror("Can't remove PID file");
+
+       exit(EXIT_SUCCESS);
+}
+
+#define FLAG_DAEMON    (1 << 0)
+#define FLAG_PID_FILE  (1 << 1)
+
+static int socket_server(char *iface, int port, int flags)
 {
        struct sigaction sact;
        struct sockaddr_in sin;
@@ -387,22 +413,75 @@ static int socket_server(int port, int daemon)
        int n;
        pid_t pid;
 
-       if (daemon) {
+       if (flags & FLAG_DAEMON) {
+               FILE *pidfile = NULL;
+
+               if (flags & FLAG_PID_FILE) {
+                       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 reopen PID file fd");
+                               exit(EXIT_FAILURE);
+                       }
+
+                       memset(&sact, 0, sizeof(sact));
+                       sact.sa_handler = sigterm_handler;
+
+                       if (sigaction(SIGTERM, &sact, NULL) == -1) {
+                               perror("sigaction(SIGTERM)");
+                               exit(EXIT_FAILURE);
+                       }
+               }
+
                pid = fork();
                if (pid > 0) {
+                       if (pidfile) {
+                               fprintf(pidfile, "%u\n", pid);
+                               fclose(pidfile);
+                       }
+
                        printf("Daemon with PID %u started!\n", pid);
                        exit(EXIT_SUCCESS);
                } else if (pid < 0) {
                        perror("fork");
                        exit(EXIT_FAILURE);
                }
+
+               if (pidfile)
+                       fclose(pidfile);
        }
 
        memset(&sact, 0, sizeof(sact));
        sact.sa_handler = SIG_IGN;
 
        if (sigaction(SIGPIPE, &sact, NULL) == -1) {
-               perror("sigaction");
+               perror("sigaction(SIGPIPE)");
                exit(EXIT_FAILURE);
        }
 
@@ -423,7 +502,14 @@ static int socket_server(int port, int daemon)
        memset(&sin, 0, sizeof(sin));
        sin.sin_family = AF_INET;
        sin.sin_port = htons(port);
-       sin.sin_addr.s_addr = htonl(INADDR_ANY);
+       if (!iface) {
+               sin.sin_addr.s_addr = htonl(INADDR_ANY);
+       } else {
+               if (inet_pton(AF_INET, iface, &(sin.sin_addr.s_addr)) != 1) {
+                       perror("inet_ntop");
+                       return EXIT_FAILURE;
+               }
+       }
 
        if (bind(sock, (struct sockaddr*)&sin, sizeof(sin)) == -1) {
                perror("Can't bind socket");
@@ -460,7 +546,7 @@ static int socket_server(int port, int daemon)
                                        (client_addr & 0x000000ff));
                }
 
-               comm(client, client, sock);
+               comm(client, client, sock, flags);
 
                shutdown(client, SHUT_RDWR);
                close(client);
@@ -478,9 +564,9 @@ static int socket_server(int port, int daemon)
        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;
@@ -494,7 +580,10 @@ void hmlan_syntax(char *prog)
        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-R\twakeup the device (and USB-bus) every second (fix for e.g. Raspberry Pi)\n");
        fprintf(stderr, "\t-v\tverbose mode\n");
 
 }
@@ -502,23 +591,27 @@ void hmlan_syntax(char *prog)
 int main(int argc, char **argv)
 {
        int port = 1000;
+       char *iface = NULL;
        int interactive = 0;
-       int daemon = 0;
+       int flags = 0;
        char *ep;
        int opt;
 
-       while((opt = getopt(argc, argv, "Ddhip:v")) != -1) {
+       while((opt = getopt(argc, argv, "DdhiPp:Rl:v")) != -1) {
                switch (opt) {
                        case 'D':
                                debug = 1;
                                verbose = 1;
                                break;
                        case 'd':
-                               daemon = 1;
+                               flags |= FLAG_DAEMON;
                                break;
                        case 'i':
                                interactive = 1;
                                break;
+                       case 'P':
+                               flags |= FLAG_PID_FILE;
+                               break;
                        case 'p':
                                port = strtoul(optarg, &ep, 10);
                                if (*ep != '\0') {
@@ -526,6 +619,12 @@ int main(int argc, char **argv)
                                        exit(EXIT_FAILURE);
                                }
                                break;
+                       case 'R':
+                               flags |= FLAG_PERIODIC_WAKEUP;
+                               break;
+                       case 'l':
+                               iface = optarg;
+                               break;
                        case 'v':
                                verbose = 1;
                                break;
@@ -540,8 +639,8 @@ int main(int argc, char **argv)
        }
        
        if (interactive) {
-               return interactive_server();
+               return interactive_server(flags);
        } else {
-               return socket_server(port, daemon);
+               return socket_server(iface, port, flags);
        }
 }
Impressum, Datenschutz