From 6df40cb6eea9a4220d61c4c927ce5a857a12a338 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 20 Mar 2018 18:38:54 -0700 Subject: fixes #301 String option handling for getopt --- tests/trantest.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tests/trantest.h') diff --git a/tests/trantest.h b/tests/trantest.h index feb34be8..cbed58f3 100644 --- a/tests/trantest.h +++ b/tests/trantest.h @@ -281,8 +281,7 @@ trantest_send_recv(trantest *tt) nng_msg * recv; size_t len; nng_pipe p; - char url[NNG_MAXADDRLEN]; - size_t sz; + char * url; So(trantest_listen(tt, &l) == 0); So(l != 0); @@ -314,9 +313,9 @@ trantest_send_recv(trantest *tt) So(strcmp(nng_msg_body(recv), "acknowledge") == 0); p = nng_msg_get_pipe(recv); So(p != 0); - sz = sizeof(url); - So(nng_pipe_getopt(p, NNG_OPT_URL, url, &sz) == 0); + So(nng_pipe_getopt_string(p, NNG_OPT_URL, &url) == 0); So(strcmp(url, tt->addr) == 0); + nng_strfree(url); nng_msg_free(recv); }); } @@ -330,8 +329,7 @@ trantest_send_recv_multi(trantest *tt) nng_msg * send; nng_msg * recv; nng_pipe p; - char url[NNG_MAXADDRLEN]; - size_t sz; + char * url; int i; char msgbuf[16]; @@ -369,9 +367,9 @@ trantest_send_recv_multi(trantest *tt) So(strcmp(nng_msg_body(recv), msgbuf) == 0); p = nng_msg_get_pipe(recv); So(p != 0); - sz = sizeof(url); - So(nng_pipe_getopt(p, NNG_OPT_URL, url, &sz) == 0); + So(nng_pipe_getopt_string(p, NNG_OPT_URL, &url) == 0); So(strcmp(url, tt->addr) == 0); + nng_strfree(url); nng_msg_free(recv); } }); -- cgit v1.2.3-70-g09d2