X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/fcb129773e3b12a6393ae12f34a059cb9ff2dba4..2f47f304d1ffbed3869066b0cb335b7bf32a9e8d:/hmland.c diff --git a/hmland.c b/hmland.c index 04bb752..8651957 100644 --- a/hmland.c +++ b/hmland.c @@ -1,6 +1,6 @@ /* HM-CFG-LAN emulation for HM-CFG-USB * - * Copyright (c) 2013 Michael Gernoth + * Copyright (c) 2013-16 Michael Gernoth * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -43,10 +43,16 @@ #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; @@ -58,6 +64,9 @@ 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; @@ -91,7 +100,7 @@ static void print_timestamp(FILE *f) fprintf(f, "%s.%06ld: ", ts, tv.tv_usec); } -static void write_log(char *buf, int len, char *fmt, ...) +static void write_log(const char *buf, int len, const char *fmt, ...) { va_list ap; int i; @@ -107,12 +116,18 @@ static void write_log(char *buf, int len, char *fmt, ...) if (fmt) { if (logfile) { va_start(ap, fmt); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" vfprintf(logfile, fmt, ap); +#pragma GCC diagnostic pop va_end(ap); } if (verbose) { va_start(ap, fmt); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" vprintf(fmt, ap); +#pragma GCC diagnostic pop va_end(ap); } } @@ -133,14 +148,12 @@ static void write_log(char *buf, int len, char *fmt, ...) fflush(logfile); } -static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int outlen, int len, int flags) +static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int outlen, size_t 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; - int i; + size_t i; if (flags & FLAG_COMMA_BEFORE) { CHECK_SPACE(1); @@ -158,9 +171,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 { @@ -188,21 +201,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; @@ -210,7 +208,7 @@ static int parse_part_in(uint8_t **inpos, int inlen, uint8_t **outpos, int outle uint8_t *inend = *inpos + inlen; if (flags & FLAG_LENGTH_BYTE) { - int len = 0; + size_t len = 0; uint8_t *ip; ip = *inpos; @@ -283,7 +281,12 @@ 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)), 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; @@ -398,72 +401,99 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) 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[131073]; 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 > "); - while (inpos < inend) { - uint8_t *instart = inpos; + 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); + break; + default: + parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_IGNORE_COMMAS); + break; + } - if ((*inpos == '\r') || (*inpos == '\n')) { - inpos++; - continue; - } - - outpos = out; + hmcfgusb_send(dev, out, sizeof(out), 1); - last = inend - inpos; + return 1; +} - for (i = 0; i < last; i++) { - if ((inpos[i] == '\r') || (inpos[i] == '\n')) { - last = i; +static int hmlan_parse_in(int fd, void *data) +{ + uint8_t *newbuf; + int r; + int 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; - - write_log((char*)instart, last, "LAN > "); - - memset(out, 0, sizeof(out)); - *outpos++ = *inpos++; - - 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); - 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; - 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; + 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) { if (errno != ECONNRESET) @@ -484,7 +514,7 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) 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; @@ -550,7 +580,7 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags) while(!quit) { int fd; - fd = hmcfgusb_poll(dev, 1000); /* Wakeup device/bus at least once a second */ + fd = hmcfgusb_poll(dev, POLL_TIMEOUT_MS); if (fd >= 0) { if (fd == master_socket) { int client; @@ -630,7 +660,7 @@ static int socket_server(char *iface, int port, int flags) exit(EXIT_FAILURE); } - if (fscanf(pidfile, "%u", &old_pid) != 1) { + if (fscanf(pidfile, "%d", &old_pid) != 1) { fclose(pidfile); fprintf(stderr, "Can't read old PID from " PID_FILE ", already running?\n"); exit(EXIT_FAILURE); @@ -686,8 +716,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"); @@ -750,6 +778,11 @@ static int socket_server(char *iface, int port, int flags) shutdown(client, SHUT_RDWR); close(client); + 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, @@ -776,6 +809,7 @@ void hmlan_syntax(char *prog) 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"); @@ -783,6 +817,7 @@ void hmlan_syntax(char *prog) 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"); @@ -797,7 +832,7 @@ int main(int argc, char **argv) char *ep; int opt; - while((opt = getopt(argc, argv, "DdhiPp:Rr:l:L:vV")) != -1) { + while((opt = getopt(argc, argv, "DdhIiPp:Rr:l:L:S:vV")) != -1) { switch (opt) { case 'D': debug = 1; @@ -806,6 +841,9 @@ int main(int argc, char **argv) case 'd': flags |= FLAG_DAEMON; break; + case 'I': + impersonate_hmlanif = 1; + break; case 'i': interactive = 1; break; @@ -852,12 +890,15 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } break; + case 'S': + serial = optarg; + break; case 'v': verbose = 1; break; case 'V': printf("hmland " VERSION "\n"); - printf("Copyright (c) 2013 Michael Gernoth\n\n"); + printf("Copyright (c) 2013-16 Michael Gernoth\n\n"); exit(EXIT_SUCCESS); case 'h': case ':':