From 6fa07fc4d1891d0486b2ee7aa4f1e31d063c9e3f Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 21 Aug 2021 16:11:54 -0700 Subject: Move protocol.c into SP tree (it is SP specific.) Also, remove an extraneous initialization call. --- src/core/CMakeLists.txt | 1 - src/core/protocol.c | 31 ------------------------------- src/sp/CMakeLists.txt | 1 + src/sp/protocol.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 29 insertions(+), 32 deletions(-) delete mode 100644 src/core/protocol.c create mode 100644 src/sp/protocol.c (limited to 'src') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index b55bd70a..8ff5a80d 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -50,7 +50,6 @@ nng_sources( pipe.c pipe.h platform.h - protocol.c protocol.h reap.c reap.h diff --git a/src/core/protocol.c b/src/core/protocol.c deleted file mode 100644 index 2123d7e8..00000000 --- a/src/core/protocol.c +++ /dev/null @@ -1,31 +0,0 @@ -// -// Copyright 2021 Staysail Systems, Inc. -// Copyright 2018 Capitar IT Group BV -// -// This software is supplied under the terms of the MIT License, a -// copy of which should be located in the distribution where this -// file was obtained (LICENSE.txt). A copy of the license may also be -// found online at https://opensource.org/licenses/MIT. -// - -#include - -#include "core/nng_impl.h" - - -int -nni_proto_open(nng_socket *sip, const nni_proto *proto) -{ - int rv; - nni_sock *sock; - - if ((rv = nni_init()) != 0) { - return (rv); - } - if ((rv = nni_sock_open(&sock, proto)) == 0) { - nng_socket s; - s.id = nni_sock_id(sock); // Keep socket held open. - *sip = s; - } - return (rv); -} diff --git a/src/sp/CMakeLists.txt b/src/sp/CMakeLists.txt index aa790c09..4704f802 100644 --- a/src/sp/CMakeLists.txt +++ b/src/sp/CMakeLists.txt @@ -13,6 +13,7 @@ add_subdirectory(protocol) add_subdirectory(transport) nng_sources( + protocol.c transport.c transport.h ) diff --git a/src/sp/protocol.c b/src/sp/protocol.c new file mode 100644 index 00000000..512b27cc --- /dev/null +++ b/src/sp/protocol.c @@ -0,0 +1,28 @@ +// +// Copyright 2021 Staysail Systems, Inc. +// Copyright 2018 Capitar IT Group BV +// +// This software is supplied under the terms of the MIT License, a +// copy of which should be located in the distribution where this +// file was obtained (LICENSE.txt). A copy of the license may also be +// found online at https://opensource.org/licenses/MIT. +// + +#include + +#include "core/nng_impl.h" + + +int +nni_proto_open(nng_socket *sip, const nni_proto *proto) +{ + int rv; + nni_sock *sock; + + if ((rv = nni_sock_open(&sock, proto)) == 0) { + nng_socket s; + s.id = nni_sock_id(sock); // Keep socket held open. + *sip = s; + } + return (rv); +} -- cgit v1.2.3-70-g09d2