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

Revert "#150 - cleaned up socket error messages"

Browse Source 
This reverts commit 293f92355a.
This commit is contained in:
Boston Walker
2021-12-29 16:23:54 -05:00
parent a4d2a83e7e
commit 3bb2dd4a52
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,6 +189,7 @@ ZTS_IOC_VOID = _libzt.ZTS_IOC_VOID
ZTS_IOC_OUT = _libzt.ZTS_IOC_OUT
ZTS_IOC_IN = _libzt.ZTS_IOC_IN
ZTS_IOC_INOUT = _libzt.ZTS_IOC_INOUT
class zts_node_info_t(object):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr

17
src/bindings/python/sockets.py
View File

@@ -6,22 +6,21 @@ import libzt
def handle_error(err):
"""Convert libzt error code to exception"""
if err == libzt.ZTS_ERR_SOCKET:
sock_err = errno()
if sock_err == libzt.zts_errno_t.ZTS_EAGAIN:
if errno() == libzt.ZTS_EAGAIN:
raise BlockingIOError()
if sock_err == libzt.zts_errno_t.ZTS_EINPROGRESS:
if errno() == libzt.ZTS_EINPROGRESS:
raise BlockingIOError()
if sock_err == libzt.zts_errno_t.ZTS_EALREADY:
if errno() == libzt.ZTS_EALREADY:
raise BlockingIOError()
if sock_err == libzt.zts_errno_t.ZTS_ECONNABORTED:
if errno() == libzt.ZTS_ECONNABORTED:
raise ConnectionAbortedError()
if sock_err == libzt.zts_errno_t.ZTS_ECONNREFUSED:
if errno() == libzt.ZTS_ECONNREFUSED:
raise ConnectionRefusedError()
if sock_err == libzt.zts_errno_t.ZTS_ECONNRESET:
if errno() == libzt.ZTS_ECONNRESET:
raise ConnectionResetError()
if sock_err == libzt.zts_errno_t.ZTS_ETIMEDOUT:
if errno() == libzt.ZTS_ETIMEDOUT:
raise TimeoutError()
raise ConnectionError(libzt.zts_errno_t(sock_err).name + " (" + str(sock_err) + ")")
raise Exception("ZTS_ERR_SOCKET (" + str(err) + ")")
if err == libzt.ZTS_ERR_SERVICE:
raise Exception("ZTS_ERR_SERVICE (" + str(err) + ")")
if err == libzt.ZTS_ERR_ARG: