diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-03-18 12:46:31 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-03-18 12:46:31 -0700 |
| commit | 8b979454d891b84da727a329906c4293fadc5f3c (patch) | |
| tree | cb491c476080de11c7fc5b5868579f4ef86f4df4 /tests/pair1.c | |
| parent | 3a2af394a7d94ac5f924aaea6cbad825a9b05d75 (diff) | |
| download | nng-8b979454d891b84da727a329906c4293fadc5f3c.tar.gz nng-8b979454d891b84da727a329906c4293fadc5f3c.tar.bz2 nng-8b979454d891b84da727a329906c4293fadc5f3c.zip | |
fixes #295 boolean options should use C99 bool type
fixes #275 nng_pipe_getopt_ptr() missing?
fixes #285 nng_setopt_ptr MIS
fixes #297 nng_listener/dialer_close does not validate mode
This change adds some missing APIs, and changes others.
In particular, certain options are now of type bool, with size
of just one. This is a *breaking* change for code that uses those
options -- NNG_OPT_RAW, NNG_OPT_PAIR1_POLY, NNG_OPT_TLS_VERIFIED.
Diffstat (limited to 'tests/pair1.c')
| -rw-r--r-- | tests/pair1.c | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/tests/pair1.c b/tests/pair1.c index cd3a1035..bff6a44b 100644 --- a/tests/pair1.c +++ b/tests/pair1.c @@ -105,8 +105,10 @@ TestMain("PAIRv1 protocol", { So(nng_dial(c1, addr, NULL, 0) == 0); nng_msleep(100); - So(nng_setopt_int(s1, NNG_OPT_RAW, 1) == NNG_ESTATE); - So(nng_setopt_int(c1, NNG_OPT_RAW, 1) == NNG_ESTATE); + So(nng_setopt_bool(s1, NNG_OPT_RAW, true) == + NNG_ESTATE); + So(nng_setopt_bool(c1, NNG_OPT_RAW, false) == + NNG_ESTATE); }); Convey("Polyamorous mode is best effort", { @@ -115,7 +117,7 @@ TestMain("PAIRv1 protocol", { nng_msg * msg; nng_duration to = MILLISECOND(100); - So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == 0); + So(nng_setopt_bool(s1, NNG_OPT_PAIR1_POLY, true) == 0); So(nng_setopt_int(s1, NNG_OPT_RECVBUF, 1) == 0); So(nng_setopt_int(s1, NNG_OPT_SENDBUF, 1) == 0); @@ -170,7 +172,7 @@ TestMain("PAIRv1 protocol", { So(nng_dial(c1, addr, NULL, 0) == 0); nng_msleep(100); - So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == + So(nng_setopt_bool(s1, NNG_OPT_PAIR1_POLY, true) == NNG_ESTATE); }); @@ -178,9 +180,9 @@ TestMain("PAIRv1 protocol", { nng_msg *msg; uint32_t hops; - So(nng_setopt_int(s1, NNG_OPT_RAW, 1) == 0); - So(nng_setopt_int(c1, NNG_OPT_RAW, 1) == 0); - So(nng_setopt_int(c2, NNG_OPT_RAW, 1) == 0); + So(nng_setopt_bool(s1, NNG_OPT_RAW, true) == 0); + So(nng_setopt_bool(c1, NNG_OPT_RAW, true) == 0); + So(nng_setopt_bool(c2, NNG_OPT_RAW, true) == 0); So(nng_listen(s1, addr, NULL, 0) == 0); So(nng_dial(c1, addr, NULL, 0) == 0); @@ -336,16 +338,16 @@ TestMain("PAIRv1 protocol", { Convey("Polyamorous cooked mode works", { nng_msg *msg; - int v; + bool v; nng_pipe p1; nng_pipe p2; - So(nng_getopt_int(s1, NNG_OPT_PAIR1_POLY, &v) == 0); - So(v == 0); + So(nng_getopt_bool(s1, NNG_OPT_PAIR1_POLY, &v) == 0); + So(v == false); - So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == 0); - So(nng_getopt_int(s1, NNG_OPT_PAIR1_POLY, &v) == 0); - So(v == 1); + So(nng_setopt_bool(s1, NNG_OPT_PAIR1_POLY, true) == 0); + So(nng_getopt_bool(s1, NNG_OPT_PAIR1_POLY, &v) == 0); + So(v == true); So(nng_listen(s1, addr, NULL, 0) == 0); So(nng_dial(c1, addr, NULL, 0) == 0); @@ -401,7 +403,7 @@ TestMain("PAIRv1 protocol", { Convey("Polyamorous default works", { nng_msg *msg; - So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == 0); + So(nng_setopt_bool(s1, NNG_OPT_PAIR1_POLY, true) == 0); So(nng_listen(s1, addr, NULL, 0) == 0); So(nng_dial(c1, addr, NULL, 0) == 0); @@ -429,22 +431,22 @@ TestMain("PAIRv1 protocol", { Convey("Polyamorous raw mode works", { nng_msg *msg; - int v; + bool v; uint32_t hops; nng_pipe p1; nng_pipe p2; - So(nng_getopt_int(s1, NNG_OPT_PAIR1_POLY, &v) == 0); + So(nng_getopt_bool(s1, NNG_OPT_PAIR1_POLY, &v) == 0); So(v == 0); - So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == 0); - So(nng_getopt_int(s1, NNG_OPT_PAIR1_POLY, &v) == 0); - So(v == 1); + So(nng_setopt_bool(s1, NNG_OPT_PAIR1_POLY, true) == 0); + So(nng_getopt_bool(s1, NNG_OPT_PAIR1_POLY, &v) == 0); + So(v == true); - v = 0; - So(nng_setopt_int(s1, NNG_OPT_RAW, 1) == 0); - So(nng_getopt_int(s1, NNG_OPT_RAW, &v) == 0); - So(v == 1); + v = false; + So(nng_setopt_bool(s1, NNG_OPT_RAW, true) == 0); + So(nng_getopt_bool(s1, NNG_OPT_RAW, &v) == 0); + So(v == true); So(nng_listen(s1, addr, NULL, 0) == 0); So(nng_dial(c1, addr, NULL, 0) == 0); |
