From 251553b13e6bc8019914b9edd1292f97e856dd43 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 26 Jun 2018 17:39:17 -0700 Subject: fixes #522 Separate out the endpoint plumbing This separates the plumbing for endpoints into distinct dialer and listeners. Some of the transports could benefit from further separation, but we've done some rather larger separation e.g. for the websocket transport. IPC would be a good one to update later, when we start looking at exposing a more natural underlying API. --- tests/sock.c | 10 ---------- tests/transport.c | 54 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 28 insertions(+), 36 deletions(-) (limited to 'tests') diff --git a/tests/sock.c b/tests/sock.c index 29043cb3..3792090b 100644 --- a/tests/sock.c +++ b/tests/sock.c @@ -403,11 +403,6 @@ TestMain("Socket Operations", { So(nng_dialer_setopt(ep, NNG_OPT_RECVMAXSZ, "a", 1) == NNG_EINVAL); }); - Convey("Cannot listen", { - nng_listener l; - l.id = ep.id; - So(nng_listener_start(l, 0) == NNG_ENOTSUP); - }); }); Convey("Listener creation ok", { @@ -452,11 +447,6 @@ TestMain("Socket Operations", { So(nng_listener_setopt(ep, NNG_OPT_RECVMAXSZ, "a", 1) == NNG_EINVAL); }); - Convey("Cannot dial", { - nng_dialer d; - d.id = ep.id; - So(nng_dialer_start(d, 0) == NNG_ENOTSUP); - }); }); Convey("Cannot access absent ep options", { diff --git a/tests/transport.c b/tests/transport.c index 9992408b..c060a26f 100644 --- a/tests/transport.c +++ b/tests/transport.c @@ -40,45 +40,48 @@ finish(void) // Fake TCP transport struct nni_tran fake_tcp = { - .tran_version = NNI_TRANSPORT_VERSION, - .tran_scheme = "tcp", - .tran_ep = NULL, - .tran_pipe = NULL, - .tran_init = goodinit, - .tran_fini = finish, + .tran_version = NNI_TRANSPORT_VERSION, + .tran_scheme = "tcp", + .tran_dialer = NULL, + .tran_listener = NULL, + .tran_pipe = NULL, + .tran_init = goodinit, + .tran_fini = finish, }; // Bad version transport struct nni_tran badvers = { - .tran_version = NNI_TRANSPORT_VERSION + 1, - .tran_scheme = "badvers", - .tran_ep = NULL, - .tran_pipe = NULL, - .tran_init = goodinit, - .tran_fini = finish, + .tran_version = NNI_TRANSPORT_VERSION + 1, + .tran_scheme = "badvers", + .tran_dialer = NULL, + .tran_listener = NULL, + .tran_pipe = NULL, + .tran_init = goodinit, + .tran_fini = finish, }; struct nni_tran badtran = { - .tran_version = NNI_TRANSPORT_VERSION, - .tran_scheme = "badtran", - .tran_ep = NULL, - .tran_pipe = NULL, - .tran_init = badinit, - .tran_fini = finish, + .tran_version = NNI_TRANSPORT_VERSION, + .tran_scheme = "badtran", + .tran_dialer = NULL, + .tran_listener = NULL, + .tran_pipe = NULL, + .tran_init = badinit, + .tran_fini = finish, }; // Bogus good transport struct nni_tran goodtran = { - .tran_version = NNI_TRANSPORT_VERSION, - .tran_scheme = "goodtran", - .tran_ep = NULL, - .tran_pipe = NULL, - .tran_init = goodinit, - .tran_fini = finish, + .tran_version = NNI_TRANSPORT_VERSION, + .tran_scheme = "goodtran", + .tran_dialer = NULL, + .tran_listener = NULL, + .tran_pipe = NULL, + .tran_init = goodinit, + .tran_fini = finish, }; TestMain("Pluggable Transports", { - Convey("Registering TCP again fails", { So(nni_tran_register(&fake_tcp) == NNG_ESTATE); So(ninits == 0); @@ -121,5 +124,4 @@ TestMain("Pluggable Transports", { So(nfinis == 1); }); }); - }) -- cgit v1.2.3-70-g09d2