 @@ -1,14 +1,14 @@
-/*      $NetBSD: rumpclient.c,v 1.53 2013/01/17 16:29:44 pooka Exp $	*/
+/*      $NetBSD: rumpclient.c,v 1.54 2013/01/17 20:47:44 pooka Exp $	*/
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -38,45 +38,43 @@
  * notifications but defer their handling to a stage where we do not
  * hold the communication lock.  Taking a signal while holding on to
  * that lock may cause a deadlock.  Therefore, block signals throughout
  * the RPC when using poll.  This unfortunately means that the normal
  * SIGINT way of stopping a process while it is undergoing rump kernel
  * RPC will not work.  If anyone know which Linux system call handles
  * the above scenario correctly, I'm all ears.
  */
 #ifdef __NetBSD__
 #define USE_KQUEUE
 #endif
-#include <sys/cdefs.h>
+__RCSID("$NetBSD: rumpclient.c,v 1.54 2013/01/17 20:47:44 pooka Exp $");
 __RCSID("$NetBSD: rumpclient.c,v 1.53 2013/01/17 16:29:44 pooka Exp $");
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #ifdef USE_KQUEUE
 #include <sys/event.h>
 #endif
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <assert.h>
 #include <dlfcn.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <pthread.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <rump/rumpclient.h>
 @@ -149,31 +147,33 @@ send_with_recon(struct spclient *spc, st
 					rv = ENOTCONN;
 					break;
+				}
 				fprintf(stderr, "rump_sp: connection to "
 				    "kernel lost, trying to reconnect ...\n");
 			} else if (time(NULL) - prevreconmsg > 120) {
 				fprintf(stderr, "rump_sp: still trying to "
 				    "reconnect ...\n");
 				prevreconmsg = time(NULL);
+			}
 			/* check that we aren't over the limit */
 			if (retrytimo > 0) {
-				struct timeval tmp;
+				time_t tdiff;
 				gettimeofday(&curtime, NULL);
-				timersub(&curtime, &starttime, &tmp);
+				tdiff = curtime.tv_sec - starttime.tv_sec;
-				if (tmp.tv_sec >= retrytimo) {
+				if (starttime.tv_usec > curtime.tv_usec)
 					tdiff--;
 				if (tdiff >= retrytimo) {
 					fprintf(stderr, "rump_sp: reconnect "
 					    "failed, %lld second timeout\n",
 					    (long long)retrytimo);
 					return ENOTCONN;
+				}
+			}
 			/* adhoc backoff timer */
 			if (reconretries < 10) {
 				usleep(100000 * reconretries);
 			} else {
 				sleep(MIN(10, reconretries-9));
+			}
 @@ -834,29 +834,31 @@ rumpclient_init(void)
 	sigfillset(&fullset);
 	/*
 	 * sag mir, wo die symbols sind.  zogen fort, der krieg beginnt.
 	 * wann wird man je verstehen?  wann wird man je verstehen?
 	 */
 #ifdef RTLD_NEXT
 #define FINDSYM2(_name_,_syscall_)					\
 	if ((host_##_name_ = rumphijack_dlsym(RTLD_NEXT,		\
 	    #_syscall_)) == NULL) {					\
 		if (rumphijack_dlsym == rumpclient__dlsym)		\
 			host_##_name_ = _name_; /* static fallback */	\
-		if (host_##_name_ == NULL)				\
+		if (host_##_name_ == NULL) {				\
-			errx(1, "cannot find %s: %s", #_syscall_,	\
+			fprintf(stderr,"cannot find %s: %s", #_syscall_,\
 			    dlerror());					\
 			exit(1);					\
 		}							\
+	}
 #else
 #define FINDSYM2(_name_,_syscall)					\
 	host_##_name_ = _name_;
 #endif
 #define FINDSYM(_name_) FINDSYM2(_name_,_name_)
 #ifdef __NetBSD__
 	FINDSYM2(socket,__socket30)
 #else
 	FINDSYM(socket)
 #endif
 	FINDSYM(close)
 @@ -1140,34 +1142,60 @@ rumpclient_exec(const char *path, char *
 	newenv[nelem+2] = NULL;
 	rv = host_execve(path, argv, newenv);
 	_DIAGASSERT(rv != 0);
 	sverrno = errno;
 	free(envstr2);
 	free(envstr);
 	free(newenv);
 	errno = sverrno;
 	return rv;
+}
 /*
  * daemon() is handwritten for the benefit of platforms which
  * do not support daemon().
  */
 int
 rumpclient_daemon(int nochdir, int noclose)
+{
 	struct rumpclient_fork *rf;
 	int sverrno;
 	if ((rf = rumpclient_prefork()) == NULL)
 		return -1;
-	if (daemon(nochdir, noclose) == -1) {
+	switch (fork()) {
-		sverrno = errno;
+	case 0:
-		rumpclient_fork_cancel(rf);
+		break;
-		errno = sverrno;
+	case -1:
-		return -1;
+		goto daemonerr;
 	default:
 		_exit(0);
+	}
 	if (setsid() == -1)
 		goto daemonerr;
 	if (!nochdir && chdir("/") == -1)
 		goto daemonerr;
 	if (!noclose) {
 		int fd = open("/dev/null", O_RDWR);
 		dup2(fd, 0);
 		dup2(fd, 1);
 		dup2(fd, 2);
 		if (fd > 2)
 			close(fd);
+	}
 	/* note: fork is either completed or cancelled by the call */
 	if (rumpclient_fork_init(rf) == -1)
 		return -1;
 	return 0;
  daemonerr:
 	sverrno = errno;
 	rumpclient_fork_cancel(rf);
 	errno = sverrno;
 	return -1;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpclient.h,v 1.12 2012/08/03 11:31:34 pooka Exp $	*/
+/*	$NetBSD: rumpclient.h,v 1.13 2013/01/17 20:47:44 pooka Exp $	*/
 /*-
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -32,27 +32,31 @@
 #if !defined(__returns_twice)
 #ifdef __GNUC__
 #define __returns_twice __attribute__((__returns_twice__))
 #else /* __GNUC__ */
 #define __returns_twice
 #endif /* !__GNUC__ */
 #endif /* !__returns_twice */
 struct rumpclient_fork;
 #define rumpclient_vfork() rumpclient__dofork(vfork)
 #ifdef __BEGIN_DECLS
 __BEGIN_DECLS
 #else
 extern "C" {
 #endif
 int rumpclient_syscall(int, const void *, size_t, register_t *);
 int rumpclient_init(void);
 struct rumpclient_fork *rumpclient_prefork(void);
 int			rumpclient_fork_init(struct rumpclient_fork *);
 void			rumpclient_fork_cancel(struct rumpclient_fork *);
 void			rumpclient_fork_vparent(struct rumpclient_fork *);
 pid_t rumpclient_fork(void);
 int rumpclient_exec(const char *, char *const [], char *const[]);
 int rumpclient_daemon(int, int);
 @@ -92,16 +96,20 @@ rumpclient__dofork(pid_t (*forkfn)(void)
 		if (rumpclient_fork_init(rf) == -1)
 			pid = -1;
 		break;
 	default:
 		/* XXX: multithreaded vforker?  do they exist? */
 		if (childran)
 			rumpclient_fork_vparent(rf);
 		break;
+	}
 	return pid;
+}
 #ifdef __END_DECLS
 __END_DECLS
 #else
+}
 #endif
 #endif /* _RUMP_RUMPCLIENT_H_ */