X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/6262005e88c7c9edff4c0f962ca338ffb2a299fb..30a2aa7a896f165e42c76315ae523f4225f7b130:/hmland.c

diff --git a/hmland.c b/hmland.c
index c50022c..5523cbd 100644
--- a/hmland.c
+++ b/hmland.c
@@ -44,11 +44,16 @@
 
 #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;
+static int reboot_at_hour = -1;
+static int reboot_at_minute = -1;
 
 struct queued_rx {
 	char *rx;
@@ -438,6 +443,53 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
 		return 0;
 	}
 
+	if (dev->bootloader) {
+		if (verbose)
+			printf("HM-CFG-USB in bootloader mode, restarting in normal mode...\n");
+
+		hmcfgusb_leave_bootloader(dev);
+
+		hmcfgusb_close(dev);
+		sleep(1);
+		return 0;
+	}
+
+	if ((reboot_at_hour != -1) && (reboot_at_minute != -1)) {
+		struct tm *tm_s;
+		time_t tm;
+
+		tm = time(NULL);
+		tm_s = localtime(&tm);
+		if (tm_s == NULL) {
+			perror("localtime");
+			return 0;
+		}
+
+		if ((tm_s->tm_hour > reboot_at_hour) ||
+		    ((tm_s->tm_hour == reboot_at_hour) && (tm_s->tm_min >= reboot_at_minute))) {
+			if (verbose)
+				printf("Rebooting tomorrow at %02u:%02u\n", reboot_at_hour, reboot_at_minute);
+
+			tm = 86400;
+		} else {
+			if (verbose)
+				printf("Rebooting today at %02u:%02u\n", reboot_at_hour, reboot_at_minute);
+
+			tm = 0;
+		}
+
+		tm_s->tm_hour = reboot_at_hour;
+		tm_s->tm_min = reboot_at_minute;
+		tm_s->tm_sec = 0;
+
+		tm += mktime(tm_s);
+		reboot_seconds = tm - dev->opened_at;
+	}
+
+	if (verbose && reboot_seconds)
+		printf("Rebooting in %u seconds\n", reboot_seconds);
+
+
 	if (!hmcfgusb_add_pfd(dev, fd_in, POLLIN)) {
 		fprintf(stderr, "Can't add client to pollfd!\n");
 		hmcfgusb_close(dev);
@@ -478,13 +530,28 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
 			}
 		} else if (fd == -1) {
 			if (errno) {
-				perror("hmcfgusb_poll");
-				quit = 1;
-			} else {
-				/* periodically wakeup the device */
-				hmcfgusb_send_null_frame(dev, 1);
+				if (errno != ETIMEDOUT) {
+					perror("hmcfgusb_poll");
+					quit = 1;
+				} else {
+					/* periodically wakeup the device */
+					hmcfgusb_send_null_frame(dev, 1);
+					if (wait_for_h) {
+						memset(out, 0, sizeof(out));
+						out[0] = 'K';
+						hmcfgusb_send(dev, out, sizeof(out), 1);
+					}
+				}
 			}
 		}
+
+		if (reboot_seconds && ((dev->opened_at + reboot_seconds) <= time(NULL))) {
+			if (verbose) {
+				printf("HM-CFG-USB running since %lu seconds, rebooting now...\n",
+					time(NULL) - dev->opened_at);
+			}
+			hmcfgusb_enter_bootloader(dev);
+		}
 	}
 
 	hmcfgusb_close(dev);
@@ -603,7 +670,7 @@ static int socket_server(char *iface, int port, int flags)
 		sin.sin_addr.s_addr = htonl(INADDR_ANY);
 	} else {
 		if (inet_pton(AF_INET, iface, &(sin.sin_addr.s_addr)) != 1) {
-			perror("inet_ntop");
+			fprintf(stderr, "Can't convert IP %s, aborting!\n", iface);
 			return EXIT_FAILURE;
 		}
 	}
@@ -675,14 +742,16 @@ void hmlan_syntax(char *prog)
 {
 	fprintf(stderr, "Syntax: %s options\n\n", prog);
 	fprintf(stderr, "Possible options:\n");
-	fprintf(stderr, "\t-D\tdebug mode\n");
-	fprintf(stderr, "\t-d\tdaemon mode\n");
-	fprintf(stderr, "\t-h\tthis help\n");
-	fprintf(stderr, "\t-i\tinteractive mode (connect HM-CFG-USB to terminal)\n");
-	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-v\tverbose mode\n");
+	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\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-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   hh:mm\treboot HM-CFG-USB daily at hh:mm\n");
+	fprintf(stderr, "\t-v\t\tverbose mode\n");
 
 }
 
@@ -694,8 +763,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;
@@ -720,6 +791,25 @@ 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') {
+					if (*ep == ':') {
+						reboot_at_hour = reboot_seconds;
+						ep++;
+						reboot_at_minute = strtoul(ep, &ep, 10);
+						if (*ep != '\0') {
+							fprintf(stderr, "Can't parse reboot-time!\n");
+							exit(EXIT_FAILURE);
+						}
+
+						reboot_seconds = 0;
+					} else {
+						fprintf(stderr, "Can't parse reboot-timeout!\n");
+						exit(EXIT_FAILURE);
+					}
+				}
+				break;
 			case 'l':
 				iface = optarg;
 				break;