diff options
Diffstat (limited to 'demo/reqrep')
| -rw-r--r-- | demo/reqrep/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | demo/reqrep/reqrep.c | 77 |
2 files changed, 26 insertions, 54 deletions
diff --git a/demo/reqrep/CMakeLists.txt b/demo/reqrep/CMakeLists.txt index 09234646..872666bb 100644 --- a/demo/reqrep/CMakeLists.txt +++ b/demo/reqrep/CMakeLists.txt @@ -15,9 +15,6 @@ find_package(nng CONFIG REQUIRED) find_package(Threads) -# Uncomment to enable ZeroTier transport -# find_package(zerotiercore) - add_executable(reqrep reqrep.c) target_link_libraries(reqrep nng::nng) target_compile_definitions(reqrep PRIVATE NNG_ELIDE_DEPRECATED) diff --git a/demo/reqrep/reqrep.c b/demo/reqrep/reqrep.c index 62ff29a4..e23ba100 100644 --- a/demo/reqrep/reqrep.c +++ b/demo/reqrep/reqrep.c @@ -26,34 +26,33 @@ #include <nng/nng.h> #include <nng/protocol/reqrep0/rep.h> #include <nng/protocol/reqrep0/req.h> -#include <nng/transport/zerotier/zerotier.h> #include <nng/supplemental/util/platform.h> #define CLIENT "client" #define SERVER "server" #define DATECMD 1 -#define PUT64(ptr, u) \ - do { \ - (ptr)[0] = (uint8_t)(((uint64_t)(u)) >> 56); \ - (ptr)[1] = (uint8_t)(((uint64_t)(u)) >> 48); \ - (ptr)[2] = (uint8_t)(((uint64_t)(u)) >> 40); \ - (ptr)[3] = (uint8_t)(((uint64_t)(u)) >> 32); \ - (ptr)[4] = (uint8_t)(((uint64_t)(u)) >> 24); \ - (ptr)[5] = (uint8_t)(((uint64_t)(u)) >> 16); \ - (ptr)[6] = (uint8_t)(((uint64_t)(u)) >> 8); \ - (ptr)[7] = (uint8_t)((uint64_t)(u)); \ +#define PUT64(ptr, u) \ + do { \ + (ptr)[0] = (uint8_t) (((uint64_t) (u)) >> 56); \ + (ptr)[1] = (uint8_t) (((uint64_t) (u)) >> 48); \ + (ptr)[2] = (uint8_t) (((uint64_t) (u)) >> 40); \ + (ptr)[3] = (uint8_t) (((uint64_t) (u)) >> 32); \ + (ptr)[4] = (uint8_t) (((uint64_t) (u)) >> 24); \ + (ptr)[5] = (uint8_t) (((uint64_t) (u)) >> 16); \ + (ptr)[6] = (uint8_t) (((uint64_t) (u)) >> 8); \ + (ptr)[7] = (uint8_t) ((uint64_t) (u)); \ } while (0) -#define GET64(ptr, v) \ - v = (((uint64_t)((uint8_t)(ptr)[0])) << 56) + \ - (((uint64_t)((uint8_t)(ptr)[1])) << 48) + \ - (((uint64_t)((uint8_t)(ptr)[2])) << 40) + \ - (((uint64_t)((uint8_t)(ptr)[3])) << 32) + \ - (((uint64_t)((uint8_t)(ptr)[4])) << 24) + \ - (((uint64_t)((uint8_t)(ptr)[5])) << 16) + \ - (((uint64_t)((uint8_t)(ptr)[6])) << 8) + \ - (((uint64_t)(uint8_t)(ptr)[7])) +#define GET64(ptr, v) \ + v = (((uint64_t) ((uint8_t) (ptr)[0])) << 56) + \ + (((uint64_t) ((uint8_t) (ptr)[1])) << 48) + \ + (((uint64_t) ((uint8_t) (ptr)[2])) << 40) + \ + (((uint64_t) ((uint8_t) (ptr)[3])) << 32) + \ + (((uint64_t) ((uint8_t) (ptr)[4])) << 24) + \ + (((uint64_t) ((uint8_t) (ptr)[5])) << 16) + \ + (((uint64_t) ((uint8_t) (ptr)[6])) << 8) + \ + (((uint64_t) (uint8_t) (ptr)[7])) void fatal(const char *func, int rv) @@ -72,10 +71,10 @@ showdate(time_t now) int server(const char *url) { - nng_socket sock; + nng_socket sock; nng_listener listener; - int rv; - int count = 0; + int rv; + int count = 0; if ((rv = nng_rep0_open(&sock)) != 0) { fatal("nng_rep0_open", rv); @@ -85,23 +84,11 @@ server(const char *url) fatal("nng_listener_create", rv); } - if (strncmp(url, "zt://", 5) == 0) { - printf("ZeroTier transport will store its keys in current working directory.\n"); - printf("The server and client instances must run in separate directories.\n"); - nng_listener_set_string(listener, NNG_OPT_ZT_HOME, "."); - nng_listener_set_ms(listener, NNG_OPT_RECONNMINT, 1); - nng_listener_set_ms(listener, NNG_OPT_RECONNMAXT, 1000); - nng_socket_set_ms(sock, NNG_OPT_REQ_RESENDTIME, 2000); - nng_socket_set_ms(sock, NNG_OPT_RECVMAXSZ, 0); - nng_listener_set_ms(listener, NNG_OPT_ZT_PING_TIME, 10000); - nng_listener_set_ms(listener, NNG_OPT_ZT_CONN_TIME, 1000); - } else { - nng_socket_set_ms(sock, NNG_OPT_REQ_RESENDTIME, 2000); - } + nng_socket_set_ms(sock, NNG_OPT_REQ_RESENDTIME, 2000); nng_listener_start(listener, 0); for (;;) { - char * buf = NULL; + char *buf = NULL; size_t sz; uint64_t val; count++; @@ -141,7 +128,7 @@ client(const char *url) nng_dialer dialer; int rv; size_t sz; - char * buf = NULL; + char *buf = NULL; uint8_t cmd[sizeof(uint64_t)]; int sleep = 0; @@ -155,19 +142,7 @@ client(const char *url) fatal("nng_dialer_create", rv); } - if (strncmp(url, "zt://", 5) == 0) { - printf("ZeroTier transport will store its keys in current working directory\n"); - printf("The server and client instances must run in separate directories.\n"); - nng_dialer_set_string(dialer, NNG_OPT_ZT_HOME, "."); - nng_dialer_set_ms(dialer, NNG_OPT_RECONNMINT, 1); - nng_dialer_set_ms(dialer, NNG_OPT_RECONNMAXT, 1000); - nng_socket_set_ms(sock, NNG_OPT_REQ_RESENDTIME, 2000); - nng_socket_set_ms(sock, NNG_OPT_RECVMAXSZ, 0); - nng_dialer_set_ms(dialer, NNG_OPT_ZT_PING_TIME, 10000); - nng_dialer_set_ms(dialer, NNG_OPT_ZT_CONN_TIME, 1000); - } else { - nng_socket_set_ms(sock, NNG_OPT_REQ_RESENDTIME, 2000); - } + nng_socket_set_ms(sock, NNG_OPT_REQ_RESENDTIME, 2000); nng_dialer_start(dialer, NNG_FLAG_NONBLOCK); |