diff options
Diffstat (limited to 'src/sp')
| -rw-r--r-- | src/sp/protocol/pair1/pair.c | 2 | ||||
| -rw-r--r-- | src/sp/protocol/pubsub0/pub.c | 2 | ||||
| -rw-r--r-- | src/sp/transport.h | 8 | ||||
| -rw-r--r-- | src/sp/transport/dtls/dtls_tran_test.c | 3 | ||||
| -rw-r--r-- | src/sp/transport/tls/tls.c | 14 | ||||
| -rw-r--r-- | src/sp/transport/tls/tls_tran_test.c | 6 |
6 files changed, 18 insertions, 17 deletions
diff --git a/src/sp/protocol/pair1/pair.c b/src/sp/protocol/pair1/pair.c index 3aa9b4c7..486b2a37 100644 --- a/src/sp/protocol/pair1/pair.c +++ b/src/sp/protocol/pair1/pair.c @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "core/nng_impl.h" +#include "../../../core/nng_impl.h" // Pair protocol. The PAIRv1 protocol is a simple 1:1 messaging pattern. diff --git a/src/sp/protocol/pubsub0/pub.c b/src/sp/protocol/pubsub0/pub.c index abc52205..c753b8af 100644 --- a/src/sp/protocol/pubsub0/pub.c +++ b/src/sp/protocol/pubsub0/pub.c @@ -10,7 +10,7 @@ #include <string.h> -#include "core/nng_impl.h" +#include "../../../core/nng_impl.h" // Publish protocol. The PUB protocol simply sends messages out, as // a broadcast. It has nothing more sophisticated because it does not diff --git a/src/sp/transport.h b/src/sp/transport.h index 72ce18d7..36ade021 100644 --- a/src/sp/transport.h +++ b/src/sp/transport.h @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -12,9 +12,9 @@ #ifndef PROTOCOL_SP_TRANSPORT_H #define PROTOCOL_SP_TRANSPORT_H -#include "core/defs.h" -#include "core/list.h" -#include "core/options.h" +#include "../core/defs.h" +#include "../core/list.h" +#include "../core/options.h" // Endpoint operations are called by the socket in a // protocol-independent fashion. The socket makes individual calls, diff --git a/src/sp/transport/dtls/dtls_tran_test.c b/src/sp/transport/dtls/dtls_tran_test.c index e31b7909..774c967a 100644 --- a/src/sp/transport/dtls/dtls_tran_test.c +++ b/src/sp/transport/dtls/dtls_tran_test.c @@ -11,7 +11,8 @@ // #include "nng/nng.h" -#include <nuts.h> + +#include "../../../testing/nuts.h" // TLS tests. diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c index fd983c67..0bd4c284 100644 --- a/src/sp/transport/tls/tls.c +++ b/src/sp/transport/tls/tls.c @@ -12,7 +12,7 @@ #include <stdbool.h> #include <string.h> -#include "core/nng_impl.h" +#include "../../../core/nng_impl.h" #include "nng/nng.h" @@ -43,9 +43,9 @@ struct tlstran_pipe { size_t gotrxhead; size_t wanttxhead; size_t wantrxhead; - nni_aio txaio; - nni_aio rxaio; - nni_aio negoaio; + nng_aio txaio; + nng_aio rxaio; + nng_aio negoaio; nni_msg *rxmsg; nni_mtx mtx; }; @@ -63,9 +63,9 @@ struct tlstran_ep { nng_stream_listener *listener; nni_dialer *ndialer; nni_listener *nlistener; - nni_aio *useraio; - nni_aio connaio; - nni_aio timeaio; + nng_aio *useraio; + nng_aio connaio; + nng_aio timeaio; nni_list waitpipes; // pipes waiting to match to socket nni_list negopipes; // pipes busy negotiating const char *host; diff --git a/src/sp/transport/tls/tls_tran_test.c b/src/sp/transport/tls/tls_tran_test.c index 8f541e68..73c299c8 100644 --- a/src/sp/transport/tls/tls_tran_test.c +++ b/src/sp/transport/tls/tls_tran_test.c @@ -11,7 +11,8 @@ // #include "nng/nng.h" -#include <nuts.h> + +#include "../../../testing/nuts.h" // TLS tests. @@ -226,8 +227,7 @@ test_tls_pipe_details(void) p = nng_msg_get_pipe(msg); NUTS_TRUE(nng_pipe_id(p) >= 0); #if !defined(NNG_TLS_ENGINE_WOLFSSL) || defined(NNG_WOLFSSL_HAVE_PEER_CERT) - char *cn; - char **alts; + char *cn; NUTS_PASS(nng_pipe_get_string(p, NNG_OPT_TLS_PEER_CN, &cn)); NUTS_ASSERT(cn != NULL); NUTS_MATCH(cn, "127.0.0.1"); |