Skip to content

Move event triggers to after the connection timer is reset #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
felippeduran wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move event triggers to after the connection timer is reset #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/tr/uv/tr_uv_tcp_aux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,8 +957,8 @@ void tcp__on_data_recieved(tr_uv_tcp_transport_t* tt, const char* data, size_t l
void tcp__on_kick_recieved(tr_uv_tcp_transport_t* tt)
{
pc_lib_log(PC_LOG_INFO, "tcp__on_kick_recieved - kicked by server");
pc_trans_fire_event(tt->client, PC_EV_KICKED_BY_SERVER, NULL, NULL);
tt->reset_fn(tt);
pc_trans_fire_event(tt->client, PC_EV_KICKED_BY_SERVER, NULL, NULL);
}

void tcp__send_handshake(tr_uv_tcp_transport_t* tt)
Expand Down Expand Up @@ -1073,28 +1073,28 @@ void tcp__on_handshake_resp(tr_uv_tcp_transport_t* tt, const char* data, size_t

if (!res) {
pc_lib_log(PC_LOG_ERROR, "tcp__on_handshake_resp - handshake resp is not valid json");
pc_trans_fire_event(tt->client, PC_EV_CONNECT_FAILED, "Handshake Error", NULL);
tt->reset_fn(tt);
pc_trans_fire_event(tt->client, PC_EV_CONNECT_FAILED, "Handshake Error", NULL);
return ;
}

tmp = pc_JSON_GetObjectItem(res, "code");

if (!tmp || tmp->type != pc_JSON_Number || (code = tmp->valueint) != PC_HANDSHAKE_OK) {
pc_lib_log(PC_LOG_ERROR, "tcp__on_handshake_resp - handshake fail, code: %d", code);
tt->reset_fn(tt);
pc_trans_fire_event(tt->client, PC_EV_CONNECT_FAILED, "Handshake Error", NULL);
pc_JSON_Delete(res);
tt->reset_fn(tt);
return ;
}

/* we just use sys here, ignore user field. */
sys = pc_JSON_GetObjectItem(res, "sys");
if (!sys) {
pc_lib_log(PC_LOG_ERROR, "tcp__on_handshake_resp - handshake fail, no sys field");
tt->reset_fn(tt);
pc_trans_fire_event(tt->client, PC_EV_CONNECT_FAILED, "Handshake Error", NULL);
pc_JSON_Delete(res);
tt->reset_fn(tt);
return ;
}

Expand Down
5 changes: 3 additions & 2 deletions src/tr/uv/tr_uv_tls_aux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,10 @@ static void tls__emit_error_event(tr_uv_tls_transport_t* tls)

if (!tls->is_handshake_completed) {
/* won't reconnect if tls handshake failed */
pc_trans_fire_event(tt->client, PC_EV_CONNECT_FAILED, "TLS Handshake Error", NULL);
tt->reset_fn(tt);
pc_trans_fire_event(tt->client, PC_EV_CONNECT_FAILED, "TLS Handshake Error", NULL);
} else {
tt->reset_fn(tt);
pc_trans_fire_event(tt->client, PC_EV_UNEXPECTED_DISCONNECT, "TLS Error", NULL);
tt->reconn_fn(tt);
}
Expand Down Expand Up @@ -273,8 +274,8 @@ static void tls__write_to_bio(tr_uv_tls_transport_t* tls)
if (!tls->is_handshake_completed) {
if (!tls__public_key_pinned(tls)) {
pc_lib_log(PC_LOG_ERROR, "Public key is not pinned.");
pc_trans_fire_event(tt->client, PC_EV_CONNECT_FAILED, "Public key from server is not pinned.", NULL);
tt->reset_fn(tt);
pc_trans_fire_event(tt->client, PC_EV_CONNECT_FAILED, "Public key from server is not pinned.", NULL);
return;
}

Expand Down