Skip to content

Commit f3661e3

Browse files
google-labs-jules[bot]lws-team
authored andcommitted
Fix deaddrop connection stability and UI flash
1 parent f9242a5 commit f3661e3

7 files changed

Lines changed: 501 additions & 393 deletions

File tree

lib/core-net/wsi-timeout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ lws_set_timeout_us(struct lws *wsi, enum pending_timeout reason, lws_usec_t us)
194194
__lws_sul_insert_us(&pt->pt_sul_owner[LWSSULLI_MISS_IF_SUSPENDED],
195195
&wsi->sul_timeout, us);
196196

197-
lwsl_wsi_notice(wsi, "%llu us, reason %d",
197+
lwsl_wsi_info(wsi, "%llu us, reason %d",
198198
(unsigned long long)us, reason);
199199

200200
wsi->pending_timeout = (char)reason;

lib/core/context.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,8 +1177,8 @@ lws_create_context(const struct lws_context_creation_info *info)
11771177
context->default_retry.retry_ms_table_count =
11781178
LWS_ARRAY_SIZE(default_backoff_table);
11791179
context->default_retry.jitter_percent = 20;
1180-
context->default_retry.secs_since_valid_ping = 300;
1181-
context->default_retry.secs_since_valid_hangup = 310;
1180+
context->default_retry.secs_since_valid_ping = 40;
1181+
context->default_retry.secs_since_valid_hangup = 50;
11821182

11831183
if (info->retry_and_idle_policy &&
11841184
info->retry_and_idle_policy->secs_since_valid_ping) {

lib/roles/h2/http2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1983,7 +1983,7 @@ lws_h2_parse_end_of_frame(struct lws *wsi)
19831983
break;
19841984

19851985
case LWS_H2_FRAME_TYPE_GOAWAY:
1986-
lwsl_notice("GOAWAY: last sid %u, error 0x%08X, string '%s'\n",
1986+
lwsl_wsi_notice(wsi, "RX GOAWAY: last sid %u, error 0x%08X, string '%s'\n",
19871987
(unsigned int)h2n->goaway_last_sid,
19881988
(unsigned int)h2n->goaway_err, h2n->goaway_str);
19891989

lib/roles/ws/ops-ws.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,18 +2118,24 @@ rops_issue_keepalive_ws(struct lws *wsi, int isvalid)
21182118
encapsulation_parent(wsi);
21192119

21202120
assert(enc);
2121+
lwsl_wsi_info(wsi, "trying to do keepalive on h2 wrapper around ws");
21212122
if (lws_rops_func_fidx(enc->role_ops, LWS_ROPS_issue_keepalive).
2122-
issue_keepalive(enc, isvalid))
2123+
issue_keepalive(enc, isvalid)) {
2124+
lwsl_wsi_err(wsi, "FAILED to keep h2 wrapper for ws alive");
21232125
return 1;
2126+
}
21242127
}
21252128
#endif
21262129

2127-
if (isvalid)
2130+
if (isvalid) {
2131+
lwsl_wsi_info(wsi, "confirming validity");
21282132
_lws_validity_confirmed_role(wsi);
2129-
else {
2133+
} else {
21302134
us = (uint64_t)lws_now_usecs();
21312135
memcpy(&wsi->ws->ping_payload_buf[LWS_PRE], &us, 8);
21322136
wsi->ws->send_check_ping = 1;
2137+
lwsl_wsi_info(wsi, "requesting send ping on ws");
2138+
21332139
lws_callback_on_writable(wsi);
21342140
}
21352141

plugins/deaddrop/assets/deaddrop.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ table {
6666
transition: background-color 0.5s ease;
6767
}
6868
table.nb { border: 0px; border-radius: 0px; transition: opacity 0.5s; }
69-
table.noconn { background-color: #ddd; width: 100%; }
69+
table.noconn { background-color: #ddd; }
7070

7171
div { transition: opacity 0.5s; }
7272
div.da { padding-left: 20px; padding-right:20px; }

plugins/deaddrop/assets/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<body>
88
<div class="title"><img src="/docrepo.svg"> Deaddrop</div>
99
<div class="uplbox">
10-
<table id="ddrop" class="noconn">
10+
<table id="ddrop">
1111
<tr>
1212
<th>Drag and drop files</th>
1313
<th>Paste text to upload:</th>

0 commit comments

Comments
 (0)