Fri Nov 5 14:23:45 2010 UTC ()

Implement support for unix domain sockets (important especially
for testing since we don't want to depend on global resources such
as tcp ports).


(pooka)

diff -r1.1 -r1.2 src/lib/librumpuser/sp_common.c

--- src/lib/librumpuser/sp_common.c 2010/11/04 20:54:07	1.1
+++ src/lib/librumpuser/sp_common.c 2010/11/05 14:23:45	1.2

 @@ -1,14 +1,14 @@
-/*      $NetBSD: sp_common.c,v 1.1 2010/11/04 20:54:07 pooka Exp $	*/
+/*      $NetBSD: sp_common.c,v 1.2 2010/11/05 14:23:45 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.
+ *
 @@ -24,26 +24,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Common client/server sysproxy routines.  #included.
  */
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -319,50 +320,75 @@ tcp_parse(const char *addr, struct socka
+}
 static int
 tcp_connecthook(int s)
+{
 	int x;
 	x = 1;
 	setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &x, sizeof(x));
 	return 0;
+}
 static int
 unix_parse(const char *addr, struct sockaddr **sa, int allow_wildcard)
+{
 	struct sockaddr_un sun;
 	if (strlen(addr) > sizeof(sun.sun_path))
 		return ENAMETOOLONG;
 	/*
 	 * The pathname can be all kinds of spaghetti elementals,
 	 * so meek and obidient we accept everything.
 	 */
 	memset(&sun, 0, sizeof(sun));
 	sun.sun_family = AF_LOCAL;
 	strlcpy(sun.sun_path, addr, sizeof(sun.sun_path));
 	sun.sun_len = SUN_LEN(&sun);
 	*sa = malloc(sun.sun_len);
 	if (*sa == NULL)
 		return errno;
 	memcpy(*sa, &sun, sun.sun_len);
 	return 0;
+}
 /*ARGSUSED*/
 static int
 notsupp(void)
+{
 	fprintf(stderr, "rump_sp: support not yet implemented\n");
 	return EOPNOTSUPP;
+}
 static int
 success(void)
+{
 	return 0;
+}
 struct {
 	const char *id;
 	int domain;
 	addrparse_fn ap;
 	connecthook_fn connhook;
 } parsetab[] = {
 	{ "tcp", PF_INET, tcp_parse, tcp_connecthook },
-	{ "unix", PF_LOCAL, (addrparse_fn)notsupp, (connecthook_fn)success },
+	{ "unix", PF_LOCAL, unix_parse, (connecthook_fn)success },
 	{ "tcp6", PF_INET6, (addrparse_fn)notsupp, (connecthook_fn)success },
 };
 #define NPARSE (sizeof(parsetab)/sizeof(parsetab[0]))
 static int
 parseurl(const char *url, struct sockaddr **sap, unsigned *idxp,
 	int allow_wildcard)
+{
 	char id[16];
 	const char *p, *p2;
 	size_t l;
 	unsigned i;
 	int error;