From 34be2c20a62e94e3a2815dd869609554b3922477 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 7 Sep 2024 11:33:05 -0700 Subject: Remove the legacy transport registration functions. This also allows to remove most of the transport headers. Only zerotier.h sticks around, and only for now. (We expect to eject it into a separate module.) --- include/nng/transport/inproc/inproc.h | 29 ------------------------- include/nng/transport/ipc/ipc.h | 31 --------------------------- include/nng/transport/tcp/tcp.h | 30 -------------------------- include/nng/transport/tls/tls.h | 30 -------------------------- include/nng/transport/ws/websocket.h | 35 ------------------------------- include/nng/transport/zerotier/zerotier.h | 4 ---- 6 files changed, 159 deletions(-) delete mode 100644 include/nng/transport/inproc/inproc.h delete mode 100644 include/nng/transport/ipc/ipc.h delete mode 100644 include/nng/transport/tcp/tcp.h delete mode 100644 include/nng/transport/tls/tls.h delete mode 100644 include/nng/transport/ws/websocket.h (limited to 'include') diff --git a/include/nng/transport/inproc/inproc.h b/include/nng/transport/inproc/inproc.h deleted file mode 100644 index 0c633620..00000000 --- a/include/nng/transport/inproc/inproc.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright 2021 Staysail Systems, Inc. -// Copyright 2017 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. -// - -#ifndef NNG_TRANSPORT_INPROC_INPROC_H -#define NNG_TRANSPORT_INPROC_INPROC_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -// inproc transport. This is used for intra-process communication. -#ifndef NNG_ELIDE_DEPRECATED -NNG_DECL int nng_inproc_register(void); -#endif - -#ifdef __cplusplus -} -#endif - -#endif // NNG_TRANSPORT_INPROC_INPROC_H diff --git a/include/nng/transport/ipc/ipc.h b/include/nng/transport/ipc/ipc.h deleted file mode 100644 index cccef9a1..00000000 --- a/include/nng/transport/ipc/ipc.h +++ /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. -// - -#ifndef NNG_TRANSPORT_IPC_IPC_H -#define NNG_TRANSPORT_IPC_IPC_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -// ipc transport. This is used for inter-process communication on -// the same host computer. - -#ifndef NNG_ELIDE_DEPRECATED -NNG_DECL int nng_ipc_register(void); -#endif - -#ifdef __cplusplus -} -#endif - -#endif // NNG_TRANSPORT_IPC_IPC_H diff --git a/include/nng/transport/tcp/tcp.h b/include/nng/transport/tcp/tcp.h deleted file mode 100644 index e236c271..00000000 --- a/include/nng/transport/tcp/tcp.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright 2021 Staysail Systems, Inc. -// Copyright 2017 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. -// - -#ifndef NNG_TRANSPORT_TCP_TCP_H -#define NNG_TRANSPORT_TCP_TCP_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -// TCP transport. This is used for communication over TCP/IP. - -#ifndef NNG_ELIDE_DEPRECATED -NNG_DECL int nng_tcp_register(void); -#endif - -#ifdef __cplusplus -} -#endif - -#endif // NNG_TRANSPORT_TCP_TCP_H diff --git a/include/nng/transport/tls/tls.h b/include/nng/transport/tls/tls.h deleted file mode 100644 index 5e99372b..00000000 --- a/include/nng/transport/tls/tls.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright 2019 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. -// - -#ifndef NNG_TRANSPORT_TLS_TLS_H -#define NNG_TRANSPORT_TLS_TLS_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -// TLS transport. This is used for communication via TLS v1.2 over TCP/IP. - -#ifndef NNG_ELIDE_DEPRECATED -NNG_DECL int nng_tls_register(void); -#endif - -#ifdef __cplusplus -} -#endif - -#endif // NNG_TRANSPORT_TLS_TLS_H diff --git a/include/nng/transport/ws/websocket.h b/include/nng/transport/ws/websocket.h deleted file mode 100644 index a5f97d46..00000000 --- a/include/nng/transport/ws/websocket.h +++ /dev/null @@ -1,35 +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. -// - -#ifndef NNG_TRANSPORT_WS_WEBSOCKET_H -#define NNG_TRANSPORT_WS_WEBSOCKET_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -// WebSocket transport. This is used for communication via WebSocket. - -// These aliases are for WSS naming consistency. -#define NNG_OPT_WSS_REQUEST_HEADERS NNG_OPT_WS_REQUEST_HEADERS -#define NNG_OPT_WSS_RESPONSE_HEADERS NNG_OPT_WS_RESPONSE_HEADERS - -#ifndef NNG_ELIDE_DEPRECATED -NNG_DECL int nng_ws_register(void); -NNG_DECL int nng_wss_register(void); -#endif - -#ifdef __cplusplus -} -#endif - -#endif // NNG_TRANSPORT_WS_WEBSOCKET_H diff --git a/include/nng/transport/zerotier/zerotier.h b/include/nng/transport/zerotier/zerotier.h index b8745dbd..178bbfa6 100644 --- a/include/nng/transport/zerotier/zerotier.h +++ b/include/nng/transport/zerotier/zerotier.h @@ -150,10 +150,6 @@ enum nng_zt_status { NNG_ZT_STATUS_UNKNOWN, }; -#ifndef NNG_ELIDE_DEPRECATED -NNG_DECL int nng_zt_register(void); -#endif - #ifdef __cplusplus } #endif -- cgit v1.2.3-70-g09d2