diff options
Diffstat (limited to 'examples/cpp/adhoc.cpp')
| -rw-r--r-- | examples/cpp/adhoc.cpp | 95 |
1 files changed, 31 insertions, 64 deletions
diff --git a/examples/cpp/adhoc.cpp b/examples/cpp/adhoc.cpp index ac4e621..3650dfd 100644 --- a/examples/cpp/adhoc.cpp +++ b/examples/cpp/adhoc.cpp @@ -17,8 +17,9 @@ * your network, otherwise nothing will happen. This can be done manually or via * our web API: https://my.zerotier.com/help/api * - * - An exception to the above rule is if you are using an Ad-hoc network, it has no - * controller and therefore requires no authorization. + * - Exceptions to the above rule are: + * 1) Joining a public network (such as "earth") + * 2) Joining an Ad-hoc network, (no controller and therefore requires no authorization.) * * * ESTABLISHING A CONNECTION: @@ -50,28 +51,27 @@ * Category 1: Control functions (zts_start, zts_join, zts_get_peer_status, etc). Errors * returned by these functions can be any of the following: * - * [ 0] ZTS_ERR_OK - No error. - * [-1] ZTS_ERR - Error (see zts_errno for more information). - * [-2] ZTS_ERR_INVALID_ARG - An argument provided is invalid. - * [-3] ZTS_ERR_SERVICE - ZT is not yet initialized. Try again. - * [-4] ZTS_ERR_INVALID_OP - Operation is not permitted (Doesn't make sense in this state). - * [-5] ZTS_ERR_NO_RESULT - Call succeeded but no result was available. Not always an error. - * [-6] ZTS_ERR_GENERAL - General internal failure. Consider filing a bug report. + * ZTS_ERR_OK 0 // No error + * ZTS_ERR_SOCKET -1 // Socket error, see zts_errno + * ZTS_ERR_SERVICE -2 // You probably did something at the wrong time + * ZTS_ERR_ARG -3 // Invalid argument + * ZTS_ERR_NO_RESULT -4 // No result (not necessarily an error) + * ZTS_ERR_GENERAL -5 // Consider filing a bug report * * Category 2: Sockets (zts_socket, zts_bind, zts_connect, zts_listen, etc). * Errors returned by these functions can be the same as the above. With * the added possibility of zts_errno being set. Much like standard * errno this will provide a more specific reason for an error's occurrence. - * These error values are defined in: libzt/ext/lwip/src/include/lwip/errno.h - * and closely map to standard Linux error values. + * See ZeroTierSockets.h for values. * * * API COMPATIBILITY WITH HOST OS: * - * - Since libzt re-implements a socket API probably very similar to your host OS's own - * API it may be tempting to mix and match host OS structures and functions with those - * of libzt. This may work on occasion, but you are tempting fate, so here are a few - * guidelines: + * - While the ZeroTier socket interface can coexist with your host OS's own interface in + * the same file with no type and naming conflicts, try not to mix and match host + * OS/libzt structures, functions, or constants. It may look similar and may even work + * some of the time but there enough differences that it will cause headaches. Here + * are a few guidelines: * * If you are calling a zts_* function, use the appropriate ZTS_* constants: * @@ -82,55 +82,23 @@ * * struct zts_sockaddr_in in4; <------ Note the zts_* prefix * ... - * zts_bind(fd, (struct sockaddr *)&in4, sizeof(struct zts_sockaddr_in)) < 0) + * zts_bind(fd, (struct zts_sockaddr *)&in4, sizeof(struct zts_sockaddr_in)) < 0) * - * If you are calling a host OS function, use your host OS's constants (and structures!): - * - * inet_ntop(AF_INET6, &(in6->sin6_addr), ...); (CORRECT) - * inet_ntop(ZTS_AF_INET6, &(in6->sin6_addr), ...); (INCORRECT) - * - * If you are calling a host OS function but passing a zts_* structure, this can - * work sometimes but you should take care to pass the correct host OS constants: - * - * struct zts_sockaddr_in6 in6; - * ... - * inet_ntop(AF_INET6, &(in6->sin6_addr), dstStr, INET6_ADDRSTRLEN); */ #include <stdio.h> -#include <string.h> -#include <string> -#include <inttypes.h> #include <stdlib.h> -#if defined(_WIN32) -#include <WinSock2.h> -#include <stdint.h> -#else -#include <netinet/in.h> -#include <sys/socket.h> -#include <netdb.h> -#include <arpa/inet.h> -#include <unistd.h> -#endif - -void delay_ms(long ms) -{ -#if defined(_WIN32) - Sleep(ms); -#else - usleep(ms*1000); -#endif -} - -#include "ZeroTier.h" +#include "ZeroTierSockets.h" bool nodeReady = false; bool networkReady = false; // Example callbacks -void myZeroTierEventCallback(struct zts_callback_msg *msg) +void myZeroTierEventCallback(void *msgPtr) { + struct zts_callback_msg *msg = (struct zts_callback_msg *)msgPtr; + // Node events if (msg->eventCode == ZTS_EVENT_NODE_ONLINE) { printf("ZTS_EVENT_NODE_ONLINE --- This node's ID is %llx\n", msg->node->address); @@ -146,8 +114,8 @@ void myZeroTierEventCallback(struct zts_callback_msg *msg) printf("ZTS_EVENT_NETWORK_NOT_FOUND --- Are you sure %llx is a valid network?\n", msg->network->nwid); } - if (msg->eventCode == ZTS_EVENT_NETWORK_REQUESTING_CONFIG) { - printf("ZTS_EVENT_NETWORK_REQUESTING_CONFIG --- Requesting config for network %llx, please wait a few seconds...\n", msg->network->nwid); + if (msg->eventCode == ZTS_EVENT_NETWORK_REQ_CONFIG) { + printf("ZTS_EVENT_NETWORK_REQ_CONFIG --- Requesting config for network %llx, please wait a few seconds...\n", msg->network->nwid); } if (msg->eventCode == ZTS_EVENT_NETWORK_ACCESS_DENIED) { printf("ZTS_EVENT_NETWORK_ACCESS_DENIED --- Access to virtual network %llx has been denied. Did you authorize the node yet?\n", @@ -174,23 +142,22 @@ void myZeroTierEventCallback(struct zts_callback_msg *msg) printf("ZTS_EVENT_NETIF_DOWN --- network=%llx, mac=%llx\n", msg->netif->nwid, msg->netif->mac); - networkReady = true; } // Address events if (msg->eventCode == ZTS_EVENT_ADDR_ADDED_IP6) { - char ipstr[INET6_ADDRSTRLEN]; + char ipstr[ZTS_INET6_ADDRSTRLEN]; struct zts_sockaddr_in6 *in6 = (struct zts_sockaddr_in6*)&(msg->addr->addr); - inet_ntop(AF_INET6, &(in6->sin6_addr), ipstr, INET6_ADDRSTRLEN); + zts_inet_ntop(ZTS_AF_INET6, &(in6->sin6_addr), ipstr, ZTS_INET6_ADDRSTRLEN); printf("ZTS_EVENT_ADDR_NEW_IP6 --- Join %llx and ping me at %s\n", msg->addr->nwid, ipstr); } // Peer events - // If you don't recognize the peer ID, don't panic, this is most likely one of our root servers - if (msg->eventCode == ZTS_EVENT_PEER_P2P) { - printf("ZTS_EVENT_PEER_P2P --- There is now a direct path to peer %llx\n", + // Don't worry if you don't recognize a peer ID, it's most likely our infrastructure + if (msg->eventCode == ZTS_EVENT_PEER_DIRECT) { + printf("ZTS_EVENT_PEER_DIRECT --- There is now a direct path to peer %llx\n", msg->peer->address); } if (msg->eventCode == ZTS_EVENT_PEER_RELAY) { @@ -238,14 +205,14 @@ int main(int argc, char **argv) uint64_t adhoc_nwid = zts_generate_adhoc_nwid_from_range(adhocStartPort, adhocEndPort); int err = ZTS_ERR_OK; - zts_set_network_caching(false); + zts_allow_network_caching(false); if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) { printf("Unable to start service, error = %d. Exiting.\n", err); exit(1); } printf("Waiting for node to come online...\n"); - while (!nodeReady) { delay_ms(50); } + while (!nodeReady) { zts_delay_ms(50); } printf("This node's identity is stored in %s\n", argv[1]); if((err = zts_join(adhoc_nwid)) != ZTS_ERR_OK) { @@ -253,12 +220,12 @@ int main(int argc, char **argv) exit(1); } printf("Joining network %llx\n", adhoc_nwid); - while (!networkReady) { delay_ms(50); } + while (!networkReady) { zts_delay_ms(50); } // Idle and just show callback events, stack statistics, etc printf("Node will now idle...\n"); - while (true) { delay_ms(1000); } + while (true) { zts_delay_ms(1000); } // Shut down service and stack threads |