#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <libusb-1.0/libusb.h>
#define FLAG_COMMA_AFTER (1<<3)
#define FLAG_NL (1<<4)
#define FLAG_IGNORE_COMMAS (1<<5)
+#define FLAG_PERIODIC_WAKEUP (1<<6)
#define CHECK_SPACE(x) if ((*outpos + x) > outend) { fprintf(stderr, "Not enough space!\n"); return 0; }
#define CHECK_AVAIL(x) if ((*inpos + x) > inend) { fprintf(stderr, "Not enough input available!\n"); return 0; }
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);
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 poll_timeout = 3600;
int quit = 0;
hmcfgusb_set_debug(debug);
}
}
- hmcfgusb_send(dev, (unsigned char*)"K", 1, 1);
+ if (flags & FLAG_PERIODIC_WAKEUP)
+ poll_timeout = 1;
+
+ memset(out, 0, sizeof(out));
+ out[0] = 'K';
+ hmcfgusb_send(dev, out, sizeof(out), 1);
while(!quit) {
int fd;
- fd = hmcfgusb_poll(dev, 3600);
+ fd = hmcfgusb_poll(dev, poll_timeout);
if (fd >= 0) {
if (fd == master_socket) {
int client;
if (errno) {
perror("hmcfgusb_poll");
quit = 1;
+ } else {
+ /* periodically wakeup the device */
+ hmcfgusb_send_null_frame(dev);
}
}
}
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);
}
(client_addr & 0x000000ff));
}
- comm(client, client, sock);
+ comm(client, client, sock, flags);
shutdown(client, SHUT_RDWR);
close(client);
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;
fprintf(stderr, "\t-l ip\tlisten on given IP address only (for example 127.0.0.1)\n");
fprintf(stderr, "\t-P\tcreate PID file " PID_FILE " in daemon mode\n");
fprintf(stderr, "\t-p n\tlisten on port n (default 1000)\n");
+ fprintf(stderr, "\t-R\twakeup the device (and USB-bus) every second (fix for e.g. Raspberry Pi)\n");
fprintf(stderr, "\t-v\tverbose mode\n");
}
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;
exit(EXIT_FAILURE);
}
break;
+ case 'R':
+ flags |= FLAG_PERIODIC_WAKEUP;
+ break;
case 'l':
iface = optarg;
break;
}
if (interactive) {
- return interactive_server();
+ return interactive_server(flags);
} else {
return socket_server(iface, port, flags);
}