#include <stdlib.h>
#include <unistd.h>
#include <stdint.h>
+#include <stdarg.h>
#include <string.h>
#include <strings.h>
#include <poll.h>
static int impersonate_hmlanif = 0;
static int debug = 0;
static int verbose = 0;
+static FILE *logfile = NULL;
static int reboot_seconds = 0;
static int reboot_at_hour = -1;
static int reboot_at_minute = -1;
+static int reboot_set = 0;
struct queued_rx {
char *rx;
fprintf(f, "%s.%06ld: ", ts, tv.tv_usec);
}
+static void write_log(char *buf, int len, char *fmt, ...)
+{
+ va_list ap;
+ int i;
+
+ if ((!logfile) && (!verbose))
+ return;
+
+ if (logfile)
+ print_timestamp(logfile);
+ if (verbose)
+ print_timestamp(stdout);
+
+ if (fmt) {
+ if (logfile) {
+ va_start(ap, fmt);
+ vfprintf(logfile, fmt, ap);
+ va_end(ap);
+ }
+ if (verbose) {
+ va_start(ap, fmt);
+ vprintf(fmt, ap);
+ va_end(ap);
+ }
+ }
+
+ if (buf && len) {
+ for (i = 0; i < len; i++) {
+ if (logfile)
+ fprintf(logfile, "%c", buf[i]);
+ if (verbose)
+ printf("%c", buf[i]);
+ }
+ if (logfile)
+ fprintf(logfile, "\n");
+ if (verbose)
+ printf("\n");
+ }
+ if (logfile)
+ fflush(logfile);
+}
+
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',
uint8_t out[1024];
uint8_t *outpos;
uint8_t *inpos;
+ uint16_t version;
int fd = *((int*)data);
int w;
buf[7] = 'N';
}
format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 0, FLAG_LENGTH_BYTE);
+ version = inpos[0] << 8;
+ version |= inpos[1];
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)), 0, FLAG_COMMA_BEFORE | FLAG_LENGTH_BYTE);
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 (!reboot_set) {
+ int new_reboot_seconds;
+
+ if (version < 0x03c7) {
+ new_reboot_seconds = DEFAULT_REBOOT_SECONDS;
+ } else {
+ new_reboot_seconds = 0;
+ }
+
+ if (verbose && new_reboot_seconds && (reboot_seconds != new_reboot_seconds))
+ printf("Rebooting in %u seconds due to old firmware (0.%d)\n",
+ new_reboot_seconds, version);
+
+ reboot_seconds = new_reboot_seconds;
+ }
+
break;
case 'E':
format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 3, FLAG_FORMAT_HEX);
format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 1, 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);
+ break;
+ case 'G':
+ format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), 1, FLAG_FORMAT_HEX | FLAG_NL);
+
break;
default:
format_part_out(&inpos, (buf_len-(inpos-buf)), &outpos, (sizeof(out)-(outpos-out)), buf_len-1, FLAG_FORMAT_HEX | FLAG_NL);
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");
- }
+ write_log((char*)out, outpos-out-2, "LAN < ");
w = write(fd, out, outpos-out);
if (w <= 0) {
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");
- }
+ write_log(curr_rx->rx, curr_rx->len-2, "LAN < ");
w = write(fd, curr_rx->rx, curr_rx->len);
if (w <= 0) {
if (last == 0)
continue;
- if (verbose) {
- print_timestamp(stdout);
- printf("LAN > ");
- for (i = 0; i < last; i++)
- printf("%c", instart[i]);
- printf("\n");
- }
+ write_log((char*)instart, last, "LAN > ");
memset(out, 0, sizeof(out));
*outpos++ = *inpos++;
while(!quit) {
int fd;
- fd = hmcfgusb_poll(dev, 1); /* Wakeup device/bus at least once a second */
+ fd = hmcfgusb_poll(dev, 1000); /* Wakeup device/bus at least once a second */
if (fd >= 0) {
if (fd == master_socket) {
int client;
/* FIXME: getnameinfo... */
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,
- (client_addr & 0x0000ff00) >> 8,
- (client_addr & 0x000000ff));
- }
+ write_log(NULL, 0, "Client %d.%d.%d.%d connected!\n",
+ (client_addr & 0xff000000) >> 24,
+ (client_addr & 0x00ff0000) >> 16,
+ (client_addr & 0x0000ff00) >> 8,
+ (client_addr & 0x000000ff));
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));
- }
+ write_log(NULL, 0, "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);
}
fprintf(stderr, "\t-h\t\tthis help\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\t\tcreate PID file " PID_FILE " in daemon mode\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)\n", DEFAULT_REBOOT_SECONDS);
+ 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-v\t\tverbose mode\n");
fprintf(stderr, "\t-V\t\tshow version (" VERSION ")\n");
char *ep;
int opt;
- reboot_seconds = DEFAULT_REBOOT_SECONDS;
-
- while((opt = getopt(argc, argv, "DdhiPp:Rr:l:vV")) != -1) {
+ while((opt = getopt(argc, argv, "DdhiPp:Rr:l:L:vV")) != -1) {
switch (opt) {
case 'D':
debug = 1;
exit(EXIT_FAILURE);
}
}
+ reboot_set = 1;
break;
case 'l':
iface = optarg;
break;
+ case 'L':
+ logfile = fopen(optarg, "a");
+ if (!logfile) {
+ perror("fopen(logfile)");
+ exit(EXIT_FAILURE);
+ }
+ break;
case 'v':
verbose = 1;
break;
projects / hmcfgusb / blobdiff