 @@ -1,14 +1,14 @@
-/*      $NetBSD: rumpclient.c,v 1.55 2013/09/10 16:53:06 pooka Exp $	*/
+/*      $NetBSD: rumpclient.c,v 1.56 2014/02/20 00:42:27 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,27 +38,27 @@
  * 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
-__RCSID("$NetBSD: rumpclient.c,v 1.55 2013/09/10 16:53:06 pooka Exp $");
+__RCSID("$NetBSD: rumpclient.c,v 1.56 2014/02/20 00:42:27 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>
 @@ -89,26 +89,27 @@ ssize_t	(*host_read)(int, void *, size_t
 ssize_t (*host_sendmsg)(int, const struct msghdr *, int);
 int	(*host_setsockopt)(int, int, int, const void *, socklen_t);
 int	(*host_dup)(int);
 #ifdef USE_KQUEUE
 int	(*host_kqueue)(void);
 int	(*host_kevent)(int, const struct kevent *, size_t,
 		       struct kevent *, size_t, const struct timespec *);
 #endif
 int	(*host_execve)(const char *, char *const[], char *const[]);
 #include "sp_common.c"
 #include "rumpuser_sigtrans.c"
 static struct spclient clispc = {
 	.spc_fd = -1,
 };
 static int kq = -1;
 static sigset_t fullset;
 static int doconnect(void);
 static int handshake_req(struct spclient *, int, void *, int, bool);
 /*
  * Default: don't retry.  Most clients can't handle it
 @@ -580,26 +581,27 @@ rumpclient_syscall(int sysnum, const voi
  out:
 	pthread_sigmask(SIG_SETMASK, &omask, NULL);
 	return rv;
+}
 static void
 handlereq(struct spclient *spc)
+{
 	struct rsp_copydata *copydata;
 	struct rsp_hdr *rhdr = &spc->spc_hdr;
 	void *mapaddr;
 	size_t maplen;
 	int reqtype = spc->spc_hdr.rsp_type;
 	int sig;
 	switch (reqtype) {
 	case RUMPSP_COPYIN:
 	case RUMPSP_COPYINSTR:
 		/*LINTED*/
 		copydata = (struct rsp_copydata *)spc->spc_buf;
 		DPRINTF(("rump_sp handlereq: copyin request: %p/%zu\n",
 		    copydata->rcp_addr, copydata->rcp_len));
 		send_copyin_resp(spc, spc->spc_hdr.rsp_reqno,
 		    copydata->rcp_addr, copydata->rcp_len,
 		    reqtype == RUMPSP_COPYINSTR);
 		break;
 	case RUMPSP_COPYOUT:
 @@ -613,28 +615,29 @@ handlereq(struct spclient *spc)
 		    copydata->rcp_len);
 		break;
 	case RUMPSP_ANONMMAP:
 		/*LINTED*/
 		maplen = *(size_t *)spc->spc_buf;
 		mapaddr = mmap(NULL, maplen, PROT_READ|PROT_WRITE,
 		    MAP_ANON, -1, 0);
 		if (mapaddr == MAP_FAILED)
 			mapaddr = NULL;
 		DPRINTF(("rump_sp handlereq: anonmmap: %p\n", mapaddr));
 		send_anonmmap_resp(spc, spc->spc_hdr.rsp_reqno, mapaddr);
 		break;
 	case RUMPSP_RAISE:
-		DPRINTF(("rump_sp handlereq: raise sig %d\n", rhdr->rsp_signo));
+		sig = rumpuser__sig_rump2host(rhdr->rsp_signo);
-		raise((int)rhdr->rsp_signo);
+		DPRINTF(("rump_sp handlereq: raise sig %d\n", sig));
 		raise(sig);
 		/*
 		 * We most likely have signals blocked, but the signal
 		 * will be handled soon enough when we return.
 		 */
 		break;
 	default:
 		printf("PANIC: INVALID TYPE %d\n", reqtype);
 		abort();
 		break;
+	}
 	spcfreebuf(spc);
+}

 @@ -1,35 +1,37 @@
-#	$NetBSD: Makefile,v 1.15 2013/09/10 16:51:24 pooka Exp $
+#	$NetBSD: Makefile,v 1.16 2014/02/20 00:42:27 pooka Exp $
+#
 .include <bsd.own.mk>
 WARNS?=		5
 # rumpuser.h is in sys/rump for inclusion by kernel components
 .PATH:		${.CURDIR}/../../sys/rump/include/rump
 LIB=		rumpuser
 LIBDPLIBS+=	pthread ${.CURDIR}/../libpthread
 .for lib in ${RUMPUSER_EXTERNAL_DPLIBS}
 LIBDO.${lib}=	_external
 LIBDPLIBS+=	${lib} lib
 .endfor
 CPPFLAGS+=	-DLIBRUMPUSER
 #CPPFLAGS+=	-D_DIAGNOSTIC
 SRCS=		rumpuser.c
 SRCS+=		rumpuser_pth.c
-SRCS+=		rumpuser_component.c rumpuser_errtrans.c rumpuser_bio.c
+SRCS+=		rumpuser_component.c rumpuser_bio.c
 SRCS+=		rumpuser_errtrans.c rumpuser_sigtrans.c
 # optional
 SRCS+=		rumpuser_dl.c rumpuser_sp.c rumpuser_daemonize.c
 INCSDIR=	/usr/include/rump
 INCS=		rumpuser.h rumpuser_component.h rumpuser_port.h
 MAN=		rumpuser.3
 CPPFLAGS+=	-D_REENTRANT
 .include <bsd.lib.mk>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpuser.c,v 1.55 2013/10/27 16:39:46 rmind Exp $	*/
+/*	$NetBSD: rumpuser.c,v 1.56 2014/02/20 00:42:27 pooka Exp $	*/
 /*
  * Copyright (c) 2007-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.
+ *
 @@ -18,27 +18,27 @@
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "rumpuser_port.h"
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.55 2013/10/27 16:39:46 rmind Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.56 2014/02/20 00:42:27 pooka Exp $");
 #endif /* !lint */
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/uio.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #ifdef __NetBSD__
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/dkio.h>
 #endif
 @@ -633,46 +633,41 @@ rumpuser_seterrno(int error)
  * This is meant for safe debugging prints from the kernel.
  */
 void
 rumpuser_dprintf(const char *format, ...)
+{
 	va_list ap;
 	va_start(ap, format);
 	vfprintf(stderr, format, ap);
 	va_end(ap);
+}
 int
-rumpuser_kill(int64_t pid, int sig)
+rumpuser_kill(int64_t pid, int rumpsig)
+{
-	int rv;
+	int rv, sig;
 #ifdef __NetBSD__
 	int error;
 	sig = rumpuser__sig_rump2host(rumpsig);
 	if (pid == RUMPUSER_PID_SELF) {
 		error = raise(sig);
 	} else {
 		error = kill((pid_t)pid, sig);
+	}
 	if (error == -1)
 		rv = errno;
 	else
 		rv = 0;
 #else
 	/* XXXfixme: signal numbers may not match on non-NetBSD */
 	rv = EOPNOTSUPP;
 #endif
 	ET(rv);
+}
 int
 rumpuser_getrandom(void *buf, size_t buflen, int flags, size_t *retp)
+{
 	size_t origlen = buflen;
 	uint32_t *p = buf;
 	uint32_t tmp;
 	int chunk;
 	do {