Fix failures in isc netmgr_test on big endian machines

Typing from libuv structure to isc_region_t is not possible, because
their sizes differ on 64 bit architectures. Little endian machines seems
to be lucky and still result in test passed. But big endian machine such
as s390x fails the test reliably.

Fix by directly creating the buffer as isc_region_t and skipping the
type conversion. More readable and still more correct.

(cherry picked from commit 057438cb45f2f02615dc309e3822f23c0ca70a0a)

diff --git a/lib/isc/tests/netmgr_test.c b/lib/isc/tests/netmgr_test.c
index 1acaca5e903ab61c5110161277900bb201957588..19145c45e0f44ee651be5f8202f0234c329e03ef 100644 (file)
--- a/lib/isc/tests/netmgr_test.c
+++ b/lib/isc/tests/netmgr_test.c
@@ -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;
        }