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

Added return values to zts_start() and zts_simple_start(). Also Fixed signed comparison warnings in ztproxy when compiling under Windows

Browse Source
This commit is contained in:
Joseph Henry
2017-10-10 14:20:20 -07:00
parent 9b9aa108c2
commit 08b7ccb921
29 changed files with 83768 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/ZT1Service.h
View File

@@ -103,7 +103,7 @@ void disableTaps();
* @param addrlen
* @return
*/
void zts_get_ipv4_address(const char *nwid, char *addrstr, const int addrlen);
void zts_get_ipv4_address(const char *nwid, char *addrstr, const size_t addrlen);
/**
* @brief Gets the VirtualTap's (interface) IPv6 address
@@ -114,7 +114,7 @@ void zts_get_ipv4_address(const char *nwid, char *addrstr, const int addrlen);
* @param addrlen
* @return
*/
void zts_get_ipv6_address(const char *nwid, char *addrstr, const int addrlen);
void zts_get_ipv6_address(const char *nwid, char *addrstr, const size_t addrlen);
/**
* @brief Returns whether the VirtualTap has an assigned IPv4 address
@@ -198,9 +198,9 @@ int zts_running();
* that one call this at the beginning of your application code since it may take several seconds to fully
* come online.
* @param path Where this instance of ZeroTier will store its identity and configuration files
* @return
* @return Returns 1 if ZeroTier is currently running, and 0 if it is not
*/
void zts_start(const char *path);
int zts_start(const char *path);
/**
* @brief Alternative to zts_start(). Start an instance of libzt, wait for an address to be issues, and join
@@ -211,15 +211,15 @@ void zts_start(const char *path);
* come online.
* @param path
* @param nwid A 16-digit hexidecimal virtual network ID
* @return
* @return Returns 0 on success, -1 on failure
*/
void zts_simple_start(const char *path, const char *nwid);
int zts_simple_start(const char *path, const char *nwid);
/**
* @brief Stops libzt (ZeroTier core services, stack drivers, stack threads, etc)
*
* @usage This should be called at the end of your program or when you do not anticipate communicating over ZeroTier
* @return
* @return Returns 0 on success, -1 on failure
*/
void zts_stop();
@@ -231,7 +231,7 @@ void zts_stop();
* @param len
* @return
*/
void zts_get_homepath(char *homePath, int len);
void zts_get_homepath(char *homePath, size_t len);
/**
* @brief Copies the hexidecimal representation of this nodeID into the provided buffer

11
include/libzt.h
View File

@@ -53,7 +53,6 @@ extern "C" {
#endif
// forward declarations from ZT1Service.h
void zts_simple_start(const char *path, const char *nwid);
int zts_get_device_id(char *devID);
void init_network_stack();
@@ -71,7 +70,7 @@ void init_network_stack();
* @param nwid A 16-digit hexidecimal network identifier (e.g. Earth: `8056c2e21c000001`)
* @return 0 if successful; or 1 if failed
*/
void zts_start(const char *path);
int zts_start(const char *path);
/**
* @brief Starts libzt
@@ -86,7 +85,7 @@ void zts_start(const char *path);
* @param nwid A 16-digit hexidecimal network identifier (e.g. Earth: `8056c2e21c000001`)
* @return 0 if successful; or 1 if failed
*/
void zts_simple_start(const char *path, const char *nwid);
int zts_simple_start(const char *path, const char *nwid);
/**
* @brief Stops the ZeroTier core service and disconnects from all virtual networks
@@ -143,7 +142,7 @@ void zts_leave_soft(const char * filepath, const char * nwid);
* @param len
* @return
*/
void zts_get_homepath(char *homePath, const int len);
void zts_get_homepath(char *homePath, const size_t len);
/**
* @brief Get device ID (10-digit hex + NULL byte)
@@ -198,7 +197,7 @@ int zts_has_address(const char *nwid);
* @param addrlen
* @return
*/
void zts_get_ipv4_address(const char *nwid, char *addrstr, const int addrlen);
void zts_get_ipv4_address(const char *nwid, char *addrstr, const size_t addrlen);
/**
* @brief Get IPV6 Address for this device on a given network
@@ -209,7 +208,7 @@ void zts_get_ipv4_address(const char *nwid, char *addrstr, const int addrlen);
* @param addrlen
* @return
*/
void zts_get_ipv6_address(const char *nwid, char *addrstr, const int addrlen);
void zts_get_ipv6_address(const char *nwid, char *addrstr, const size_t addrlen);
/**
* @brief Returns a 6PLANE IPv6 address given a network ID and zerotier ID