API usability update, normalized zt_ naming convention0.2.1

1 files changed, 20 insertions, 21 deletions

diff --git a/src/SDK_XcodeWrapper.cpp b/src/SDK_XcodeWrapper.cpp
index 0eb7ca9..9d6176a 100755
--- a/src/SDK_XcodeWrapper.cpp
+++ b/src/SDK_XcodeWrapper.cpp
@@ -28,7 +28,6 @@
 #include "SDK.h"
 #include "SDK_XcodeWrapper.hpp"
 #include "SDK_Signatures.h"
-#include <sys/socket.h>
 
 #define INTERCEPT_ENABLED   111
 #define INTERCEPT_DISABLED  222
@@ -49,12 +48,12 @@ extern "C" void start_service_and_rpc(const char * path, const char * nwid) {
 
 // Joins a ZeroTier virtual network
 extern "C" void zt_join_network(const char * nwid){
-    join_network(nwid);
+    zts_join_network(nwid);
 }
 
 // Leaves a ZeroTier virtual network
 extern "C" void zt_leave_network(const char * nwid){
-    leave_network(nwid);
+    zts_leave_network(nwid);
 }
 
 // Explicit ZT API wrappers
@@ -65,30 +64,30 @@ extern "C" void zt_leave_network(const char * nwid){
     }
 #endif
 
-extern "C" int zts_socket(SOCKET_SIG) {
-    return zt_socket(socket_family, socket_type, protocol);
+extern "C" int zt_socket(SOCKET_SIG) {
+    return zts_socket(socket_family, socket_type, protocol);
 }
-extern "C" int zts_connect(CONNECT_SIG) {
-    return zt_connect(__fd, __addr, __len);
+extern "C" int zt_connect(CONNECT_SIG) {
+    return zts_connect(__fd, __addr, __len);
 }
-extern "C" int zts_bind(BIND_SIG){
-    return zt_bind(sockfd, addr, addrlen);
+extern "C" int zt_bind(BIND_SIG){
+    return zts_bind(sockfd, addr, addrlen);
 }
-extern "C" int zts_accept(ACCEPT_SIG) {
-    return zt_accept(sockfd, addr, addrlen);
+extern "C" int zt_accept(ACCEPT_SIG) {
+    return zts_accept(sockfd, addr, addrlen);
 }
-extern "C" int zts_listen(LISTEN_SIG) {
-    return zt_listen(sockfd, backlog);
+extern "C" int zt_listen(LISTEN_SIG) {
+    return zts_listen(sockfd, backlog);
 }
-extern "C" int zts_setsockopt(SETSOCKOPT_SIG) {
-    return zt_setsockopt(socket, level, option_name, option_value, option_len);
+extern "C" int zt_setsockopt(SETSOCKOPT_SIG) {
+    return zts_setsockopt(socket, level, option_name, option_value, option_len);
 }
-extern "C" int zts_getsockopt(GETSOCKOPT_SIG) {
-    return zt_getsockopt(sockfd, level, optname, optval, optlen);
+extern "C" int zt_getsockopt(GETSOCKOPT_SIG) {
+    return zts_getsockopt(sockfd, level, optname, optval, optlen);
 }
-extern "C" int zts_close(CLOSE_SIG) {
-    return zt_close(fd);
+extern "C" int zt_close(CLOSE_SIG) {
+    return zts_close(fd);
 }
-extern "C" int zts_getsockname(GETSOCKNAME_SIG) {
-    return zt_getsockname(sockfd, addr, addrlen);
+extern "C" int zt_getsockname(GETSOCKNAME_SIG) {
+    return zts_getsockname(sockfd, addr, addrlen);
 }