Merge branch '46-just-use-clang-format-to-reformat-sources' into 'master'
Reformat source code with clang-format Closes #46 See merge request isc-projects/bind9!2156 (cherry picked from commit7099e79a9b)4c3b063eImport Linux kernel .clang-format with small modificationsf50b1e06Use clang-format to reformat the source files11341c76Update the definition files for Windowsdf6c1f76Remove tkey_test (which is no-op anyway)
This commit is contained in:
@@ -12,12 +12,11 @@
|
||||
/*! \file */
|
||||
|
||||
#if HAVE_CMOCKA
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
#include <setjmp.h>
|
||||
|
||||
#include <sched.h> /* IWYU pragma: keep */
|
||||
#include <setjmp.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
@@ -27,23 +26,24 @@
|
||||
|
||||
#include <isc/atomic.h>
|
||||
#include <isc/platform.h>
|
||||
#include <isc/print.h>
|
||||
#include <isc/socket.h>
|
||||
#include <isc/task.h>
|
||||
#include <isc/print.h>
|
||||
|
||||
#include "../unix/socket_p.h"
|
||||
#include "isctest.h"
|
||||
|
||||
static bool recv_dscp;
|
||||
static bool recv_dscp;
|
||||
static unsigned int recv_dscp_value;
|
||||
static bool recv_trunc;
|
||||
static bool recv_trunc;
|
||||
|
||||
/*
|
||||
* Helper functions
|
||||
*/
|
||||
|
||||
static int
|
||||
_setup(void **state) {
|
||||
_setup(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
|
||||
UNUSED(state);
|
||||
@@ -55,7 +55,8 @@ _setup(void **state) {
|
||||
}
|
||||
|
||||
static int
|
||||
_teardown(void **state) {
|
||||
_teardown(void **state)
|
||||
{
|
||||
UNUSED(state);
|
||||
|
||||
isc_test_end();
|
||||
@@ -64,21 +65,23 @@ _teardown(void **state) {
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
atomic_bool done;
|
||||
isc_result_t result;
|
||||
atomic_bool done;
|
||||
isc_result_t result;
|
||||
isc_socket_t *socket;
|
||||
} completion_t;
|
||||
|
||||
static void
|
||||
completion_init(completion_t *completion) {
|
||||
completion_init(completion_t *completion)
|
||||
{
|
||||
atomic_store(&completion->done, false);
|
||||
completion->socket = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
accept_done(isc_task_t *task, isc_event_t *event) {
|
||||
accept_done(isc_task_t *task, isc_event_t *event)
|
||||
{
|
||||
isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event;
|
||||
completion_t *completion = event->ev_arg;
|
||||
completion_t * completion = event->ev_arg;
|
||||
|
||||
UNUSED(task);
|
||||
|
||||
@@ -92,27 +95,29 @@ accept_done(isc_task_t *task, isc_event_t *event) {
|
||||
}
|
||||
|
||||
static void
|
||||
event_done(isc_task_t *task, isc_event_t *event) {
|
||||
isc_socketevent_t *sev = NULL;
|
||||
event_done(isc_task_t *task, isc_event_t *event)
|
||||
{
|
||||
isc_socketevent_t * sev = NULL;
|
||||
isc_socket_connev_t *connev = NULL;
|
||||
completion_t *completion = event->ev_arg;
|
||||
completion_t * completion = event->ev_arg;
|
||||
UNUSED(task);
|
||||
|
||||
switch (event->ev_type) {
|
||||
case ISC_SOCKEVENT_RECVDONE:
|
||||
case ISC_SOCKEVENT_SENDDONE:
|
||||
sev = (isc_socketevent_t *) event;
|
||||
sev = (isc_socketevent_t *)event;
|
||||
completion->result = sev->result;
|
||||
if ((sev->attributes & ISC_SOCKEVENTATTR_DSCP) != 0) {
|
||||
recv_dscp = true;
|
||||
recv_dscp_value = sev->dscp;;
|
||||
recv_dscp_value = sev->dscp;
|
||||
;
|
||||
} else {
|
||||
recv_dscp = false;
|
||||
}
|
||||
recv_trunc = ((sev->attributes & ISC_SOCKEVENTATTR_TRUNC) != 0);
|
||||
break;
|
||||
case ISC_SOCKEVENT_CONNECT:
|
||||
connev = (isc_socket_connev_t *) event;
|
||||
connev = (isc_socket_connev_t *)event;
|
||||
completion->result = connev->result;
|
||||
break;
|
||||
default:
|
||||
@@ -123,7 +128,8 @@ event_done(isc_task_t *task, isc_event_t *event) {
|
||||
}
|
||||
|
||||
static isc_result_t
|
||||
waitfor(completion_t *completion) {
|
||||
waitfor(completion_t *completion)
|
||||
{
|
||||
int i = 0;
|
||||
while (!atomic_load(&completion->done) && i++ < 5000) {
|
||||
isc_test_nap(1000);
|
||||
@@ -135,18 +141,18 @@ waitfor(completion_t *completion) {
|
||||
}
|
||||
|
||||
static void
|
||||
waitbody(void) {
|
||||
isc_test_nap(1000);
|
||||
waitbody(void)
|
||||
{
|
||||
isc_test_nap(1000);
|
||||
}
|
||||
|
||||
static isc_result_t
|
||||
waitfor2(completion_t *c1, completion_t *c2) {
|
||||
waitfor2(completion_t *c1, completion_t *c2)
|
||||
{
|
||||
int i = 0;
|
||||
|
||||
while (!(atomic_load(&c1->done) &&
|
||||
atomic_load(&c2->done)) &&
|
||||
i++ < 5000)
|
||||
{
|
||||
while (!(atomic_load(&c1->done) && atomic_load(&c2->done)) &&
|
||||
i++ < 5000) {
|
||||
waitbody();
|
||||
}
|
||||
if (atomic_load(&c1->done) && atomic_load(&c2->done)) {
|
||||
@@ -161,15 +167,16 @@ waitfor2(completion_t *c1, completion_t *c2) {
|
||||
|
||||
/* Test UDP sendto/recv (IPv4) */
|
||||
static void
|
||||
udp_sendto_test(void **state) {
|
||||
isc_result_t result;
|
||||
udp_sendto_test(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1, addr2;
|
||||
struct in_addr in;
|
||||
isc_socket_t *s1 = NULL, *s2 = NULL;
|
||||
isc_task_t *task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
isc_socket_t * s1 = NULL, *s2 = NULL;
|
||||
isc_task_t * task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -197,7 +204,7 @@ udp_sendto_test(void **state) {
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
|
||||
snprintf(sendbuf, sizeof(sendbuf), "Hello");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = strlen(sendbuf) + 1;
|
||||
|
||||
completion_init(&completion);
|
||||
@@ -208,7 +215,7 @@ udp_sendto_test(void **state) {
|
||||
assert_true(atomic_load(&completion.done));
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
result = isc_socket_recv(s2, &r, 1, task, event_done, &completion);
|
||||
@@ -222,20 +229,20 @@ udp_sendto_test(void **state) {
|
||||
|
||||
isc_socket_detach(&s1);
|
||||
isc_socket_detach(&s2);
|
||||
|
||||
}
|
||||
|
||||
/* Test UDP sendto/recv with duplicated socket */
|
||||
static void
|
||||
udp_dup_test(void **state) {
|
||||
isc_result_t result;
|
||||
udp_dup_test(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1, addr2;
|
||||
struct in_addr in;
|
||||
isc_socket_t *s1 = NULL, *s2 = NULL, *s3 = NULL;
|
||||
isc_task_t *task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
isc_socket_t * s1 = NULL, *s2 = NULL, *s3 = NULL;
|
||||
isc_task_t * task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -266,7 +273,7 @@ udp_dup_test(void **state) {
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
|
||||
snprintf(sendbuf, sizeof(sendbuf), "Hello");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = strlen(sendbuf) + 1;
|
||||
|
||||
completion_init(&completion);
|
||||
@@ -278,7 +285,7 @@ udp_dup_test(void **state) {
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
snprintf(sendbuf, sizeof(sendbuf), "World");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = strlen(sendbuf) + 1;
|
||||
|
||||
completion_init(&completion);
|
||||
@@ -289,7 +296,7 @@ udp_dup_test(void **state) {
|
||||
assert_true(atomic_load(&completion.done));
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
result = isc_socket_recv(s2, &r, 1, task, event_done, &completion);
|
||||
@@ -299,7 +306,7 @@ udp_dup_test(void **state) {
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
assert_string_equal(recvbuf, "Hello");
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
result = isc_socket_recv(s3, &r, 1, task, event_done, &completion);
|
||||
@@ -314,25 +321,24 @@ udp_dup_test(void **state) {
|
||||
isc_socket_detach(&s1);
|
||||
isc_socket_detach(&s2);
|
||||
isc_socket_detach(&s3);
|
||||
|
||||
}
|
||||
|
||||
/* Test UDP sendto/recv (IPv4) */
|
||||
static void
|
||||
udp_dscp_v4_test(void **state) {
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1, addr2;
|
||||
struct in_addr in;
|
||||
isc_socket_t *s1 = NULL, *s2 = NULL;
|
||||
isc_task_t *task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
udp_dscp_v4_test(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1, addr2;
|
||||
struct in_addr in;
|
||||
isc_socket_t * s1 = NULL, *s2 = NULL;
|
||||
isc_task_t * task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
isc_socketevent_t *socketevent;
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
|
||||
in.s_addr = inet_addr("127.0.0.1");
|
||||
isc_sockaddr_fromin(&addr1, &in, 0);
|
||||
isc_sockaddr_fromin(&addr2, &in, 0);
|
||||
@@ -357,20 +363,20 @@ udp_dscp_v4_test(void **state) {
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
|
||||
snprintf(sendbuf, sizeof(sendbuf), "Hello");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = strlen(sendbuf) + 1;
|
||||
|
||||
completion_init(&completion);
|
||||
|
||||
socketevent = isc_socket_socketevent(test_mctx, s1, ISC_SOCKEVENT_SENDDONE,
|
||||
event_done, &completion);
|
||||
socketevent = isc_socket_socketevent(
|
||||
test_mctx, s1, ISC_SOCKEVENT_SENDDONE, event_done, &completion);
|
||||
assert_non_null(socketevent);
|
||||
|
||||
if ((isc_net_probedscp() & ISC_NET_DSCPPKTV4) != 0) {
|
||||
socketevent->dscp = 056; /* EF */
|
||||
socketevent->attributes |= ISC_SOCKEVENTATTR_DSCP;
|
||||
} else if ((isc_net_probedscp() & ISC_NET_DSCPSETV4) != 0) {
|
||||
isc_socket_dscp(s1, 056); /* EF */
|
||||
isc_socket_dscp(s1, 056); /* EF */
|
||||
socketevent->dscp = 0;
|
||||
socketevent->attributes &= ~ISC_SOCKEVENTATTR_DSCP;
|
||||
}
|
||||
@@ -384,7 +390,7 @@ udp_dscp_v4_test(void **state) {
|
||||
assert_true(atomic_load(&completion.done));
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
result = isc_socket_recv(s2, &r, 1, task, event_done, &completion);
|
||||
@@ -404,33 +410,32 @@ udp_dscp_v4_test(void **state) {
|
||||
|
||||
isc_socket_detach(&s1);
|
||||
isc_socket_detach(&s2);
|
||||
|
||||
}
|
||||
|
||||
/* Test UDP sendto/recv (IPv6) */
|
||||
static void
|
||||
udp_dscp_v6_test(void **state) {
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1, addr2;
|
||||
struct in6_addr in6;
|
||||
isc_socket_t *s1 = NULL, *s2 = NULL;
|
||||
isc_task_t *task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
udp_dscp_v6_test(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1, addr2;
|
||||
struct in6_addr in6;
|
||||
isc_socket_t * s1 = NULL, *s2 = NULL;
|
||||
isc_task_t * task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
isc_socketevent_t *socketevent;
|
||||
int n;
|
||||
int n;
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
|
||||
n = inet_pton(AF_INET6, "::1", &in6.s6_addr);
|
||||
assert_true(n == 1);
|
||||
isc_sockaddr_fromin6(&addr1, &in6, 0);
|
||||
isc_sockaddr_fromin6(&addr2, &in6, 0);
|
||||
|
||||
result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_udp,
|
||||
&s1);
|
||||
result =
|
||||
isc_socket_create(socketmgr, PF_INET6, isc_sockettype_udp, &s1);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
result = isc_socket_bind(s1, &addr1, 0);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
@@ -438,8 +443,8 @@ udp_dscp_v6_test(void **state) {
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
assert_true(isc_sockaddr_getport(&addr1) != 0);
|
||||
|
||||
result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_udp,
|
||||
&s2);
|
||||
result =
|
||||
isc_socket_create(socketmgr, PF_INET6, isc_sockettype_udp, &s2);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
result = isc_socket_bind(s2, &addr2, 0);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
@@ -451,20 +456,20 @@ udp_dscp_v6_test(void **state) {
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
|
||||
snprintf(sendbuf, sizeof(sendbuf), "Hello");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = strlen(sendbuf) + 1;
|
||||
|
||||
completion_init(&completion);
|
||||
|
||||
socketevent = isc_socket_socketevent(test_mctx, s1, ISC_SOCKEVENT_SENDDONE,
|
||||
event_done, &completion);
|
||||
socketevent = isc_socket_socketevent(
|
||||
test_mctx, s1, ISC_SOCKEVENT_SENDDONE, event_done, &completion);
|
||||
assert_non_null(socketevent);
|
||||
|
||||
if ((isc_net_probedscp() & ISC_NET_DSCPPKTV6) != 0) {
|
||||
socketevent->dscp = 056; /* EF */
|
||||
socketevent->attributes = ISC_SOCKEVENTATTR_DSCP;
|
||||
} else if ((isc_net_probedscp() & ISC_NET_DSCPSETV6) != 0) {
|
||||
isc_socket_dscp(s1, 056); /* EF */
|
||||
isc_socket_dscp(s1, 056); /* EF */
|
||||
}
|
||||
|
||||
recv_dscp = false;
|
||||
@@ -476,7 +481,7 @@ udp_dscp_v6_test(void **state) {
|
||||
assert_true(atomic_load(&completion.done));
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
result = isc_socket_recv(s2, &r, 1, task, event_done, &completion);
|
||||
@@ -496,24 +501,23 @@ udp_dscp_v6_test(void **state) {
|
||||
|
||||
isc_socket_detach(&s1);
|
||||
isc_socket_detach(&s2);
|
||||
|
||||
}
|
||||
|
||||
/* Test TCP sendto/recv (IPv4) */
|
||||
static void
|
||||
tcp_dscp_v4_test(void **state) {
|
||||
isc_result_t result;
|
||||
tcp_dscp_v4_test(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1;
|
||||
struct in_addr in;
|
||||
isc_socket_t *s1 = NULL, *s2 = NULL, *s3 = NULL;
|
||||
isc_task_t *task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion, completion2;
|
||||
isc_region_t r;
|
||||
isc_socket_t * s1 = NULL, *s2 = NULL, *s3 = NULL;
|
||||
isc_task_t * task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion, completion2;
|
||||
isc_region_t r;
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
|
||||
in.s_addr = inet_addr("127.0.0.1");
|
||||
isc_sockaddr_fromin(&addr1, &in, 0);
|
||||
|
||||
@@ -549,24 +553,24 @@ tcp_dscp_v4_test(void **state) {
|
||||
assert_int_equal(completion2.result, ISC_R_SUCCESS);
|
||||
s3 = completion2.socket;
|
||||
|
||||
isc_socket_dscp(s2, 056); /* EF */
|
||||
isc_socket_dscp(s2, 056); /* EF */
|
||||
|
||||
snprintf(sendbuf, sizeof(sendbuf), "Hello");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = strlen(sendbuf) + 1;
|
||||
|
||||
recv_dscp = false;
|
||||
recv_dscp_value = 0;
|
||||
|
||||
completion_init(&completion);
|
||||
result = isc_socket_sendto(s2, &r, task, event_done, &completion,
|
||||
NULL, NULL);
|
||||
result = isc_socket_sendto(s2, &r, task, event_done, &completion, NULL,
|
||||
NULL);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
waitfor(&completion);
|
||||
assert_true(atomic_load(&completion.done));
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
result = isc_socket_recv(s3, &r, 1, task, event_done, &completion);
|
||||
@@ -589,31 +593,30 @@ tcp_dscp_v4_test(void **state) {
|
||||
isc_socket_detach(&s1);
|
||||
isc_socket_detach(&s2);
|
||||
isc_socket_detach(&s3);
|
||||
|
||||
}
|
||||
|
||||
/* Test TCP sendto/recv (IPv6) */
|
||||
static void
|
||||
tcp_dscp_v6_test(void **state) {
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1;
|
||||
tcp_dscp_v6_test(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1;
|
||||
struct in6_addr in6;
|
||||
isc_socket_t *s1 = NULL, *s2 = NULL, *s3 = NULL;
|
||||
isc_task_t *task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion, completion2;
|
||||
isc_region_t r;
|
||||
int n;
|
||||
isc_socket_t * s1 = NULL, *s2 = NULL, *s3 = NULL;
|
||||
isc_task_t * task = NULL;
|
||||
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
|
||||
completion_t completion, completion2;
|
||||
isc_region_t r;
|
||||
int n;
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
|
||||
n = inet_pton(AF_INET6, "::1", &in6.s6_addr);
|
||||
assert_true(n == 1);
|
||||
isc_sockaddr_fromin6(&addr1, &in6, 0);
|
||||
|
||||
result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp,
|
||||
&s1);
|
||||
result =
|
||||
isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp, &s1);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
|
||||
result = isc_socket_bind(s1, &addr1, 0);
|
||||
@@ -625,8 +628,8 @@ tcp_dscp_v6_test(void **state) {
|
||||
result = isc_socket_listen(s1, 3);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
|
||||
result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp,
|
||||
&s2);
|
||||
result =
|
||||
isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp, &s2);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
|
||||
result = isc_task_create(taskmgr, 0, &task);
|
||||
@@ -646,24 +649,24 @@ tcp_dscp_v6_test(void **state) {
|
||||
assert_int_equal(completion2.result, ISC_R_SUCCESS);
|
||||
s3 = completion2.socket;
|
||||
|
||||
isc_socket_dscp(s2, 056); /* EF */
|
||||
isc_socket_dscp(s2, 056); /* EF */
|
||||
|
||||
snprintf(sendbuf, sizeof(sendbuf), "Hello");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = strlen(sendbuf) + 1;
|
||||
|
||||
recv_dscp = false;
|
||||
recv_dscp_value = 0;
|
||||
|
||||
completion_init(&completion);
|
||||
result = isc_socket_sendto(s2, &r, task, event_done, &completion,
|
||||
NULL, NULL);
|
||||
result = isc_socket_sendto(s2, &r, task, event_done, &completion, NULL,
|
||||
NULL);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
waitfor(&completion);
|
||||
assert_true(atomic_load(&completion.done));
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
result = isc_socket_recv(s3, &r, 1, task, event_done, &completion);
|
||||
@@ -690,12 +693,12 @@ tcp_dscp_v6_test(void **state) {
|
||||
isc_socket_detach(&s1);
|
||||
isc_socket_detach(&s2);
|
||||
isc_socket_detach(&s3);
|
||||
|
||||
}
|
||||
|
||||
/* probe dscp capabilities */
|
||||
static void
|
||||
net_probedscp_test(void **state) {
|
||||
net_probedscp_test(void **state)
|
||||
{
|
||||
unsigned int n;
|
||||
|
||||
UNUSED(state);
|
||||
@@ -704,12 +707,12 @@ net_probedscp_test(void **state) {
|
||||
assert_true((n & ~ISC_NET_DSCPALL) == 0);
|
||||
|
||||
/* ISC_NET_DSCPSETV4 MUST be set if any is set. */
|
||||
if (n & (ISC_NET_DSCPPKTV4|ISC_NET_DSCPRECVV4)) {
|
||||
if (n & (ISC_NET_DSCPPKTV4 | ISC_NET_DSCPRECVV4)) {
|
||||
assert_true((n & ISC_NET_DSCPSETV4) != 0);
|
||||
}
|
||||
|
||||
/* ISC_NET_DSCPSETV6 MUST be set if any is set. */
|
||||
if (n & (ISC_NET_DSCPPKTV6|ISC_NET_DSCPRECVV6)) {
|
||||
if (n & (ISC_NET_DSCPPKTV6 | ISC_NET_DSCPRECVV6)) {
|
||||
assert_true((n & ISC_NET_DSCPSETV6) != 0);
|
||||
}
|
||||
|
||||
@@ -728,15 +731,16 @@ net_probedscp_test(void **state) {
|
||||
|
||||
/* Test UDP truncation detection */
|
||||
static void
|
||||
udp_trunc_test(void **state) {
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1, addr2;
|
||||
struct in_addr in;
|
||||
isc_socket_t *s1 = NULL, *s2 = NULL;
|
||||
isc_task_t *task = NULL;
|
||||
char sendbuf[BUFSIZ*2], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
udp_trunc_test(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
isc_sockaddr_t addr1, addr2;
|
||||
struct in_addr in;
|
||||
isc_socket_t * s1 = NULL, *s2 = NULL;
|
||||
isc_task_t * task = NULL;
|
||||
char sendbuf[BUFSIZ * 2], recvbuf[BUFSIZ];
|
||||
completion_t completion;
|
||||
isc_region_t r;
|
||||
isc_socketevent_t *socketevent;
|
||||
|
||||
UNUSED(state);
|
||||
@@ -768,13 +772,13 @@ udp_trunc_test(void **state) {
|
||||
*/
|
||||
memset(sendbuf, 0xff, sizeof(sendbuf));
|
||||
snprintf(sendbuf, sizeof(sendbuf), "Hello");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = strlen(sendbuf) + 1;
|
||||
|
||||
completion_init(&completion);
|
||||
|
||||
socketevent = isc_socket_socketevent(test_mctx, s1, ISC_SOCKEVENT_SENDDONE,
|
||||
event_done, &completion);
|
||||
socketevent = isc_socket_socketevent(
|
||||
test_mctx, s1, ISC_SOCKEVENT_SENDDONE, event_done, &completion);
|
||||
assert_non_null(socketevent);
|
||||
|
||||
result = isc_socket_sendto2(s1, &r, task, &addr2, NULL, socketevent, 0);
|
||||
@@ -783,7 +787,7 @@ udp_trunc_test(void **state) {
|
||||
assert_true(atomic_load(&completion.done));
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
recv_trunc = false;
|
||||
@@ -800,13 +804,13 @@ udp_trunc_test(void **state) {
|
||||
*/
|
||||
memset(sendbuf, 0xff, sizeof(sendbuf));
|
||||
snprintf(sendbuf, sizeof(sendbuf), "Hello");
|
||||
r.base = (void *) sendbuf;
|
||||
r.base = (void *)sendbuf;
|
||||
r.length = sizeof(sendbuf);
|
||||
|
||||
completion_init(&completion);
|
||||
|
||||
socketevent = isc_socket_socketevent(test_mctx, s1, ISC_SOCKEVENT_SENDDONE,
|
||||
event_done, &completion);
|
||||
socketevent = isc_socket_socketevent(
|
||||
test_mctx, s1, ISC_SOCKEVENT_SENDDONE, event_done, &completion);
|
||||
assert_non_null(socketevent);
|
||||
|
||||
result = isc_socket_sendto2(s1, &r, task, &addr2, NULL, socketevent, 0);
|
||||
@@ -815,7 +819,7 @@ udp_trunc_test(void **state) {
|
||||
assert_true(atomic_load(&completion.done));
|
||||
assert_int_equal(completion.result, ISC_R_SUCCESS);
|
||||
|
||||
r.base = (void *) recvbuf;
|
||||
r.base = (void *)recvbuf;
|
||||
r.length = BUFSIZ;
|
||||
completion_init(&completion);
|
||||
recv_trunc = false;
|
||||
@@ -831,31 +835,31 @@ udp_trunc_test(void **state) {
|
||||
|
||||
isc_socket_detach(&s1);
|
||||
isc_socket_detach(&s2);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* Main
|
||||
*/
|
||||
int
|
||||
main(void) {
|
||||
main(void)
|
||||
{
|
||||
const struct CMUnitTest tests[] = {
|
||||
cmocka_unit_test_setup_teardown(udp_sendto_test,
|
||||
_setup, _teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_dup_test,
|
||||
_setup, _teardown),
|
||||
cmocka_unit_test_setup_teardown(tcp_dscp_v4_test,
|
||||
_setup, _teardown),
|
||||
cmocka_unit_test_setup_teardown(tcp_dscp_v6_test,
|
||||
_setup, _teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_dscp_v4_test,
|
||||
_setup, _teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_dscp_v6_test,
|
||||
_setup, _teardown),
|
||||
cmocka_unit_test_setup_teardown(net_probedscp_test,
|
||||
_setup, _teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_trunc_test,
|
||||
_setup, _teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_sendto_test, _setup,
|
||||
_teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_dup_test, _setup,
|
||||
_teardown),
|
||||
cmocka_unit_test_setup_teardown(tcp_dscp_v4_test, _setup,
|
||||
_teardown),
|
||||
cmocka_unit_test_setup_teardown(tcp_dscp_v6_test, _setup,
|
||||
_teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_dscp_v4_test, _setup,
|
||||
_teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_dscp_v6_test, _setup,
|
||||
_teardown),
|
||||
cmocka_unit_test_setup_teardown(net_probedscp_test, _setup,
|
||||
_teardown),
|
||||
cmocka_unit_test_setup_teardown(udp_trunc_test, _setup,
|
||||
_teardown),
|
||||
};
|
||||
|
||||
return (cmocka_run_group_tests(tests, NULL, NULL));
|
||||
@@ -866,10 +870,10 @@ main(void) {
|
||||
#include <stdio.h>
|
||||
|
||||
int
|
||||
main(void) {
|
||||
main(void)
|
||||
{
|
||||
printf("1..0 # Skipped: cmocka not available\n");
|
||||
return (0);
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user