From: Michael Gernoth <michael@gernoth.net>
Date: Sun, 18 Aug 2013 15:07:08 +0000 (+0200)
Subject: periodically reset HM-CFG-USB by enetring and leaving bootloader-mode
X-Git-Tag: v0.100~52
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/commitdiff_plain/62f25bae3cf25b35ecac593129e07f1b600dbe1a

periodically reset HM-CFG-USB by enetring and leaving bootloader-mode
---

diff --git a/hmcfgusb.c b/hmcfgusb.c
index d3bec90..8261f13 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -98,7 +98,7 @@ static char * usb_strerror(int e)
 	return unknerr;
 }
 
-static libusb_device_handle *hmcfgusb_find() {
+static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
 	libusb_device_handle *devh = NULL;
 	libusb_device **list;
 	ssize_t cnt;
@@ -118,8 +118,7 @@ static libusb_device_handle *hmcfgusb_find() {
 		if (err)
 			continue;
 
-		if ((desc.idVendor == ID_VENDOR) &&
-		    ((desc.idProduct == ID_PRODUCT) || (desc.idProduct == ID_PRODUCT_BL))) {
+		if ((desc.idVendor == vid) && (desc.idProduct == pid)) {
 			libusb_device *dev = list[i];
 
 			err = libusb_open(dev, &devh);
@@ -297,6 +296,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 	const struct libusb_pollfd **usb_pfd = NULL;
 	struct hmcfgusb_dev *dev = NULL;
 	struct hmcfgusb_cb_data *cb_data = NULL;
+	int bootloader = 0;
 	int err;
 	int i;
 
@@ -306,10 +306,14 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 		return NULL;
 	}
 
-	devh = hmcfgusb_find();
+	devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT);
 	if (!devh) {
-		fprintf(stderr, "Can't find/open hmcfgusb!\n");
-		return NULL;
+		devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT_BL);
+		if (!devh) {
+			fprintf(stderr, "Can't find/open hmcfgusb!\n");
+			return NULL;
+		}
+		bootloader = 1;
 	}
 
 	dev = malloc(sizeof(struct hmcfgusb_dev));
@@ -320,6 +324,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 
 	memset(dev, 0, sizeof(struct hmcfgusb_dev));
 	dev->usb_devh = devh;
+	dev->bootloader = bootloader;
+	dev->opened_at = time(NULL);
 
 	cb_data = malloc(sizeof(struct hmcfgusb_cb_data));
 	if (!cb_data) {
@@ -475,6 +481,22 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 	return -1;
 }
 
+void hmcfgusb_enter_bootloader(struct hmcfgusb_dev *dev)
+{
+	uint8_t out[ASYNC_SIZE];
+
+	if (dev->bootloader) {
+		fprintf(stderr, "request for bootloader mode, but device already in bootloader!\n");
+		return;
+	}
+
+	memset(out, 0, sizeof(out));
+	out[0] = 'B';
+	hmcfgusb_send(dev, out, sizeof(out), 1);
+
+	return;
+}
+
 void hmcfgusb_close(struct hmcfgusb_dev *dev)
 {
 	int err;
diff --git a/hmcfgusb.h b/hmcfgusb.h
index df6d1c1..e438077 100644
--- a/hmcfgusb.h
+++ b/hmcfgusb.h
@@ -29,6 +29,8 @@ struct hmcfgusb_dev {
 	int n_usb_pfd;
 	struct pollfd *pfd;
 	int n_pfd;
+	int bootloader;
+	time_t opened_at;
 };
 
 int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len, int done);
@@ -36,5 +38,6 @@ int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev, int silent);
 struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data);
 int hmcfgusb_add_pfd(struct hmcfgusb_dev *dev, int fd, short events);
 int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout);
+void hmcfgusb_enter_bootloader(struct hmcfgusb_dev *dev);
 void hmcfgusb_close(struct hmcfgusb_dev *dev);
 void hmcfgusb_set_debug(int d);
diff --git a/hmland.c b/hmland.c
index f3b7cf9..29ec7a1 100644
--- a/hmland.c
+++ b/hmland.c
@@ -44,11 +44,14 @@
 
 #define PID_FILE "/var/run/hmland.pid"
 
+#define DEFAULT_REBOOT_SECONDS	86400
+
 extern char *optarg;
 
 static int impersonate_hmlanif = 0;
 static int debug = 0;
 static int verbose = 0;
+static int reboot_seconds = 0;
 
 struct queued_rx {
 	char *rx;
@@ -438,6 +441,16 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
 		return 0;
 	}
 
+	if (dev->bootloader) {
+		fprintf(stderr, "HM-CFG-USB in bootloader mode, restarting in normal mode...\n");
+		memset(out, 0, sizeof(out));
+		out[0] = 'K';
+		hmcfgusb_send(dev, out, sizeof(out), 1);
+		hmcfgusb_close(dev);
+		sleep(1);
+		return 0;
+	}
+
 	if (!hmcfgusb_add_pfd(dev, fd_in, POLLIN)) {
 		fprintf(stderr, "Can't add client to pollfd!\n");
 		hmcfgusb_close(dev);
@@ -492,6 +505,14 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
 				}
 			}
 		}
+
+		if (reboot_seconds && ((dev->opened_at + reboot_seconds) <= time(NULL))) {
+			if (verbose) {
+				fprintf(stderr, "HM-CFG-USB running since %lu seconds, rebooting now...\n",
+					time(NULL) - dev->opened_at);
+			}
+			hmcfgusb_enter_bootloader(dev);
+		}
 	}
 
 	hmcfgusb_close(dev);
@@ -689,6 +710,7 @@ void hmlan_syntax(char *prog)
 	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 n\treboot HM-CFG-USB after n seconds (0: no reboot, default: %u)\n", DEFAULT_REBOOT_SECONDS);
 	fprintf(stderr, "\t-v\tverbose mode\n");
 
 }
@@ -701,8 +723,10 @@ int main(int argc, char **argv)
 	int flags = 0;
 	char *ep;
 	int opt;
+	
+	reboot_seconds = DEFAULT_REBOOT_SECONDS;
 
-	while((opt = getopt(argc, argv, "DdhiPp:Rl:v")) != -1) {
+	while((opt = getopt(argc, argv, "DdhiPp:Rr:l:v")) != -1) {
 		switch (opt) {
 			case 'D':
 				debug = 1;
@@ -727,6 +751,13 @@ int main(int argc, char **argv)
 			case 'R':
 				fprintf(stderr, "-R is no longer needed (1s wakeup is default)\n");
 				break;
+			case 'r':
+				reboot_seconds = strtoul(optarg, &ep, 10);
+				if (*ep != '\0') {
+					fprintf(stderr, "Can't parse reboot-timeout!\n");
+					exit(EXIT_FAILURE);
+				}
+				break;
 			case 'l':
 				iface = optarg;
 				break;