fix linker parameter order

[hmcfgusb] / hmland.c

diff --git a/hmland.c b/hmland.c
index cde993b795df0b375841e64ca285894ffb578d54..c3981ab4e912f8f14298f09b84b33e479817793a 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -1,4 +1,4 @@
-/* HM-CFG-LAN emuldation for HM-CFG-USB
+/* HM-CFG-LAN emulation for HM-CFG-USB
  *
  * Copyright (c) 2013 Michael Gernoth <michael@gernoth.net>
  *
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <strings.h>
 #include <poll.h>
+#include <signal.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -56,6 +57,8 @@ static int verbose = 0;
 
 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;
@@ -74,20 +77,13 @@ static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int out
        }
 
        if (flags & FLAG_FORMAT_HEX) {
-               char hex[3];
-
-               memset(hex, 0, sizeof(hex));
-
                CHECK_AVAIL(len);
                CHECK_SPACE(len*2);
                for (i = 0; i < len; i++) {
-                       if (snprintf(hex, sizeof(hex), "%02X", **inpos) != 2) {
-                               fprintf(stderr, "Can't format hex-string!\n");
-                               return 0;
-                       }
-                       *inpos += 1;
-                       memcpy(*outpos, hex, 2);
-                       *outpos += 2;
+                       **outpos = nibble[((**inpos) & 0xf0) >> 4];
+                       *outpos += 1;
+                       **outpos = nibble[((**inpos) & 0xf)];
+                       *inpos += 1; *outpos += 1;
                }
        } else {
                CHECK_AVAIL(len);
@@ -114,14 +110,26 @@ 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;
        uint8_t *outend = *outpos + outlen;
        uint8_t *inend = *inpos + inlen;
-       char hex[3];
-
-       memset(hex, 0, sizeof(hex));
 
        if (flags & FLAG_LENGTH_BYTE) {
                int len = 0;
@@ -155,25 +163,26 @@ static int parse_part_in(uint8_t **inpos, int inlen, uint8_t **outpos, int outle
 
                CHECK_SPACE(1);
                CHECK_AVAIL(2);
-               memcpy(hex, *inpos, 2);
-               *inpos += 2;
 
-               **outpos = strtoul(hex, NULL, 16);
-               *outpos += 1;
+               **outpos = ascii_to_nibble(**inpos) << 4;
+               *inpos += 1;
+               **outpos |= ascii_to_nibble(**inpos);
+               *inpos += 1; *outpos += 1;
        }
 
        return *outpos - buf_out;
 }
 
-static void hmlan_format_out(uint8_t *buf, int buf_len, void *data)
+static int hmlan_format_out(uint8_t *buf, int buf_len, void *data)
 {
        uint8_t out[1024];
        uint8_t *outpos;
        uint8_t *inpos;
        int fd = *((int*)data);
+       int w;
 
        if (buf_len < 1)
-               return;
+               return 1;
 
        memset(out, 0, sizeof(out));
        outpos = out;
@@ -226,9 +235,16 @@ static void hmlan_format_out(uint8_t *buf, int buf_len, void *data)
                        hexdump(buf, buf_len, "Unknown> ");
                        break;
        }
-       write(fd, out, outpos-out);
        if (debug)
                fprintf(stderr, "LAN < %s\n", out);
+
+       w = write(fd, out, outpos-out);
+       if (w <= 0) {
+               perror("write");
+               return 0;
+       }
+
+       return 1;
 }
 
 static int hmlan_parse_in(int fd, void *data)
@@ -251,7 +267,7 @@ static int hmlan_parse_in(int fd, void *data)
                inpos = buf;
 
                if (debug)
-                       fprintf(stderr, "LAN > %s\n", buf);
+                       fprintf(stderr, "\nLAN > %s", buf);
 
                while (inpos < inend) {
                        uint8_t *instart = inpos;
@@ -363,8 +379,9 @@ static int comm(int fd_in, int fd_out, int master_socket)
        return 1;
 }
 
-static int socket_server(int port, int daemon)
+static int socket_server(char *iface, int port, int daemon)
 {
+       struct sigaction sact;
        struct sockaddr_in sin;
        int sock;
        int n;
@@ -381,6 +398,14 @@ static int socket_server(int port, int daemon)
                }
        }
 
+       memset(&sact, 0, sizeof(sact));
+       sact.sa_handler = SIG_IGN;
+
+       if (sigaction(SIGPIPE, &sact, NULL) == -1) {
+               perror("sigaction");
+               exit(EXIT_FAILURE);
+       }
+
        impersonate_hmlanif = 1;
 
        sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -398,7 +423,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");
@@ -469,6 +501,7 @@ 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 n\tlisten on port n (default 1000)\n");
        fprintf(stderr, "\t-v\tverbose mode\n");
 
@@ -477,12 +510,13 @@ void hmlan_syntax(char *prog)
 int main(int argc, char **argv)
 {
        int port = 1000;
+       char *iface = NULL;
        int interactive = 0;
        int daemon = 0;
        char *ep;
        int opt;
 
-       while((opt = getopt(argc, argv, "Ddhip:v")) != -1) {
+       while((opt = getopt(argc, argv, "Ddhip:l:v")) != -1) {
                switch (opt) {
                        case 'D':
                                debug = 1;
@@ -501,6 +535,9 @@ int main(int argc, char **argv)
                                        exit(EXIT_FAILURE);
                                }
                                break;
+                       case 'l':
+                               iface = optarg;
+                               break;
                        case 'v':
                                verbose = 1;
                                break;
@@ -517,6 +554,6 @@ int main(int argc, char **argv)
        if (interactive) {
                return interactive_server();
        } else {
-               return socket_server(port, daemon);
+               return socket_server(iface, port, daemon);
        }
 }