/* HM-CFG-LAN emulation for HM-CFG-USB
*
- * Copyright (c) 2013-15 Michael Gernoth <michael@gernoth.net>
+ * Copyright (c) 2013-16 Michael Gernoth <michael@gernoth.net>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
#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 */
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;
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;
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);
}
}
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);
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 {
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 *inend = *inpos + inlen;
if (flags & FLAG_LENGTH_BYTE) {
- int len = 0;
+ size_t len = 0;
uint8_t *ip;
ip = *inpos;
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);
- format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 1, 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;
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);
+ // Fallthrough to default expected, no break here
default:
parse_part_in(&inpos, (last-(inpos-cmd)), &outpos, (sizeof(out)-(outpos-out)), FLAG_IGNORE_COMMAS);
break;
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;
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;
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);
exit(EXIT_FAILURE);
}
- impersonate_hmlanif = 1;
-
sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (sock == -1) {
perror("Can't open socket");
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");
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");
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;
case 'd':
flags |= FLAG_DAEMON;
break;
+ case 'I':
+ impersonate_hmlanif = 1;
+ break;
case 'i':
interactive = 1;
break;
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 ':':
projects / hmcfgusb / blobdiff