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

Changed references to vs->state to use guarded getters and setters in picoTCP driver

Browse Source
This commit is contained in:
Joseph Henry
2017-09-19 11:27:37 -07:00
parent 109162841d
commit bbc713d9e2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/picoTCP.cpp
View File

@@ -470,7 +470,7 @@ namespace ZeroTier {
// may now be issued in order to accept the incoming VirtualSocket from a remote host. // may now be issued in order to accept the incoming VirtualSocket from a remote host.
if (ev & PICO_SOCK_EV_CONN) { if (ev & PICO_SOCK_EV_CONN) {
DEBUG_EXTRA("PICO_SOCK_EV_CONN"); DEBUG_EXTRA("PICO_SOCK_EV_CONN");
if (vs->state == VS_STATE_LISTENING) { if (vs->get_state() == VS_STATE_LISTENING) {
uint16_t port; uint16_t port;
struct pico_socket *client_psock = nullptr; struct pico_socket *client_psock = nullptr;
struct pico_ip4 orig4; struct pico_ip4 orig4;
@@ -529,9 +529,9 @@ namespace ZeroTier {
vs->_AcceptedConnections.push(new_vs); vs->_AcceptedConnections.push(new_vs);
new_vs->sock = new_vs->tap->_phy.wrapSocket(new_vs->sdk_fd, new_vs); new_vs->sock = new_vs->tap->_phy.wrapSocket(new_vs->sdk_fd, new_vs);
} }
if (vs->state != VS_STATE_LISTENING) { if (vs->get_state() != VS_STATE_LISTENING) {
// set state so socket multiplexer logic will pick this up // set state so socket multiplexer logic will pick this up
vs->state = VS_STATE_UNHANDLED_CONNECTED; vs->set_state(VS_STATE_UNHANDLED_CONNECTED);
} }
} }
// PICO_SOCK_EV_RD - triggered when new data arrives on the socket. A new receive action // PICO_SOCK_EV_RD - triggered when new data arrives on the socket. A new receive action
@@ -882,7 +882,7 @@ namespace ZeroTier {
vs->picosock, err, pico_err, beautify_pico_error(pico_err)); vs->picosock, err, pico_err, beautify_pico_error(pico_err));
return map_pico_err_to_errno(pico_err); return map_pico_err_to_errno(pico_err);
} }
vs->state = VS_STATE_LISTENING; vs->set_state(VS_STATE_LISTENING);
return ZT_ERR_OK; return ZT_ERR_OK;
} }
@@ -925,7 +925,7 @@ namespace ZeroTier {
handle_general_failure(); handle_general_failure();
return -1; return -1;
} }
if (vs->picosock->state & PICO_SOCKET_STATE_CLOSED) { if (vs->picosock->state == PICO_SOCKET_STATE_CLOSED) {
DEBUG_ERROR("socket is CLOSED, this wrpico_cb_tcp_writeite() will fail"); DEBUG_ERROR("socket is CLOSED, this wrpico_cb_tcp_writeite() will fail");
return -1; return -1;
} }