add limited w32 implementation of setitimer w/o microsecond functionality

Author: tgauth

contrib/win32/win32compat/inc/sys/time.h

@@ -11,6 +11,13 @@ struct timeval
     long         tv_usec;
 };
 
+struct itimerval {
+	struct timeval it_interval; /* Timer interval */
+	struct timeval it_value;    /* Current value */
+};
+
+#define ITIMER_REAL 0
+
 int usleep(unsigned int);
 int gettimeofday(struct timeval *, void *);
 int nanosleep(const struct timespec *, struct timespec *);

contrib/win32/win32compat/inc/unistd.h

@@ -49,6 +49,9 @@ int w32_dup2(int oldfd, int newfd);
 unsigned int w32_alarm(unsigned int seconds);
 #define alarm w32_alarm
 
+int w32_setitimer(int which, const struct itimerval* new_value, struct itimerval* old_value);
+#define setitimer w32_setitimer
+
 long w32_lseek(int fd, unsigned __int64 offset, int origin);
 #define lseek w32_lseek
 

contrib/win32/win32compat/signal_internal.h

@@ -32,6 +32,7 @@ struct _timer_info {
 	ULONGLONG ticks_at_start; /* 0 if timer is not live */
 	__int64 run_time_sec; /* time in seconds, timer is set to go off from ticks_at_start */
 };
+
 int sw_init_timer();
 
 #define MAXIMUM_WAIT_OBJECTS_ENHANCED 1024

contrib/win32/win32compat/signal_sigalrm.c

@@ -29,6 +29,7 @@
 */
 
 #include "signal_internal.h"
+#include "inc\sys\time.h"
 #include "inc\signal.h"
 #include "debug.h"
 
@@ -64,8 +65,8 @@ w32_alarm(unsigned int sec)
 	due.QuadPart *= sec;
 	/* this call resets the timer if it is already active */
 	if (!SetWaitableTimer(timer_info.timer, &due, 0, sigalrm_APC, NULL, FALSE)) {
-		debug3("alram() - ERROR SetWaitableTimer() %d", GetLastError());
-		return 0;;
+		debug3("alarm() - ERROR SetWaitableTimer() %d", GetLastError());
+		return 0;
 	}
 
 	/* if timer was already ative, return when it was due */
@@ -80,6 +81,23 @@ w32_alarm(unsigned int sec)
 	return ret;
 }
 
+int w32_setitimer(int which, const struct itimerval *new_value, struct itimerval *old_value)
+{
+	if (which != ITIMER_REAL) {
+		errno = EINVAL;
+		return -1;
+	}
+	if (old_value != NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+	if (new_value->it_value.tv_sec == 0 && new_value->it_value.tv_usec == 0) {
+		w32_alarm(0);
+		return 0;
+	}
+	return w32_alarm(new_value->it_value.tv_sec);
+}
+
 int
 sw_init_timer()
 {

sshd-session.c

@@ -232,55 +232,6 @@ mm_is_monitor(void)
 }
 
 #ifdef WINDOWS
-/* copied from sshd.c */
-static struct sshbuf*
-pack_hostkeys(void)
-{
-	struct sshbuf* keybuf = NULL, * hostkeys = NULL;
-	int r;
-	u_int i;
-
-	if ((keybuf = sshbuf_new()) == NULL ||
-		(hostkeys = sshbuf_new()) == NULL)
-		fatal_f("sshbuf_new failed");
-
-	/* pack hostkeys into a string. Empty key slots get empty strings */
-	for (i = 0; i < options.num_host_key_files; i++) {
-		/* private key */
-		sshbuf_reset(keybuf);
-		if (sensitive_data.host_keys[i] != NULL &&
-			(r = sshkey_private_serialize(sensitive_data.host_keys[i],
-				keybuf)) != 0)
-			fatal_fr(r, "serialize hostkey private");
-		if ((r = sshbuf_put_stringb(hostkeys, keybuf)) != 0)
-			fatal_fr(r, "compose hostkey private");
-		/* public key */
-		if (sensitive_data.host_pubkeys[i] != NULL) {
-			if ((r = sshkey_puts(sensitive_data.host_pubkeys[i],
-				hostkeys)) != 0)
-				fatal_fr(r, "compose hostkey public");
-		}
-		else {
-			if ((r = sshbuf_put_string(hostkeys, NULL, 0)) != 0)
-				fatal_fr(r, "compose hostkey empty public");
-		}
-		/* cert */
-		if (sensitive_data.host_certificates[i] != NULL) {
-			if ((r = sshkey_puts(
-				sensitive_data.host_certificates[i],
-				hostkeys)) != 0)
-				fatal_fr(r, "compose host cert");
-		}
-		else {
-			if ((r = sshbuf_put_string(hostkeys, NULL, 0)) != 0)
-				fatal_fr(r, "compose host cert empty");
-		}
-	}
-
-	sshbuf_free(keybuf);
-	return hostkeys;
-}
-
 static void
 send_config_state(int fd, struct sshbuf* conf)
 {
@@ -726,11 +677,12 @@ privsep_preauth(struct ssh *ssh)
 		fcntl(pmonitor->m_log_sendfd, F_SETFD, FD_CLOEXEC);
 
 		/* Arrange for logging to be sent to the monitor */
-		set_log_handler(mm_log_handler, pmonitor);
+		//TODO: implement /*child*/ part of below using sshd-auth
+		//set_log_handler(mm_log_handler, pmonitor);
 
-		privsep_preauth_child();
-		setproctitle("%s", "[net]");
-		return 0;
+		//privsep_preauth_child();
+		//setproctitle("%s", "[net]");
+		//return 0;
 	}
 	else { /* parent */
 		posix_spawn_file_actions_t actions;
@@ -1352,7 +1304,6 @@ main(int ac, char **av)
 	sigset_t sigmask;
 	uint64_t timing_secret = 0;
 	struct itimerval itv;
-
 	sigemptyset(&sigmask);
 	sigprocmask(SIG_SETMASK, &sigmask, NULL);