gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove networking functions that can be found elsewhere

Browse Source
This commit is contained in:
Joseph Henry
2021-03-15 01:59:18 -07:00
parent 986828a51f
commit 2a515822c8
13 changed files with 259 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
include/ZeroTierSockets.h
View File

@@ -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