Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177751891
D61752.1795200557.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None
D61752.1795200557.diff
View Options
diff --git a/tests/sys/kern/ssl_sendfile.c b/tests/sys/kern/ssl_sendfile.c
--- a/tests/sys/kern/ssl_sendfile.c
+++ b/tests/sys/kern/ssl_sendfile.c
@@ -60,6 +60,7 @@
off_t offset; /* SSL_sendfile offset */
size_t size; /* SSL_sendfile size */
bool nb; /* SSL_sendfile mode */
+ int sbsize; /* socket buffer size, 0 for default */
ossl_ssize_t sbytes; /* SSL_sendfile returned sbytes */
enum {
INIT,
@@ -74,7 +75,7 @@
static void *server_thread(void *arg);
static void
-common_init(struct ctx *c)
+common_init(struct ctx *c, int sbsize)
{
char hostname[sizeof("localhost:65536")];
char tempname[] = "/tmp/ssl_sendfile_test.XXXXXXXXXX";
@@ -93,6 +94,7 @@
atf_tc_skip("kern.ipc.tls.enable is off");
c->state = INIT;
+ c->sbsize = sbsize;
/*
* Generate self signed key & certificate.
@@ -152,6 +154,9 @@
ssl = c->cln = SSL_new(c->ctx);
ATF_REQUIRE(c->cln != NULL);
ATF_REQUIRE((c->cs = socket(AF_INET, SOCK_STREAM, 0)) > 0);
+ if (c->sbsize != 0)
+ ATF_REQUIRE(setsockopt(c->cs, SOL_SOCKET, SO_RCVBUF,
+ &c->sbsize, sizeof(int)) == 0);
ATF_REQUIRE(connect(c->cs, (struct sockaddr *)&(struct sockaddr_in)
{ .sin_family = AF_INET, .sin_len = sizeof(struct sockaddr_in),
.sin_addr.s_addr = htonl(INADDR_LOOPBACK), .sin_port = c->port },
@@ -207,6 +212,9 @@
ATF_REQUIRE((s = socket(AF_INET, SOCK_STREAM, 0)) > 0);
ATF_REQUIRE(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &(socklen_t){1},
sizeof(int)) == 0);
+ if (c->sbsize != 0)
+ ATF_REQUIRE(setsockopt(s, SOL_SOCKET, SO_SNDBUF, &c->sbsize,
+ sizeof(int)) == 0);
ATF_REQUIRE(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0);
ATF_REQUIRE(getsockname(s, (struct sockaddr *)&sin,
&(socklen_t){ sizeof(sin) }) == 0);
@@ -308,7 +316,7 @@
size_t nread;
int n;
- common_init(&c);
+ common_init(&c, 0);
sendme(&c, 0, 0, false);
nread = 0;
@@ -328,7 +336,7 @@
struct ctx c;
#define RSIZE (256*1024)
- common_init(&c);
+ common_init(&c, 0);
for (u_int i = 0; i < 10; i++) {
char buf[RSIZE];
@@ -373,12 +381,7 @@
int n;
#define TRUNC (FSIZE - 1024)
- common_init(&c);
-
- ATF_REQUIRE(setsockopt(c.ss, SOL_SOCKET, SO_SNDBUF, &(int){FSIZE / 16},
- sizeof(int)) == 0);
- ATF_REQUIRE(setsockopt(c.cs, SOL_SOCKET, SO_RCVBUF, &(int){FSIZE / 16},
- sizeof(int)) == 0);
+ common_init(&c, FSIZE / 16);
sendme(&c, 0, 0, false);
/* Make sure sender is waiting on the socket buffer. */
@@ -417,12 +420,7 @@
int n;
#define GROW (FSIZE/2)
- common_init(&c);
-
- ATF_REQUIRE(setsockopt(c.ss, SOL_SOCKET, SO_SNDBUF, &(int){FSIZE / 16},
- sizeof(int)) == 0);
- ATF_REQUIRE(setsockopt(c.cs, SOL_SOCKET, SO_RCVBUF, &(int){FSIZE / 16},
- sizeof(int)) == 0);
+ common_init(&c, FSIZE / 16);
sendme(&c, 0, 0, false);
/* Make sure sender is waiting on the socket buffer. */
@@ -460,7 +458,7 @@
{
struct ctx c;
- common_init(&c);
+ common_init(&c, 0);
c.sbytes = -1;
sendme(&c, FSIZE + 1, 0, false);
@@ -485,7 +483,7 @@
ssize_t nread, offset = 0;
int n;
- common_init(&c);
+ common_init(&c, 0);
/*
* Exercise short write due to no buffer space on non-blocking
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 20, 6:49 PM (22 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41868415
Default Alt Text
D61752.1795200557.diff (3 KB)
Attached To
Mode
D61752: tests/sys/kern/ssl_sendfile: size socket buffers before connecting
Attached
Detach File
Event Timeline