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

8
src/bindings/python/PythonSockets.cpp
View File

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

15
src/bindings/python/libzt.py
View File

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

1
src/bindings/python/zt.i
View File

@@ -33,6 +33,5 @@
%ignore zts_pollfd;
%ignore zts_nfds_t;
%ignore zts_msghdr;
%ignore zts_inet_addr;
%include "ZeroTierSockets.h"