Page MenuHomeFreeBSD

D40859.id124181.diff
No OneTemporary

D40859.id124181.diff

diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c
--- a/tests/sys/netinet/socket_afinet.c
+++ b/tests/sys/netinet/socket_afinet.c
@@ -82,7 +82,7 @@
bzero(&sin, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_len = sizeof(sin);
- sin.sin_port = htons(6666);
+ sin.sin_port = htons(0);
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
rc = bind(sd, (struct sockaddr *)&sin, sizeof(sin));
ATF_CHECK_EQ(0, rc);
@@ -95,6 +95,7 @@
{
int ss, ss2, cs, rc;
struct sockaddr_in sin;
+ socklen_t slen;
struct pollfd pfd;
int one = 1;
@@ -108,12 +109,15 @@
bzero(&sin, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_len = sizeof(sin);
- sin.sin_port = htons(6666);
+ sin.sin_port = htons(0);
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
rc = bind(ss, (struct sockaddr *)&sin, sizeof(sin));
ATF_CHECK_EQ(0, rc);
rc = listen(ss, 1);
ATF_CHECK_EQ(0, rc);
+ slen = sizeof(sin);
+ rc = getsockname(ss, (struct sockaddr *)&sin, &slen);
+ ATF_CHECK_EQ(0, rc);
/* Client connects, server accepts. */
cs = socket(PF_INET, SOCK_STREAM, 0);
@@ -154,6 +158,7 @@
{
int ss, ss2, cs, rc;
struct sockaddr_in sin;
+ socklen_t slen;
struct pollfd pfd;
char buffer;
int one = 1;
@@ -168,12 +173,15 @@
bzero(&sin, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_len = sizeof(sin);
- sin.sin_port = htons(6666);
+ sin.sin_port = htons(0);
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
rc = bind(ss, (struct sockaddr *)&sin, sizeof(sin));
ATF_CHECK_EQ(0, rc);
rc = listen(ss, 1);
ATF_CHECK_EQ(0, rc);
+ slen = sizeof(sin);
+ rc = getsockname(ss, (struct sockaddr *)&sin, &slen);
+ ATF_CHECK_EQ(0, rc);
/* Client connects, server accepts. */
cs = socket(PF_INET, SOCK_STREAM, 0);
@@ -232,6 +240,7 @@
ATF_TC_BODY(socket_afinet_stream_reconnect, tc)
{
struct sockaddr_in sin;
+ socklen_t slen;
int ss, cs, rc;
/*
@@ -245,12 +254,15 @@
bzero(&sin, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_len = sizeof(sin);
- sin.sin_port = htons(6666);
+ sin.sin_port = htons(0);
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
rc = bind(ss, (struct sockaddr *)&sin, sizeof(sin));
ATF_CHECK_EQ(0, rc);
rc = listen(ss, 1);
ATF_CHECK_EQ(0, rc);
+ slen = sizeof(sin);
+ rc = getsockname(ss, (struct sockaddr *)&sin, &slen);
+ ATF_CHECK_EQ(0, rc);
/* Client connects, shuts down. */
cs = socket(PF_INET, SOCK_STREAM, 0);

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 11:37 AM (21 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31975249
Default Alt Text
D40859.id124181.diff (2 KB)

Event Timeline