X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/b0bf6ad2612d6459451e9a38cb1059b567990eb8..62f60cc1519f114c5906cafaf49c34dc90729643:/hmland.c diff --git a/hmland.c b/hmland.c index 519e02b..3dae545 100644 --- a/hmland.c +++ b/hmland.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -238,8 +239,13 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data) hexdump(buf, buf_len, "Unknown> "); break; } - if (debug) - fprintf(stderr, "LAN < %s\n", out); + if (verbose) { + int i; + + printf("LAN < "); + for (i = 0; i < outpos-out; i++) + printf("%c", out[i]); + } w = write(fd, out, outpos-out); if (w <= 0) { @@ -269,9 +275,6 @@ static int hmlan_parse_in(int fd, void *data) inpos = buf; - if (debug) - fprintf(stderr, "\nLAN > %s", buf); - while (inpos < inend) { uint8_t *instart = inpos; @@ -294,10 +297,17 @@ static int hmlan_parse_in(int fd, void *data) if (last == 0) continue; + if (verbose) { + printf("LAN > "); + for (i = 0; i < last; i++) + printf("%c", instart[i]); + printf("\n"); + } + 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); @@ -306,6 +316,11 @@ static int hmlan_parse_in(int fd, void *data) 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; @@ -323,9 +338,10 @@ 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 quit = 0; hmcfgusb_set_debug(debug); @@ -350,12 +366,15 @@ static int comm(int fd_in, int fd_out, int master_socket) } } - hmcfgusb_send(dev, (unsigned char*)"K", 1, 1); + memset(out, 0, sizeof(out)); + out[0] = 'K'; + hmcfgusb_send_null_frame(dev); + hmcfgusb_send(dev, out, sizeof(out), 1); while(!quit) { int fd; - fd = hmcfgusb_poll(dev, 3600); + fd = hmcfgusb_poll(dev, 1); /* Wakeup device/bus at least once a second */ if (fd >= 0) { if (fd == master_socket) { int client; @@ -374,6 +393,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); } } } @@ -405,14 +427,36 @@ static int socket_server(char *iface, int port, int flags) FILE *pidfile = NULL; if (flags & FLAG_PID_FILE) { - mode_t old_umask; - - old_umask = umask(022); - pidfile = fopen(PID_FILE, "w"); - umask(old_umask); + 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 create PID file " PID_FILE); + perror("Can't reopen PID file fd"); exit(EXIT_FAILURE); } @@ -512,7 +556,7 @@ static int socket_server(char *iface, int port, int flags) (client_addr & 0x000000ff)); } - comm(client, client, sock); + comm(client, client, sock, flags); shutdown(client, SHUT_RDWR); close(client); @@ -524,15 +568,15 @@ static int socket_server(char *iface, int port, int flags) (client_addr & 0x0000ff00) >> 8, (client_addr & 0x000000ff)); } - + sleep(1); } 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; @@ -562,7 +606,7 @@ int main(int argc, char **argv) char *ep; int opt; - while((opt = getopt(argc, argv, "DdhiPp:l:v")) != -1) { + while((opt = getopt(argc, argv, "DdhiPp:Rl:v")) != -1) { switch (opt) { case 'D': debug = 1; @@ -584,6 +628,9 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } break; + case 'R': + fprintf(stderr, "-R is no longer needed (1s wakeup is default)\n"); + break; case 'l': iface = optarg; break; @@ -601,7 +648,7 @@ int main(int argc, char **argv) } if (interactive) { - return interactive_server(); + return interactive_server(flags); } else { return socket_server(iface, port, flags); }