upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '2801-unittest-isc-netmgr-s390x-v9_18' into 'v9_18'

Browse source 
Fix failures in isc netmgr_test on big endian machines

See merge request isc-projects/bind9!6353
This commit is contained in:
Ondřej Surý 2022-05-24 18:28:09 +00:00
commit 5e9c9e3539
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/isc/tests/netmgr_test.c
View file

@ -63,11 +63,11 @@ static isc_tlsctx_t *tcp_connect_tlsctx = NULL;
static uint64_t send_magic = 0;
static uint64_t stop_magic = 0;
static uv_buf_t send_msg = { .base = (char *)&send_magic,
.len = sizeof(send_magic) };
static isc_region_t send_msg = { .base = (unsigned char *)&send_magic,
.length = sizeof(send_magic) };
static uv_buf_t stop_msg = { .base = (char *)&stop_magic,
.len = sizeof(stop_magic) };
static isc_region_t stop_msg = { .base = (unsigned char *)&stop_magic,
.length = sizeof(stop_magic) };
static atomic_bool do_send = false;
static unsigned int workers = 0;
@ -436,11 +436,9 @@ connect_send(isc_nmhandle_t *handle) {
isc_nmhandle_attach(handle, &sendhandle);
isc_nmhandle_setwritetimeout(handle, T_IDLE);
if (atomic_fetch_sub(&nsends, 1) > 1) {
isc_nm_send(sendhandle, (isc_region_t *)&send_msg,
connect_send_cb, NULL);
isc_nm_send(sendhandle, &send_msg, connect_send_cb, NULL);
} else {
isc_nm_send(sendhandle, (isc_region_t *)&stop_msg,
connect_send_cb, NULL);
isc_nm_send(sendhandle, &stop_msg, connect_send_cb, NULL);
}
}
@ -547,8 +545,8 @@ listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
isc_nmhandle_attach(handle, &sendhandle);
isc_refcount_increment0(&active_ssends);
isc_nmhandle_setwritetimeout(sendhandle, T_IDLE);
isc_nm_send(sendhandle, (isc_region_t *)&send_msg,
listen_send_cb, cbarg);
isc_nm_send(sendhandle, &send_msg, listen_send_cb,
cbarg);
}
return;
}