Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 11 Apr 2015 03:54:44 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r281401 - head/tools/regression/sockets/unix_sendtorace
Message-ID:  <201504110354.t3B3sin7044190@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ngie
Date: Sat Apr 11 03:54:43 2015
New Revision: 281401
URL: https://svnweb.freebsd.org/changeset/base/281401

Log:
  - Garbage collect argc/argv
  - Use random paths instead of one in /tmp
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/regression/sockets/unix_sendtorace/Makefile
  head/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c

Modified: head/tools/regression/sockets/unix_sendtorace/Makefile
==============================================================================
--- head/tools/regression/sockets/unix_sendtorace/Makefile	Sat Apr 11 03:43:43 2015	(r281400)
+++ head/tools/regression/sockets/unix_sendtorace/Makefile	Sat Apr 11 03:54:43 2015	(r281401)
@@ -2,6 +2,6 @@
 
 PROG=	unix_sendtorace
 MAN=
-WARNS?=	3
+WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: head/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
==============================================================================
--- head/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c	Sat Apr 11 03:43:43 2015	(r281400)
+++ head/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c	Sat Apr 11 03:54:43 2015	(r281401)
@@ -45,9 +45,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#define	PATH		"/tmp/123"
 #define	ITERATIONS	1000000
 
+static char socket_path[] = "tmp.XXXXXX";
+
 static void
 stream_server(int listenfd)
 {
@@ -75,7 +76,7 @@ stream_client(void)
 	bzero(&sun, sizeof(sun));
 	sun.sun_len = sizeof(sun);
 	sun.sun_family = AF_UNIX;
-	strcpy(sun.sun_path, PATH);
+	strcpy(sun.sun_path, socket_path);
 	for (i = 0; i < ITERATIONS; i++) {
 		fd = socket(PF_UNIX, SOCK_STREAM, 0);
 		if (fd < 0) {
@@ -104,7 +105,7 @@ stream_test(void)
 	bzero(&sun, sizeof(sun));
 	sun.sun_len = sizeof(sun);
 	sun.sun_family = AF_UNIX;
-	strcpy(sun.sun_path, PATH);
+	strcpy(sun.sun_path, socket_path);
 
 	if (bind(listenfd, (struct sockaddr *)&sun, sizeof(sun)) < 0)
 		err(-1, "stream_test: bind");
@@ -124,7 +125,7 @@ stream_test(void)
 	} else
 		stream_server(listenfd);
 
-	(void)unlink(PATH);
+	(void)unlink(socket_path);
 }
 
 static void
@@ -151,7 +152,7 @@ datagram_client(void)
 	bzero(&sun, sizeof(sun));
 	sun.sun_len = sizeof(sun);
 	sun.sun_family = AF_UNIX;
-	strcpy(sun.sun_path, PATH);
+	strcpy(sun.sun_path, socket_path);
 	for (i = 0; i < ITERATIONS; i++) {
 		fd = socket(PF_UNIX, SOCK_DGRAM, 0);
 		if (fd < 0) {
@@ -180,7 +181,7 @@ datagram_test(void)
 	bzero(&sun, sizeof(sun));
 	sun.sun_len = sizeof(sun);
 	sun.sun_family = AF_UNIX;
-	strcpy(sun.sun_path, PATH);
+	strcpy(sun.sun_path, socket_path);
 
 	if (bind(serverfd, (struct sockaddr *)&sun, sizeof(sun)) < 0)
 		err(-1, "datagram_test: bind");
@@ -197,14 +198,16 @@ datagram_test(void)
 	} else
 		datagram_server(serverfd);
 
-	(void)unlink(PATH);
+	(void)unlink(socket_path);
 }
 
 int
-main(int argc, char *argv[])
+main(void)
 {
-
-	(void)unlink(PATH);
+	
+	if (mkstemp(socket_path) == -1)
+		err(1, "mkstemp failed");
+	(void)unlink(socket_path);
 	datagram_test();
 	if (0)
 		stream_test();

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504110354.t3B3sin7044190>