diff --git a/examples/cpp/client.cpp b/examples/cpp/client.cpp index aec3d7b..c05483b 100644 --- a/examples/cpp/client.cpp +++ b/examples/cpp/client.cpp @@ -215,11 +215,11 @@ int main(int argc, char **argv) int ztServicePort = atoi(argv[5]); // Port ZT uses to send encrypted UDP packets to peers (try something like 9994) struct zts_sockaddr_in in4; - in4.sin_port = zts_htons(remotePort); + in4.sin_port = htons(remotePort); #if defined(_WIN32) - in4.sin_addr.S_addr = zts_inet_addr(remoteAddr.c_str()); + zts_inet_pton(ZTS_AF_INET, remoteAddr.c_str(), &(in4.sin_addr.S_addr)); #else - in4.sin_addr.s_addr = zts_inet_addr(remoteAddr.c_str()); + zts_inet_pton(ZTS_AF_INET, remoteAddr.c_str(), &(in4.sin_addr.s_addr)); #endif in4.sin_family = ZTS_AF_INET; diff --git a/examples/cpp/comprehensive.cpp b/examples/cpp/comprehensive.cpp index 77dd319..385b101 100644 --- a/examples/cpp/comprehensive.cpp +++ b/examples/cpp/comprehensive.cpp @@ -131,7 +131,7 @@ void printPeerDetails(const char *msgStr, struct zts_peer_details *d) if (sa->sa_family == ZTS_AF_INET) { struct zts_sockaddr_in *in4 = (struct zts_sockaddr_in*)sa; zts_inet_ntop(ZTS_AF_INET, &(in4->sin_addr), ipstr, ZTS_INET_ADDRSTRLEN); - port = zts_ntohs(in4->sin_port); + port = ntohs(in4->sin_port); } if (sa->sa_family == ZTS_AF_INET6) { struct zts_sockaddr_in6 *in6 = (struct zts_sockaddr_in6*)sa; diff --git a/examples/cpp/nonblockingclient.cpp b/examples/cpp/nonblockingclient.cpp index 1cf4de0..a5635da 100644 --- a/examples/cpp/nonblockingclient.cpp +++ b/examples/cpp/nonblockingclient.cpp @@ -218,11 +218,11 @@ int main(int argc, char **argv) int ztServicePort = atoi(argv[5]); // Port ZT uses to send encrypted UDP packets to peers (try something like 9994) struct zts_sockaddr_in in4; - in4.sin_port = zts_htons(remotePort); + in4.sin_port = htons(remotePort); #if defined(_WIN32) - in4.sin_addr.S_addr = zts_inet_addr(remoteAddr.c_str()); + zts_inet_pton(ZTS_AF_INET, remoteAddr.c_str(), &(in4.sin_addr.S_addr)); #else - in4.sin_addr.s_addr = zts_inet_addr(remoteAddr.c_str()); + zts_inet_pton(ZTS_AF_INET, remoteAddr.c_str(), &(in4.sin_addr.s_addr)); #endif in4.sin_family = ZTS_AF_INET; diff --git a/examples/cpp/nonblockingserver.cpp b/examples/cpp/nonblockingserver.cpp index 3cb0d4c..e012922 100644 --- a/examples/cpp/nonblockingserver.cpp +++ b/examples/cpp/nonblockingserver.cpp @@ -216,7 +216,7 @@ int main(int argc, char **argv) int ztServicePort = atoi(argv[4]); // Port ZT uses to send encrypted UDP packets to peers (try something like 9994) struct zts_sockaddr_in in4, acc_in4; - in4.sin_port = zts_htons(serverBindPort); + in4.sin_port = htons(serverBindPort); #if defined(_WIN32) in4.sin_addr.S_addr = ZTS_INADDR_ANY; #else @@ -281,7 +281,7 @@ int main(int argc, char **argv) char ipstr[ZTS_INET_ADDRSTRLEN]; memset(ipstr, 0, sizeof(ipstr)); zts_inet_ntop(ZTS_AF_INET, &(acc_in4.sin_addr), ipstr, ZTS_INET_ADDRSTRLEN); - printf("Accepted connection from %s:%d\n", ipstr, zts_ntohs(acc_in4.sin_port)); + printf("Accepted connection from %s:%d\n", ipstr, ntohs(acc_in4.sin_port)); int bytes=0; char recvBuf[128]; diff --git a/examples/cpp/server.cpp b/examples/cpp/server.cpp index aca3c52..5f9ab22 100644 --- a/examples/cpp/server.cpp +++ b/examples/cpp/server.cpp @@ -214,7 +214,7 @@ int main(int argc, char **argv) int ztServicePort = atoi(argv[4]); // Port ZT uses to send encrypted UDP packets to peers (try something like 9994) struct zts_sockaddr_in in4, acc_in4; - in4.sin_port = zts_htons(serverBindPort); + in4.sin_port = htons(serverBindPort); #if defined(_WIN32) in4.sin_addr.S_addr = ZTS_INADDR_ANY; #else @@ -284,7 +284,7 @@ int main(int argc, char **argv) char ipstr[ZTS_INET_ADDRSTRLEN]; memset(ipstr, 0, sizeof(ipstr)); zts_inet_ntop(ZTS_AF_INET, &(acc_in4.sin_addr), ipstr, ZTS_INET_ADDRSTRLEN); - printf("Accepted connection from %s:%d\n", ipstr, zts_ntohs(acc_in4.sin_port)); + printf("Accepted connection from %s:%d\n", ipstr, ntohs(acc_in4.sin_port)); printf("Reading message string from client...\n"); if((bytes = zts_read(accfd, recvBuf, sizeof(recvBuf))) < 0) { diff --git a/examples/nodejs/binding.cc b/examples/nodejs/binding.cc index b6e1366..5ef11aa 100644 --- a/examples/nodejs/binding.cc +++ b/examples/nodejs/binding.cc @@ -7,6 +7,7 @@ #include #include #include +#include #include "ZeroTierSockets.h" #include "nbind/api.h" @@ -130,11 +131,11 @@ void on_zts_event(void *msgPtr) zts_sockaddr_in sockaddr_in(const char *remoteAddr, const int remotePort) { struct zts_sockaddr_in in4; - in4.sin_port = zts_htons(remotePort); + in4.sin_port = htons(remotePort); #if defined(_WIN32) - in4.sin_addr.S_addr = zts_inet_addr(remoteAddr); + zts_inet_pton(ZTS_AF_INET, remoteAddr.c_str(), &(in4.sin_addr.S_addr)); #else - in4.sin_addr.s_addr = zts_inet_addr(remoteAddr); + zts_inet_pton(ZTS_AF_INET, remoteAddr.c_str(), &(in4.sin_addr.s_addr)); #endif in4.sin_family = ZTS_AF_INET; return in4; diff --git a/include/ZeroTierSockets.h b/include/ZeroTierSockets.h index 51532f4..0983917 100644 --- a/include/ZeroTierSockets.h +++ b/include/ZeroTierSockets.h @@ -297,6 +297,11 @@ extern int zts_errno; * */ +/** + * Length of human-readable MAC address string + */ +#define ZTS_MAC_ADDRSTRLEN 18 + #define ZTS_INET_ADDRSTRLEN 16 #define ZTS_INET6_ADDRSTRLEN 46 @@ -1819,7 +1824,7 @@ struct zts_msghdr { * @param flags * @return Byte count sent on success. ZTS_ERR_SOCKET, ZTS_ERR_SERVICE, ZTS_ERR_ARG on failure. */ -ZTS_API ssize_t ZTCALL zts_sendmsg(int fd, const struct msghdr *msg, int flags); +ZTS_API ssize_t ZTCALL zts_sendmsg(int fd, const struct zts_msghdr *msg, int flags); /** * @brief Receive data from remote host (sets zts_errno) @@ -1854,7 +1859,7 @@ ZTS_API ssize_t ZTCALL zts_recvfrom( * @param flags * @return Byte count received on success. ZTS_ERR_SOCKET, ZTS_ERR_SERVICE, ZTS_ERR_ARG on failure. */ -ZTS_API ssize_t ZTCALL zts_recvmsg(int fd, struct msghdr *msg,int flags); +ZTS_API ssize_t ZTCALL zts_recvmsg(int fd, struct zts_msghdr *msg,int flags); /** * @brief Read bytes from socket onto buffer (sets zts_errno) @@ -1925,47 +1930,6 @@ ZTS_API int ZTCALL zts_add_dns_nameserver(struct zts_sockaddr *addr); */ ZTS_API int ZTCALL zts_del_dns_nameserver(struct zts_sockaddr *addr); -/** - * Convert an uint16_t from host to network byte order. - * - * @param n uint16_t in host byte order - * @return n in network byte order - */ -ZTS_API uint16_t ZTCALL zts_htons(uint16_t n); - -/** - * Convert an uint32_t from host to network byte order. - * - * @param n uint32_t in host byte order - * @return n in network byte order - */ -ZTS_API uint32_t ZTCALL zts_htonl(uint32_t n); - -/** - * Length of human-readable MAC address string - */ -#define ZTS_MAC_ADDRSTRLEN 18 - -#ifndef htonll -#define htonll(x) ((1==htonl(1)) ? (x) : ((uint64_t)htonl((x) & 0xFFFFFFFF) << 32) | htonl((x) >> 32)) -#endif - -/** - * Convert an uint16_t from network to host byte order. - * - * @param n uint16_t in network byte order - * @return n in host byte order - */ -ZTS_API uint16_t ZTCALL zts_ntohs(uint16_t n); - -/** - * Convert an uint32_t from network to host byte order. - * - * @param n uint32_t in network byte order - * @return n in host byte order - */ -ZTS_API uint32_t ZTCALL zts_ntohl(uint32_t n); - /** * Convert IPv4 and IPv6 address structures to human-readable text form. * @@ -1987,14 +1951,6 @@ ZTS_API const char * ZTCALL zts_inet_ntop(int af, const void *src, char *dst, zt */ ZTS_API int ZTCALL zts_inet_pton(int af, const char *src, void *dst); -/** - * Convert a C-string IPv4 address to integer representation. - * - * @param cp Human-readable IPv4 string - * @return 32-bit integer representation of address - */ -ZTS_API uint32_t ZTCALL zts_inet_addr(const char *cp); - #ifdef __cplusplus } // extern "C" #endif diff --git a/src/Sockets.cpp b/src/Sockets.cpp index e0e3c38..9f8d0a8 100644 --- a/src/Sockets.cpp +++ b/src/Sockets.cpp @@ -206,12 +206,12 @@ ssize_t zts_sendto(int fd, const void *buf, size_t len, int flags, return lwip_sendto(fd, buf, len, flags, (sockaddr*)addr, addrlen); } -ssize_t zts_sendmsg(int fd, const struct msghdr *msg, int flags) +ssize_t zts_sendmsg(int fd, const struct zts_msghdr *msg, int flags) { if (!(_serviceStateFlags & ZTS_STATE_NET_SERVICE_RUNNING)) { return ZTS_ERR_SERVICE; } - return lwip_sendmsg(fd, msg, flags); + return lwip_sendmsg(fd, (const struct msghdr *)msg, flags); } ssize_t zts_recv(int fd, void *buf, size_t len, int flags) @@ -237,7 +237,7 @@ ssize_t zts_recvfrom(int fd, void *buf, size_t len, int flags, return lwip_recvfrom(fd, buf, len, flags, (sockaddr*)addr, (socklen_t*)addrlen); } -ssize_t zts_recvmsg(int fd, struct msghdr *msg, int flags) +ssize_t zts_recvmsg(int fd, struct zts_msghdr *msg, int flags) { if (!(_serviceStateFlags & ZTS_STATE_NET_SERVICE_RUNNING)) { return ZTS_ERR_SERVICE; @@ -245,7 +245,7 @@ ssize_t zts_recvmsg(int fd, struct msghdr *msg, int flags) if (!msg) { return ZTS_ERR_ARG; } - return lwip_recvmsg(fd, msg, flags); + return lwip_recvmsg(fd, (struct msghdr *)msg, flags); } ssize_t zts_read(int fd, void *buf, size_t len) @@ -310,26 +310,6 @@ int zts_del_dns_nameserver(struct zts_sockaddr *addr) return ZTS_ERR_SERVICE; // TODO } -uint16_t zts_htons(uint16_t n) -{ - return lwip_htons(n); -} - -uint32_t zts_htonl(uint32_t n) -{ - return lwip_htonl(n); -} - -uint16_t zts_ntohs(uint16_t n) -{ - return lwip_htons(n); -} - -uint32_t zts_ntohl(uint32_t n) -{ - return lwip_htonl(n); -} - const char *zts_inet_ntop(int af, const void *src, char *dst,zts_socklen_t size) { return lwip_inet_ntop(af,src,dst,size); @@ -340,11 +320,6 @@ int zts_inet_pton(int af, const char *src, void *dst) return lwip_inet_pton(af,src,dst); } -uint32_t zts_inet_addr(const char *cp) -{ - return ipaddr_addr(cp); -} - ////////////////////////////////////////////////////////////////////////////// // Statistics // ////////////////////////////////////////////////////////////////////////////// diff --git a/src/bindings/csharp/Socket.cs b/src/bindings/csharp/Socket.cs index 2cce0d1..e5c602b 100644 --- a/src/bindings/csharp/Socket.cs +++ b/src/bindings/csharp/Socket.cs @@ -143,7 +143,7 @@ namespace ZeroTier.Sockets int addrlen = 0; IntPtr remoteAddrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(zts_sockaddr))); if (remoteEndPoint.AddressFamily == AddressFamily.InterNetwork) - { + { zts_sockaddr_in sa = new zts_sockaddr_in(); addrlen = Marshal.SizeOf(typeof(zts_sockaddr_in)); switch (remoteEndPoint.AddressFamily) @@ -158,10 +158,10 @@ namespace ZeroTier.Sockets sa.sin_family = (byte)Constants.AF_UNSPEC; break; } - sa.sin_port = (short)zts_htons((ushort)remoteEndPoint.Port); + sa.sin_port = (short)IPAddress.HostToNetworkOrder((ushort)remoteEndPoint.Port); sa.sin_addr = remoteEndPoint.Address.GetAddressBytes(); sa.sin_len = (byte)addrlen; // lwIP-specific - + Marshal.StructureToPtr(sa, remoteAddrPtr, false); //zts_sockaddr sAddr = (zts_sockaddr)Marshal.PtrToStructure(remoteAddrPtr, typeof(zts_sockaddr)); err = zts_connect(_fd, remoteAddrPtr, (byte)addrlen); @@ -204,7 +204,7 @@ namespace ZeroTier.Sockets int addrlen = 0; IntPtr localAddrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(zts_sockaddr))); if (localEndPoint.AddressFamily == AddressFamily.InterNetwork) - { + { zts_sockaddr_in sa = new zts_sockaddr_in(); addrlen = Marshal.SizeOf(typeof(zts_sockaddr_in)); switch (localEndPoint.AddressFamily) @@ -219,7 +219,7 @@ namespace ZeroTier.Sockets sa.sin_family = (byte)Constants.AF_UNSPEC; break; } - sa.sin_port = (short)zts_htons((ushort)localEndPoint.Port); + sa.sin_port = (short)IPAddress.HostToNetworkOrder((ushort)localEndPoint.Port); sa.sin_addr = localEndPoint.Address.GetAddressBytes(); sa.sin_len = (byte)addrlen; // lwIP-specific @@ -292,7 +292,7 @@ namespace ZeroTier.Sockets in4 = (zts_sockaddr_in)Marshal.PtrToStructure(remoteAddrPtr, typeof(zts_sockaddr_in)); // Convert sockaddr contents to IPEndPoint IPAddress ipAddress = new IPAddress(in4.sin_addr); - IPEndPoint clientEndPoint = new IPEndPoint(ipAddress, zts_ntohs((ushort)in4.sin_port)); + IPEndPoint clientEndPoint = new IPEndPoint(ipAddress, IPAddress.NetworkToHostOrder(((ushort)in4.sin_port)); // Create new socket by providing file descriptor returned from zts_accept call. Socket clientSocket = new Socket( err, _socketFamily, _socketType, _socketProtocol, _localEndPoint, clientEndPoint); @@ -479,7 +479,7 @@ namespace ZeroTier.Sockets set { _set_timeout(value, ZeroTier.Constants.SO_SNDTIMEO); } } - /* TODO + /* TODO public int ReceiveBufferSize { get; set; } public int SendBufferSize { get; set; } @@ -598,27 +598,12 @@ namespace ZeroTier.Sockets [DllImport("libzt", EntryPoint="CSharp_zts_del_dns_nameserver")] static extern int zts_del_dns_nameserver(IntPtr arg1); - [DllImport("libzt", EntryPoint="CSharp_zts_htons")] - static extern ushort zts_htons(ushort arg1); - - [DllImport("libzt", EntryPoint="CSharp_zts_htonl")] - static extern ushort zts_htonl(ushort arg1); - - [DllImport("libzt", EntryPoint="CSharp_zts_ntohs")] - static extern ushort zts_ntohs(ushort arg1); - - [DllImport("libzt", EntryPoint="CSharp_zts_ntohl")] - static extern ushort zts_ntohl(ushort arg1); - [DllImport("libzt", EntryPoint="CSharp_zts_inet_ntop")] static extern string zts_inet_ntop(int arg1, IntPtr arg2, string arg3, ushort arg4); [DllImport("libzt", EntryPoint="CSharp_zts_inet_pton")] static extern int zts_inet_pton(int arg1, string arg2, IntPtr arg3); - [DllImport("libzt", EntryPoint="CSharp_zts_inet_addr")] - static extern ushort zts_inet_addr(string arg1); - [DllImport("libzt", EntryPoint="CSharp_zts_errno_get")] static extern int zts_errno_get(); diff --git a/src/bindings/csharp/zt_wrap.cpp b/src/bindings/csharp/zt_wrap.cpp index 1e93c3d..eac1aba 100644 --- a/src/bindings/csharp/zt_wrap.cpp +++ b/src/bindings/csharp/zt_wrap.cpp @@ -170,7 +170,7 @@ template T SwigValueInit() { #include -/* Support for throwing C# exceptions from C/C++. There are two types: +/* Support for throwing C# exceptions from C/C++. There are two types: * Exceptions that take a message and ArgumentExceptions that take a message and a parameter name. */ typedef enum { SWIG_CSharpApplicationException, @@ -243,19 +243,19 @@ static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExcepti #ifdef __cplusplus -extern "C" +extern "C" #endif SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionCallbacks_zt( SWIG_CSharpExceptionCallback_t applicationCallback, SWIG_CSharpExceptionCallback_t arithmeticCallback, - SWIG_CSharpExceptionCallback_t divideByZeroCallback, - SWIG_CSharpExceptionCallback_t indexOutOfRangeCallback, + SWIG_CSharpExceptionCallback_t divideByZeroCallback, + SWIG_CSharpExceptionCallback_t indexOutOfRangeCallback, SWIG_CSharpExceptionCallback_t invalidCastCallback, SWIG_CSharpExceptionCallback_t invalidOperationCallback, SWIG_CSharpExceptionCallback_t ioCallback, SWIG_CSharpExceptionCallback_t nullReferenceCallback, - SWIG_CSharpExceptionCallback_t outOfMemoryCallback, - SWIG_CSharpExceptionCallback_t overflowCallback, + SWIG_CSharpExceptionCallback_t outOfMemoryCallback, + SWIG_CSharpExceptionCallback_t overflowCallback, SWIG_CSharpExceptionCallback_t systemCallback) { SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback = applicationCallback; SWIG_csharp_exceptions[SWIG_CSharpArithmeticException].callback = arithmeticCallback; @@ -271,7 +271,7 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionCallbacks_zt( } #ifdef __cplusplus -extern "C" +extern "C" #endif SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionArgumentCallbacks_zt( SWIG_CSharpExceptionArgumentCallback_t argumentCallback, @@ -289,7 +289,7 @@ static SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback = NULL; #ifdef __cplusplus -extern "C" +extern "C" #endif SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_zt(SWIG_CSharpStringHelperCallback callback) { SWIG_csharp_string_callback = callback; @@ -387,8 +387,8 @@ extern "C" { SWIGEXPORT void SWIGSTDCALL CSharp_zts_errno_set(int jarg1) { int arg1 ; - - arg1 = (int)jarg1; + + arg1 = (int)jarg1; zts_errno = arg1; } @@ -396,9 +396,9 @@ SWIGEXPORT void SWIGSTDCALL CSharp_zts_errno_set(int jarg1) { SWIGEXPORT int SWIGSTDCALL CSharp_zts_errno_get() { int jresult ; int result; - + result = (int)zts_errno; - jresult = result; + jresult = result; return jresult; } @@ -406,10 +406,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_allow_network_caching(unsigned char jarg1) int jresult ; uint8_t arg1 ; int result; - - arg1 = (uint8_t)jarg1; + + arg1 = (uint8_t)jarg1; result = (int)zts_allow_network_caching(arg1); - jresult = result; + jresult = result; return jresult; } @@ -418,10 +418,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_allow_peer_caching(unsigned char jarg1) { int jresult ; uint8_t arg1 ; int result; - - arg1 = (uint8_t)jarg1; + + arg1 = (uint8_t)jarg1; result = (int)zts_allow_peer_caching(arg1); - jresult = result; + jresult = result; return jresult; } @@ -430,10 +430,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_allow_local_conf(unsigned char jarg1) { int jresult ; uint8_t arg1 ; int result; - - arg1 = (uint8_t)jarg1; + + arg1 = (uint8_t)jarg1; result = (int)zts_allow_local_conf(arg1); - jresult = result; + jresult = result; return jresult; } @@ -444,12 +444,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_start(char * jarg1, void * jarg2, unsigned CppCallback arg2 = (CppCallback) 0 ; uint16_t arg3 ; int result; - - arg1 = (char *)jarg1; - arg2 = (CppCallback)jarg2; - arg3 = (uint16_t)jarg3; + + arg1 = (char *)jarg1; + arg2 = (CppCallback)jarg2; + arg3 = (uint16_t)jarg3; result = (int)zts_start((char const *)arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -457,9 +457,9 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_start(char * jarg1, void * jarg2, unsigned SWIGEXPORT int SWIGSTDCALL CSharp_zts_stop() { int jresult ; int result; - + result = (int)zts_stop(); - jresult = result; + jresult = result; return jresult; } @@ -467,9 +467,9 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_stop() { SWIGEXPORT int SWIGSTDCALL CSharp_zts_restart() { int jresult ; int result; - + result = (int)zts_restart(); - jresult = result; + jresult = result; return jresult; } @@ -477,9 +477,9 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_restart() { SWIGEXPORT int SWIGSTDCALL CSharp_zts_free() { int jresult ; int result; - + result = (int)zts_free(); - jresult = result; + jresult = result; return jresult; } @@ -488,10 +488,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_join(unsigned long long jarg1) { int jresult ; uint64_t arg1 ; int result; - - arg1 = (uint64_t)jarg1; + + arg1 = (uint64_t)jarg1; result = (int)zts_join(arg1); - jresult = result; + jresult = result; return jresult; } @@ -500,10 +500,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_leave(unsigned long long jarg1) { int jresult ; uint64_t arg1 ; int result; - - arg1 = (uint64_t)jarg1; + + arg1 = (uint64_t)jarg1; result = (int)zts_leave(arg1); - jresult = result; + jresult = result; return jresult; } @@ -513,11 +513,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_orbit(unsigned long long jarg1, unsigned l uint64_t arg1 ; uint64_t arg2 ; int result; - - arg1 = (uint64_t)jarg1; - arg2 = (uint64_t)jarg2; + + arg1 = (uint64_t)jarg1; + arg2 = (uint64_t)jarg2; result = (int)zts_orbit(arg1,arg2); - jresult = result; + jresult = result; return jresult; } @@ -526,10 +526,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_deorbit(unsigned long long jarg1) { int jresult ; uint64_t arg1 ; int result; - - arg1 = (uint64_t)jarg1; + + arg1 = (uint64_t)jarg1; result = (int)zts_deorbit(arg1); - jresult = result; + jresult = result; return jresult; } @@ -540,12 +540,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_get_6plane_addr(void * jarg1, unsigned lon uint64_t arg2 ; uint64_t arg3 ; int result; - - arg1 = (zts_sockaddr_storage *)jarg1; - arg2 = (uint64_t)jarg2; - arg3 = (uint64_t)jarg3; + + arg1 = (zts_sockaddr_storage *)jarg1; + arg2 = (uint64_t)jarg2; + arg3 = (uint64_t)jarg3; result = (int)zts_get_6plane_addr(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -556,12 +556,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_get_rfc4193_addr(void * jarg1, unsigned lo uint64_t arg2 ; uint64_t arg3 ; int result; - - arg1 = (zts_sockaddr_storage *)jarg1; - arg2 = (uint64_t)jarg2; - arg3 = (uint64_t)jarg3; + + arg1 = (zts_sockaddr_storage *)jarg1; + arg2 = (uint64_t)jarg2; + arg3 = (uint64_t)jarg3; result = (int)zts_get_rfc4193_addr(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -571,19 +571,19 @@ SWIGEXPORT unsigned long long SWIGSTDCALL CSharp_zts_generate_adhoc_nwid_from_ra uint16_t arg1 ; uint16_t arg2 ; uint64_t result; - - arg1 = (uint16_t)jarg1; - arg2 = (uint16_t)jarg2; + + arg1 = (uint16_t)jarg1; + arg2 = (uint16_t)jarg2; result = zts_generate_adhoc_nwid_from_range(arg1,arg2); - jresult = result; + jresult = result; return jresult; } SWIGEXPORT void SWIGSTDCALL CSharp_zts_delay_ms(long jarg1) { long arg1 ; - - arg1 = (long)jarg1; + + arg1 = (long)jarg1; zts_delay_ms(arg1); } @@ -592,10 +592,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_get_all_stats(void * jarg1) { int jresult ; zts_stats *arg1 = (zts_stats *) 0 ; int result; - - arg1 = (zts_stats *)jarg1; + + arg1 = (zts_stats *)jarg1; result = (int)zts_get_all_stats(arg1); - jresult = result; + jresult = result; return jresult; } @@ -605,11 +605,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_get_protocol_stats(int jarg1, void * jarg2 int arg1 ; void *arg2 = (void *) 0 ; int result; - - arg1 = (int)jarg1; - arg2 = (void *)jarg2; + + arg1 = (int)jarg1; + arg2 = (void *)jarg2; result = (int)zts_get_protocol_stats(arg1,arg2); - jresult = result; + jresult = result; return jresult; } */ @@ -620,12 +620,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_socket(int jarg1, int jarg2, int jarg3) { int arg2 ; int arg3 ; int result; - - arg1 = (int)jarg1; - arg2 = (int)jarg2; - arg3 = (int)jarg3; + + arg1 = (int)jarg1; + arg2 = (int)jarg2; + arg3 = (int)jarg3; result = (int)zts_socket(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -636,12 +636,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_connect(int jarg1, zts_sockaddr* jarg2, un zts_sockaddr *arg2 = (zts_sockaddr *) 0 ; zts_socklen_t arg3 ; int result; - - arg1 = (int)jarg1; - arg2 = (zts_sockaddr *)jarg2; - arg3 = (zts_socklen_t)jarg3; + + arg1 = (int)jarg1; + arg2 = (zts_sockaddr *)jarg2; + arg3 = (zts_socklen_t)jarg3; result = (int)zts_connect(arg1,(zts_sockaddr const *)arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -652,12 +652,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_bind(int jarg1, zts_sockaddr* jarg2, unsig zts_sockaddr *arg2 = (zts_sockaddr *) 0 ; zts_socklen_t arg3 ; int result; - - arg1 = (int)jarg1; - arg2 = (zts_sockaddr *)jarg2; - arg3 = (zts_socklen_t)jarg3; + + arg1 = (int)jarg1; + arg2 = (zts_sockaddr *)jarg2; + arg3 = (zts_socklen_t)jarg3; result = (int)zts_bind(arg1,(zts_sockaddr const *)arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -667,11 +667,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_listen(int jarg1, int jarg2) { int arg1 ; int arg2 ; int result; - - arg1 = (int)jarg1; - arg2 = (int)jarg2; + + arg1 = (int)jarg1; + arg2 = (int)jarg2; result = (int)zts_listen(arg1,arg2); - jresult = result; + jresult = result; return jresult; } @@ -682,12 +682,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_accept(int jarg1, zts_sockaddr* jarg2, int zts_sockaddr *arg2 = (zts_sockaddr *) 0 ; zts_socklen_t *arg3 = (zts_socklen_t *) 0 ; int result; - - arg1 = (int)jarg1; - arg2 = (zts_sockaddr *)jarg2; - arg3 = (zts_socklen_t *)jarg3; + + arg1 = (int)jarg1; + arg2 = (zts_sockaddr *)jarg2; + arg3 = (zts_socklen_t *)jarg3; result = (int)zts_accept(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -700,14 +700,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_setsockopt(int jarg1, int jarg2, int jarg3 void *arg4 = (void *) 0 ; zts_socklen_t arg5 ; int result; - - arg1 = (int)jarg1; - arg2 = (int)jarg2; - arg3 = (int)jarg3; - arg4 = (void *)jarg4; - arg5 = (zts_socklen_t)jarg5; + + arg1 = (int)jarg1; + arg2 = (int)jarg2; + arg3 = (int)jarg3; + arg4 = (void *)jarg4; + arg5 = (zts_socklen_t)jarg5; result = (int)zts_setsockopt(arg1,arg2,arg3,(void const *)arg4,arg5); - jresult = result; + jresult = result; return jresult; } @@ -720,14 +720,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_getsockopt(int jarg1, int jarg2, int jarg3 void *arg4 = (void *) 0 ; zts_socklen_t *arg5 = (zts_socklen_t *) 0 ; int result; - - arg1 = (int)jarg1; - arg2 = (int)jarg2; - arg3 = (int)jarg3; - arg4 = (void *)jarg4; - arg5 = (zts_socklen_t *)jarg5; + + arg1 = (int)jarg1; + arg2 = (int)jarg2; + arg3 = (int)jarg3; + arg4 = (void *)jarg4; + arg5 = (zts_socklen_t *)jarg5; result = (int)zts_getsockopt(arg1,arg2,arg3,arg4,arg5); - jresult = result; + jresult = result; return jresult; } @@ -738,12 +738,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_getsockname(int jarg1, zts_sockaddr* jarg2 zts_sockaddr *arg2 = (zts_sockaddr *) 0 ; zts_socklen_t *arg3 = (zts_socklen_t *) 0 ; int result; - - arg1 = (int)jarg1; - arg2 = (zts_sockaddr *)jarg2; - arg3 = (zts_socklen_t *)jarg3; + + arg1 = (int)jarg1; + arg2 = (zts_sockaddr *)jarg2; + arg3 = (zts_socklen_t *)jarg3; result = (int)zts_getsockname(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -754,12 +754,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_getpeername(int jarg1, zts_sockaddr* jarg2 zts_sockaddr *arg2 = (zts_sockaddr *) 0 ; zts_socklen_t *arg3 = (zts_socklen_t *) 0 ; int result; - - arg1 = (int)jarg1; - arg2 = (zts_sockaddr *)jarg2; - arg3 = (zts_socklen_t *)jarg3; + + arg1 = (int)jarg1; + arg2 = (zts_sockaddr *)jarg2; + arg3 = (zts_socklen_t *)jarg3; result = (int)zts_getpeername(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -768,10 +768,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_close(int jarg1) { int jresult ; int arg1 ; int result; - - arg1 = (int)jarg1; + + arg1 = (int)jarg1; result = (int)zts_close(arg1); - jresult = result; + jresult = result; return jresult; } @@ -784,14 +784,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_select(int jarg1, void * jarg2, void * jar zts_fd_set *arg4 = (zts_fd_set *) 0 ; zts_timeval *arg5 = (zts_timeval *) 0 ; int result; - - arg1 = (int)jarg1; - arg2 = (zts_fd_set *)jarg2; - arg3 = (zts_fd_set *)jarg3; - arg4 = (zts_fd_set *)jarg4; - arg5 = (zts_timeval *)jarg5; + + arg1 = (int)jarg1; + arg2 = (zts_fd_set *)jarg2; + arg3 = (zts_fd_set *)jarg3; + arg4 = (zts_fd_set *)jarg4; + arg5 = (zts_timeval *)jarg5; result = (int)zts_select(arg1,arg2,arg3,arg4,arg5); - jresult = result; + jresult = result; return jresult; } @@ -802,12 +802,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_fcntl(int jarg1, int jarg2, int jarg3) { int arg2 ; int arg3 ; int result; - - arg1 = (int)jarg1; - arg2 = (int)jarg2; - arg3 = (int)jarg3; + + arg1 = (int)jarg1; + arg2 = (int)jarg2; + arg3 = (int)jarg3; result = (int)zts_fcntl(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -818,12 +818,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_poll(void * jarg1, unsigned int jarg2, int zts_nfds_t arg2 ; int arg3 ; int result; - - arg1 = (zts_pollfd *)jarg1; - arg2 = (zts_nfds_t)jarg2; - arg3 = (int)jarg3; + + arg1 = (zts_pollfd *)jarg1; + arg2 = (zts_nfds_t)jarg2; + arg3 = (int)jarg3; result = (int)zts_poll(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -834,12 +834,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_ioctl(int jarg1, unsigned long jarg2, void unsigned long arg2 ; void *arg3 = (void *) 0 ; int result; - - arg1 = (int)jarg1; - arg2 = (unsigned long)jarg2; - arg3 = (void *)jarg3; + + arg1 = (int)jarg1; + arg2 = (unsigned long)jarg2; + arg3 = (void *)jarg3; result = (int)zts_ioctl(arg1,arg2,arg3); - jresult = result; + jresult = result; return jresult; } @@ -851,13 +851,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_send(int jarg1, void * jarg2, unsigned size_t arg3 ; int arg4 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (void *)jarg2; - arg3 = (size_t)jarg3; - arg4 = (int)jarg4; + + arg1 = (int)jarg1; + arg2 = (void *)jarg2; + arg3 = (size_t)jarg3; + arg4 = (int)jarg4; result = zts_send(arg1,(void const *)arg2,arg3,arg4); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -871,15 +871,15 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_sendto(int jarg1, void * jarg2, unsigne zts_sockaddr *arg5 = (zts_sockaddr *) 0 ; zts_socklen_t arg6 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (void *)jarg2; - arg3 = (size_t)jarg3; - arg4 = (int)jarg4; - arg5 = (zts_sockaddr *)jarg5; - arg6 = (zts_socklen_t)jarg6; + + arg1 = (int)jarg1; + arg2 = (void *)jarg2; + arg3 = (size_t)jarg3; + arg4 = (int)jarg4; + arg5 = (zts_sockaddr *)jarg5; + arg6 = (zts_socklen_t)jarg6; result = zts_sendto(arg1,(void const *)arg2,arg3,arg4,(zts_sockaddr const *)arg5,arg6); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -890,12 +890,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_sendmsg(int jarg1, void * jarg2, int ja msghdr *arg2 = (msghdr *) 0 ; int arg3 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (msghdr *)jarg2; - arg3 = (int)jarg3; + + arg1 = (int)jarg1; + arg2 = (msghdr *)jarg2; + arg3 = (int)jarg3; result = zts_sendmsg(arg1,(msghdr const *)arg2,arg3); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -907,11 +907,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_recv(int jarg1, void * jarg2, unsigned lon size_t arg3 ; int arg4 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (void *)jarg2; - arg3 = (size_t)jarg3; - arg4 = (int)jarg4; + + arg1 = (int)jarg1; + arg2 = (void *)jarg2; + arg3 = (size_t)jarg3; + arg4 = (int)jarg4; result = zts_recv(arg1,arg2,arg3,arg4); return result; } @@ -926,15 +926,15 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_recvfrom(int jarg1, void * jarg2, unsig zts_sockaddr *arg5 = (zts_sockaddr *) 0 ; zts_socklen_t *arg6 = (zts_socklen_t *) 0 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (void *)jarg2; - arg3 = (size_t)jarg3; - arg4 = (int)jarg4; - arg5 = (zts_sockaddr *)jarg5; - arg6 = (zts_socklen_t *)jarg6; + + arg1 = (int)jarg1; + arg2 = (void *)jarg2; + arg3 = (size_t)jarg3; + arg4 = (int)jarg4; + arg5 = (zts_sockaddr *)jarg5; + arg6 = (zts_socklen_t *)jarg6; result = zts_recvfrom(arg1,arg2,arg3,arg4,arg5,arg6); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -945,12 +945,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_recvmsg(int jarg1, void * jarg2, int ja msghdr *arg2 = (msghdr *) 0 ; int arg3 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (msghdr *)jarg2; - arg3 = (int)jarg3; + + arg1 = (int)jarg1; + arg2 = (msghdr *)jarg2; + arg3 = (int)jarg3; result = zts_recvmsg(arg1,arg2,arg3); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -961,12 +961,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_read(int jarg1, void * jarg2, unsigned void *arg2 = (void *) 0 ; size_t arg3 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (void *)jarg2; - arg3 = (size_t)jarg3; + + arg1 = (int)jarg1; + arg2 = (void *)jarg2; + arg3 = (size_t)jarg3; result = zts_read(arg1,arg2,arg3); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -977,12 +977,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_readv(int jarg1, void * jarg2, int jarg zts_iovec *arg2 = (zts_iovec *) 0 ; int arg3 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (zts_iovec *)jarg2; - arg3 = (int)jarg3; + + arg1 = (int)jarg1; + arg2 = (zts_iovec *)jarg2; + arg3 = (int)jarg3; result = zts_readv(arg1,(zts_iovec const *)arg2,arg3); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -993,12 +993,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_write(int jarg1, void * jarg2, unsigned void *arg2 = (void *) 0 ; size_t arg3 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (void *)jarg2; - arg3 = (size_t)jarg3; + + arg1 = (int)jarg1; + arg2 = (void *)jarg2; + arg3 = (size_t)jarg3; result = zts_write(arg1,(void const *)arg2,arg3); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -1009,12 +1009,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_zts_writev(int jarg1, void * jarg2, int jar zts_iovec *arg2 = (zts_iovec *) 0 ; int arg3 ; ssize_t result; - - arg1 = (int)jarg1; - arg2 = (zts_iovec *)jarg2; - arg3 = (int)jarg3; + + arg1 = (int)jarg1; + arg2 = (zts_iovec *)jarg2; + arg3 = (int)jarg3; result = zts_writev(arg1,(zts_iovec const *)arg2,arg3); - jresult = new ssize_t((const ssize_t &)result); + jresult = new ssize_t((const ssize_t &)result); return jresult; } @@ -1024,11 +1024,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_shutdown(int jarg1, int jarg2) { int arg1 ; int arg2 ; int result; - - arg1 = (int)jarg1; - arg2 = (int)jarg2; + + arg1 = (int)jarg1; + arg2 = (int)jarg2; result = (int)zts_shutdown(arg1,arg2); - jresult = result; + jresult = result; return jresult; } @@ -1037,10 +1037,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_add_dns_nameserver(zts_sockaddr* jarg1) { int jresult ; zts_sockaddr *arg1 = (zts_sockaddr *) 0 ; int result; - - arg1 = (zts_sockaddr *)jarg1; + + arg1 = (zts_sockaddr *)jarg1; result = (int)zts_add_dns_nameserver(arg1); - jresult = result; + jresult = result; return jresult; } @@ -1049,57 +1049,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_del_dns_nameserver(zts_sockaddr* jarg1) { int jresult ; zts_sockaddr *arg1 = (zts_sockaddr *) 0 ; int result; - - arg1 = (zts_sockaddr *)jarg1; + + arg1 = (zts_sockaddr *)jarg1; result = (int)zts_del_dns_nameserver(arg1); - jresult = result; - return jresult; -} - - -SWIGEXPORT unsigned short SWIGSTDCALL CSharp_zts_htons(unsigned short jarg1) { - unsigned short jresult ; - uint16_t arg1 ; - uint16_t result; - - arg1 = (uint16_t)jarg1; - result = zts_htons(arg1); - jresult = result; - return jresult; -} - - -SWIGEXPORT unsigned short SWIGSTDCALL CSharp_zts_htonl(unsigned short jarg1) { - unsigned short jresult ; - uint32_t arg1 ; - uint32_t result; - - arg1 = (uint32_t)jarg1; - result = zts_htonl(arg1); - jresult = result; - return jresult; -} - -SWIGEXPORT unsigned short SWIGSTDCALL CSharp_zts_ntohs(unsigned short jarg1) { - unsigned short jresult ; - uint16_t arg1 ; - uint16_t result; - - arg1 = (uint16_t)jarg1; - result = zts_ntohs(arg1); - jresult = result; - return jresult; -} - - -SWIGEXPORT unsigned short SWIGSTDCALL CSharp_zts_ntohl(unsigned short jarg1) { - unsigned short jresult ; - uint32_t arg1 ; - uint32_t result; - - arg1 = (uint32_t)jarg1; - result = zts_ntohl(arg1); - jresult = result; + jresult = result; return jresult; } @@ -1111,13 +1064,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_zts_inet_ntop(int jarg1, void * jarg2, char char *arg3 = (char *) 0 ; zts_socklen_t arg4 ; char *result = 0 ; - - arg1 = (int)jarg1; - arg2 = (void *)jarg2; - arg3 = (char *)jarg3; - arg4 = (zts_socklen_t)jarg4; + + arg1 = (int)jarg1; + arg2 = (void *)jarg2; + arg3 = (char *)jarg3; + arg4 = (zts_socklen_t)jarg4; result = (char *)zts_inet_ntop(arg1,(void const *)arg2,arg3,arg4); - jresult = SWIG_csharp_string_callback((const char *)result); + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1128,12 +1081,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_zts_inet_pton(int jarg1, char * jarg2, void * char *arg2 = (char *) 0 ; void *arg3 = (void *) 0 ; int result; - - arg1 = (int)jarg1; - arg2 = (char *)jarg2; - arg3 = (void *)jarg3; + + arg1 = (int)jarg1; + arg2 = (char *)jarg2; + arg3 = (void *)jarg3; result = (int)zts_inet_pton(arg1,(char const *)arg2,arg3); - jresult = result; + jresult = result; return jresult; } diff --git a/src/bindings/python/PythonSockets.cpp b/src/bindings/python/PythonSockets.cpp index dc7aaf8..a8613aa 100644 --- a/src/bindings/python/PythonSockets.cpp +++ b/src/bindings/python/PythonSockets.cpp @@ -18,6 +18,8 @@ */ #include "lwip/sockets.h" +#include "lwip/inet.h" + #include "ZeroTierSockets.h" #ifdef ZTS_ENABLE_PYTHON @@ -55,7 +57,7 @@ static int zts_py_tuple_to_sockaddr(int family, return ZTS_ERR_ARG; } addr = (struct zts_sockaddr_in*)dst_addr; - addr->sin_addr.s_addr = zts_inet_addr(host_str); + zts_inet_pton(ZTS_AF_INET, host_str, &(addr->sin_addr.s_addr)); PyMem_Free(host_str); if (port < 0 || port > 0xFFFF) { return ZTS_ERR_ARG; @@ -64,7 +66,7 @@ static int zts_py_tuple_to_sockaddr(int family, return ZTS_ERR_ARG; } addr->sin_family = AF_INET; - addr->sin_port = htons((short)port); + addr->sin_port = lwip_htons((short)port); *addrlen = sizeof *addr; return ZTS_ERR_OK; } @@ -87,7 +89,7 @@ PyObject * zts_py_accept(int fd) t = PyTuple_New(3); PyTuple_SetItem(t, 0, PyLong_FromLong(err)); // New file descriptor PyTuple_SetItem(t, 1, PyUnicode_FromString(ipstr)); - PyTuple_SetItem(t, 2, PyLong_FromLong(zts_ntohs(addrbuf.sin_port))); + PyTuple_SetItem(t, 2, PyLong_FromLong(lwip_ntohs(addrbuf.sin_port))); Py_INCREF(t); return t; } diff --git a/src/bindings/python/libzt.py b/src/bindings/python/libzt.py index 522a5af..80efdec 100644 --- a/src/bindings/python/libzt.py +++ b/src/bindings/python/libzt.py @@ -230,6 +230,7 @@ ZTS_EREMOTEIO = _libzt.ZTS_EREMOTEIO ZTS_EDQUOT = _libzt.ZTS_EDQUOT ZTS_ENOMEDIUM = _libzt.ZTS_ENOMEDIUM ZTS_EMEDIUMTYPE = _libzt.ZTS_EMEDIUMTYPE +ZTS_MAC_ADDRSTRLEN = _libzt.ZTS_MAC_ADDRSTRLEN ZTS_INET_ADDRSTRLEN = _libzt.ZTS_INET_ADDRSTRLEN ZTS_INET6_ADDRSTRLEN = _libzt.ZTS_INET6_ADDRSTRLEN ZTS_SOCK_STREAM = _libzt.ZTS_SOCK_STREAM @@ -746,22 +747,10 @@ def zts_add_dns_nameserver(addr): def zts_del_dns_nameserver(addr): return _libzt.zts_del_dns_nameserver(addr) -def zts_htons(n): - return _libzt.zts_htons(n) - -def zts_htonl(n): - return _libzt.zts_htonl(n) -ZTS_MAC_ADDRSTRLEN = _libzt.ZTS_MAC_ADDRSTRLEN - -def zts_ntohs(n): - return _libzt.zts_ntohs(n) - -def zts_ntohl(n): - return _libzt.zts_ntohl(n) - def zts_inet_ntop(af, src, dst, size): return _libzt.zts_inet_ntop(af, src, dst, size) def zts_inet_pton(af, src, dst): return _libzt.zts_inet_pton(af, src, dst) + diff --git a/src/bindings/python/zt.i b/src/bindings/python/zt.i index 390924f..6bba71c 100644 --- a/src/bindings/python/zt.i +++ b/src/bindings/python/zt.i @@ -33,6 +33,5 @@ %ignore zts_pollfd; %ignore zts_nfds_t; %ignore zts_msghdr; -%ignore zts_inet_addr; %include "ZeroTierSockets.h"