Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 6 Jan 2016 20:29:15 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r293272 - in stable/10: tests/sys/kern tools/regression/sockets/unix_passfd
Message-ID:  <201601062029.u06KTFfj091469@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ngie
Date: Wed Jan  6 20:29:15 2016
New Revision: 293272
URL: https://svnweb.freebsd.org/changeset/base/293272

Log:
  MFC r292914,r292957:
  
  r292914:
  
  Integrate tools/regression/sockets/unix_passfd into the FreeBSD test
  suite as tests/sys/kern/unix_passfd_test
  
  - Convert testcases to ATF
  - Fix an alignment issues
  - Mark rights_creds_payload(..) as an expected failure (see PR # 181741)
  
  https://reviews.freebsd.org/D689
  
  Submitted by: markj
  
  r292957:
  
  Rename `recvfd` and `sendfd` variables in recvfd/sendfd functions to avoid
  -Wshadow issues with gcc

Added:
  stable/10/tests/sys/kern/unix_passfd_test.c
     - copied, changed from r292914, head/tests/sys/kern/unix_passfd_test.c
Deleted:
  stable/10/tools/regression/sockets/unix_passfd/
Modified:
  stable/10/tests/sys/kern/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tests/sys/kern/Makefile
==============================================================================
--- stable/10/tests/sys/kern/Makefile	Wed Jan  6 20:28:09 2016	(r293271)
+++ stable/10/tests/sys/kern/Makefile	Wed Jan  6 20:29:15 2016	(r293272)
@@ -9,6 +9,7 @@ TESTSDIR=	${TESTSBASE}/sys/kern
 ATF_TESTS_C+=	kern_descrip_test
 ATF_TESTS_C+=	ptrace_test
 ATF_TESTS_C+=	unix_seqpacket_test
+ATF_TESTS_C+=	unix_passfd_test
 TEST_METADATA.unix_seqpacket_test+=	timeout="15"
 
 LDADD.ptrace_test+=			-lpthread

Copied and modified: stable/10/tests/sys/kern/unix_passfd_test.c (from r292914, head/tests/sys/kern/unix_passfd_test.c)
==============================================================================
--- head/tests/sys/kern/unix_passfd_test.c	Wed Dec 30 11:15:07 2015	(r292914, copy source)
+++ stable/10/tests/sys/kern/unix_passfd_test.c	Wed Jan  6 20:29:15 2016	(r293272)
@@ -109,7 +109,7 @@ samefile(struct stat *sb1, struct stat *
 }
 
 static void
-sendfd_payload(int sockfd, int sendfd, void *payload, size_t paylen)
+sendfd_payload(int sockfd, int send_fd, void *payload, size_t paylen)
 {
 	struct iovec iovec;
 	char message[CMSG_SPACE(sizeof(int))];
@@ -133,7 +133,7 @@ sendfd_payload(int sockfd, int sendfd, v
 	cmsghdr->cmsg_len = CMSG_LEN(sizeof(int));
 	cmsghdr->cmsg_level = SOL_SOCKET;
 	cmsghdr->cmsg_type = SCM_RIGHTS;
-	memcpy(CMSG_DATA(cmsghdr), &sendfd, sizeof(int));
+	memcpy(CMSG_DATA(cmsghdr), &send_fd, sizeof(int));
 
 	len = sendmsg(sockfd, &msghdr, 0);
 	ATF_REQUIRE_MSG(len != -1, "sendmsg failed: %s", strerror(errno));
@@ -143,15 +143,15 @@ sendfd_payload(int sockfd, int sendfd, v
 }
 
 static void
-sendfd(int sockfd, int sendfd)
+sendfd(int sockfd, int send_fd)
 {
 	char ch = 0;
 
-	return (sendfd_payload(sockfd, sendfd, &ch, sizeof(ch)));
+	return (sendfd_payload(sockfd, send_fd, &ch, sizeof(ch)));
 }
 
 static void
-recvfd_payload(int sockfd, int *recvfd, void *buf, size_t buflen)
+recvfd_payload(int sockfd, int *recv_fd, void *buf, size_t buflen)
 {
 	struct cmsghdr *cmsghdr;
 	char message[CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX)) + sizeof(int)];
@@ -178,25 +178,25 @@ recvfd_payload(int sockfd, int *recvfd, 
 	cmsghdr = CMSG_FIRSTHDR(&msghdr);
 	ATF_REQUIRE_MSG(cmsghdr != NULL,
 	    "recvmsg: did not receive control message");
-	*recvfd = -1;
+	*recv_fd = -1;
 	for (; cmsghdr != NULL; cmsghdr = CMSG_NXTHDR(&msghdr, cmsghdr)) {
 		if (cmsghdr->cmsg_level == SOL_SOCKET &&
 		    cmsghdr->cmsg_type == SCM_RIGHTS &&
 		    cmsghdr->cmsg_len == CMSG_LEN(sizeof(int))) {
-			memcpy(recvfd, CMSG_DATA(cmsghdr), sizeof(int));
-			ATF_REQUIRE(*recvfd != -1);
+			memcpy(recv_fd, CMSG_DATA(cmsghdr), sizeof(int));
+			ATF_REQUIRE(*recv_fd != -1);
 		}
 	}
-	ATF_REQUIRE_MSG(*recvfd != -1,
+	ATF_REQUIRE_MSG(*recv_fd != -1,
 	    "recvmsg: did not receive single-fd message");
 }
 
 static void
-recvfd(int sockfd, int *recvfd)
+recvfd(int sockfd, int *recv_fd)
 {
 	char ch = 0;
 
-	return (recvfd_payload(sockfd, recvfd, &ch, sizeof(ch)));
+	return (recvfd_payload(sockfd, recv_fd, &ch, sizeof(ch)));
 }
 
 /*

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