fixes #1345 Restructure the source tree

This is not quite complete, but it sets the stage for other
protocols (such as zmq or mqtt) to be added to the project.

2 files changed, 0 insertions, 321 deletions

diff --git a/src/protocol/pair0/CMakeLists.txt b/src/protocol/pair0/CMakeLists.txt
deleted file mode 100644
index b12583ab..00000000
--- a/src/protocol/pair0/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright 2020 Staysail Systems, Inc. <info@staysail.tech>
-# Copyright 2018 Capitar IT Group BV <info@capitar.com>
-#
-# 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.
-#
-
-#  PAIRv0 protocol
-nng_directory(pair0)
-
-nng_sources_if(NNG_PROTO_PAIR0 pair.c)
-nng_headers_if(NNG_PROTO_PAIR0 nng/protocol/pair0/pair.h)
-nng_defines_if(NNG_PROTO_PAIR0 NNG_HAVE_PAIR0)
\ No newline at end of file
diff --git a/src/protocol/pair0/pair.c b/src/protocol/pair0/pair.c
deleted file mode 100644
index 41f88c7c..00000000
--- a/src/protocol/pair0/pair.c
+++ /dev/null
@@ -1,305 +0,0 @@
-//
-// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech>
-// Copyright 2018 Capitar IT Group BV <info@capitar.com>
-//
-// 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 <stdlib.h>
-
-#include "core/nng_impl.h"
-#include "nng/protocol/pair0/pair.h"
-
-// Pair protocol.  The PAIR protocol is a simple 1:1 messaging pattern.
-// While a peer is connected to the server, all other peer connection
-// attempts are discarded.
-
-#ifndef NNI_PROTO_PAIR_V0
-#define NNI_PROTO_PAIR_V0 NNI_PROTO(1, 0)
-#endif
-
-typedef struct pair0_pipe pair0_pipe;
-typedef struct pair0_sock pair0_sock;
-
-static void pair0_send_cb(void *);
-static void pair0_recv_cb(void *);
-static void pair0_getq_cb(void *);
-static void pair0_putq_cb(void *);
-static void pair0_pipe_fini(void *);
-
-// pair0_sock is our per-socket protocol private structure.
-struct pair0_sock {
-	pair0_pipe *ppipe;
-	nni_msgq *  uwq;
-	nni_msgq *  urq;
-	nni_mtx     mtx;
-};
-
-// An pair0_pipe is our per-pipe protocol private structure.  We keep
-// one of these even though in theory we'd only have a single underlying
-// pipe.  The separate data structure is more like other protocols that do
-// manage multiple pipes.
-struct pair0_pipe {
-	nni_pipe *  npipe;
-	pair0_sock *psock;
-	nni_aio     aio_send;
-	nni_aio     aio_recv;
-	nni_aio     aio_getq;
-	nni_aio     aio_putq;
-};
-
-static int
-pair0_sock_init(void *arg, nni_sock *nsock)
-{
-	pair0_sock *s = arg;
-
-	nni_mtx_init(&s->mtx);
-	s->ppipe = NULL;
-	s->uwq   = nni_sock_sendq(nsock);
-	s->urq   = nni_sock_recvq(nsock);
-	return (0);
-}
-
-static void
-pair0_sock_fini(void *arg)
-{
-	pair0_sock *s = arg;
-
-	nni_mtx_fini(&s->mtx);
-}
-
-static void
-pair0_pipe_stop(void *arg)
-{
-	pair0_pipe *p = arg;
-
-	nni_aio_stop(&p->aio_send);
-	nni_aio_stop(&p->aio_recv);
-	nni_aio_stop(&p->aio_putq);
-	nni_aio_stop(&p->aio_getq);
-}
-
-static void
-pair0_pipe_fini(void *arg)
-{
-	pair0_pipe *p = arg;
-
-	nni_aio_fini(&p->aio_send);
-	nni_aio_fini(&p->aio_recv);
-	nni_aio_fini(&p->aio_putq);
-	nni_aio_fini(&p->aio_getq);
-}
-
-static int
-pair0_pipe_init(void *arg, nni_pipe *npipe, void *psock)
-{
-	pair0_pipe *p = arg;
-
-	nni_aio_init(&p->aio_send, pair0_send_cb, p);
-	nni_aio_init(&p->aio_recv, pair0_recv_cb, p);
-	nni_aio_init(&p->aio_getq, pair0_getq_cb, p);
-	nni_aio_init(&p->aio_putq, pair0_putq_cb, p);
-
-	p->npipe = npipe;
-	p->psock = psock;
-	return (0);
-}
-
-static int
-pair0_pipe_start(void *arg)
-{
-	pair0_pipe *p = arg;
-	pair0_sock *s = p->psock;
-
-	if (nni_pipe_peer(p->npipe) != NNI_PROTO_PAIR_V0) {
-		// Peer protocol mismatch.
-		return (NNG_EPROTO);
-	}
-
-	nni_mtx_lock(&s->mtx);
-	if (s->ppipe != NULL) {
-		nni_mtx_unlock(&s->mtx);
-		return (NNG_EBUSY); // Already have a peer, denied.
-	}
-	s->ppipe = p;
-	nni_mtx_unlock(&s->mtx);
-
-	// Schedule a getq on the upper, and a read from the pipe.
-	// Each of these also sets up another hold on the pipe itself.
-	nni_msgq_aio_get(s->uwq, &p->aio_getq);
-	nni_pipe_recv(p->npipe, &p->aio_recv);
-
-	return (0);
-}
-
-static void
-pair0_pipe_close(void *arg)
-{
-	pair0_pipe *p = arg;
-	pair0_sock *s = p->psock;
-
-	nni_aio_close(&p->aio_send);
-	nni_aio_close(&p->aio_recv);
-	nni_aio_close(&p->aio_putq);
-	nni_aio_close(&p->aio_getq);
-
-	nni_mtx_lock(&s->mtx);
-	if (s->ppipe == p) {
-		s->ppipe = NULL;
-	}
-	nni_mtx_unlock(&s->mtx);
-}
-
-static void
-pair0_recv_cb(void *arg)
-{
-	pair0_pipe *p = arg;
-	pair0_sock *s = p->psock;
-	nni_msg *   msg;
-
-	if (nni_aio_result(&p->aio_recv) != 0) {
-		nni_pipe_close(p->npipe);
-		return;
-	}
-
-	msg = nni_aio_get_msg(&p->aio_recv);
-	nni_aio_set_msg(&p->aio_putq, msg);
-	nni_aio_set_msg(&p->aio_recv, NULL);
-
-	nni_msg_set_pipe(msg, nni_pipe_id(p->npipe));
-	nni_msgq_aio_put(s->urq, &p->aio_putq);
-}
-
-static void
-pair0_putq_cb(void *arg)
-{
-	pair0_pipe *p = arg;
-
-	if (nni_aio_result(&p->aio_putq) != 0) {
-		nni_msg_free(nni_aio_get_msg(&p->aio_putq));
-		nni_aio_set_msg(&p->aio_putq, NULL);
-		nni_pipe_close(p->npipe);
-		return;
-	}
-	nni_pipe_recv(p->npipe, &p->aio_recv);
-}
-
-static void
-pair0_getq_cb(void *arg)
-{
-	pair0_pipe *p = arg;
-
-	if (nni_aio_result(&p->aio_getq) != 0) {
-		nni_pipe_close(p->npipe);
-		return;
-	}
-
-	nni_aio_set_msg(&p->aio_send, nni_aio_get_msg(&p->aio_getq));
-	nni_aio_set_msg(&p->aio_getq, NULL);
-	nni_pipe_send(p->npipe, &p->aio_send);
-}
-
-static void
-pair0_send_cb(void *arg)
-{
-	pair0_pipe *p = arg;
-	pair0_sock *s = p->psock;
-
-	if (nni_aio_result(&p->aio_send) != 0) {
-		nni_msg_free(nni_aio_get_msg(&p->aio_send));
-		nni_aio_set_msg(&p->aio_send, NULL);
-		nni_pipe_close(p->npipe);
-		return;
-	}
-
-	nni_msgq_aio_get(s->uwq, &p->aio_getq);
-}
-
-static void
-pair0_sock_open(void *arg)
-{
-	NNI_ARG_UNUSED(arg);
-}
-
-static void
-pair0_sock_close(void *arg)
-{
-	NNI_ARG_UNUSED(arg);
-}
-
-static void
-pair0_sock_send(void *arg, nni_aio *aio)
-{
-	pair0_sock *s = arg;
-
-	nni_msgq_aio_put(s->uwq, aio);
-}
-
-static void
-pair0_sock_recv(void *arg, nni_aio *aio)
-{
-	pair0_sock *s = arg;
-
-	nni_msgq_aio_get(s->urq, aio);
-}
-
-static nni_proto_pipe_ops pair0_pipe_ops = {
-	.pipe_size  = sizeof(pair0_pipe),
-	.pipe_init  = pair0_pipe_init,
-	.pipe_fini  = pair0_pipe_fini,
-	.pipe_start = pair0_pipe_start,
-	.pipe_close = pair0_pipe_close,
-	.pipe_stop  = pair0_pipe_stop,
-};
-
-static nni_option pair0_sock_options[] = {
-	// terminate list
-	{
-	    .o_name = NULL,
-	}
-};
-
-static nni_proto_sock_ops pair0_sock_ops = {
-	.sock_size    = sizeof(pair0_sock),
-	.sock_init    = pair0_sock_init,
-	.sock_fini    = pair0_sock_fini,
-	.sock_open    = pair0_sock_open,
-	.sock_close   = pair0_sock_close,
-	.sock_send    = pair0_sock_send,
-	.sock_recv    = pair0_sock_recv,
-	.sock_options = pair0_sock_options,
-};
-
-// Legacy protocol (v0)
-static nni_proto pair0_proto = {
-	.proto_version  = NNI_PROTOCOL_VERSION,
-	.proto_self     = { NNI_PROTO_PAIR_V0, "pair" },
-	.proto_peer     = { NNI_PROTO_PAIR_V0, "pair" },
-	.proto_flags    = NNI_PROTO_FLAG_SNDRCV,
-	.proto_sock_ops = &pair0_sock_ops,
-	.proto_pipe_ops = &pair0_pipe_ops,
-};
-
-static nni_proto pair0_proto_raw = {
-	.proto_version  = NNI_PROTOCOL_VERSION,
-	.proto_self     = { NNI_PROTO_PAIR_V0, "pair" },
-	.proto_peer     = { NNI_PROTO_PAIR_V0, "pair" },
-	.proto_flags    = NNI_PROTO_FLAG_SNDRCV | NNI_PROTO_FLAG_RAW,
-	.proto_sock_ops = &pair0_sock_ops,
-	.proto_pipe_ops = &pair0_pipe_ops,
-};
-
-int
-nng_pair0_open(nng_socket *sidp)
-{
-	return (nni_proto_open(sidp, &pair0_proto));
-}
-
-int
-nng_pair0_open_raw(nng_socket *sidp)
-{
-	return (nni_proto_open(sidp, &pair0_proto_raw));
-}