Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

pmd: fix stray client-only

Browse source 
Fix wrong loglevels on some pmd debug stuff

Small cosmetic cleaning
This commit is contained in:
Andy Green 2018-06-30 09:37:57 +08:00
parent 5af32fe27d
commit 8ed4574d36
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/roles/ws/ext/extension-permessage-deflate.c
View file

@ -382,7 +382,7 @@ lws_extension_callback_pm_deflate(struct lws_context *context,
* we can get a situation he took something in
* but did not generate anything out, at the end
* of a message (eg, next thing he sends is 80
* 00, a zero length FIN, like Authobahn can
* 00, a zero length FIN, like Autobahn can
* send).
* If we have come back as a FIN, we must not
* place the pending trailer 00 00 FF FF, just
@ -398,8 +398,7 @@ lws_extension_callback_pm_deflate(struct lws_context *context,
}
}
priv->compressed_out = 1;
ebuf->len = lws_ptr_diff(priv->tx.next_out,
ebuf->token);
ebuf->len = lws_ptr_diff(priv->tx.next_out, ebuf->token);
/*
* we must announce in our returncode now if there is more

5
lib/roles/ws/ext/extension.c
View file

@ -263,9 +263,10 @@ lws_issue_raw_ext_access(struct lws *wsi, unsigned char *buf, size_t len)
/* always either sent it all or privately buffered */
if (wsi->ws->clean_buffer)
len = n;
}
lwsl_parser("written %d bytes to client\n", n);
lwsl_ext("%s: written %d bytes to client\n",
__func__, n);
}
/* no extension has more to spill? Then we can go */

14
lib/roles/ws/ops-ws.c
View file

@ -1280,7 +1280,7 @@ int rops_handle_POLLOUT_ws(struct lws *wsi)
* payload ordering, but since they are always complete
* fragments control packets can interleave OK.
*/
if (lwsi_role_client(wsi) && wsi->ws->tx_draining_ext) {
if (wsi->ws->tx_draining_ext) {
lwsl_ext("SERVICING TX EXT DRAINING\n");
if (lws_write(wsi, NULL, 0, LWS_WRITE_CONTINUATION) < 0)
return LWS_HP_RET_BAIL_DIE;
@ -1290,8 +1290,10 @@ int rops_handle_POLLOUT_ws(struct lws *wsi)
/* Priority 6: extensions
*/
if (!wsi->ws->extension_data_pending)
if (!wsi->ws->extension_data_pending && !wsi->ws->tx_draining_ext) {
lwsl_ext("%s: !wsi->ws->extension_data_pending\n", __func__);
return LWS_HP_RET_USER_SERVICE;
}
/*
* check in on the active extensions, see if they
@ -1508,7 +1510,7 @@ rops_close_role_ws(struct lws_context_per_thread *pt, struct lws *wsi)
if (wsi->ws->tx_draining_ext) {
struct lws **w = &pt->ws.tx_draining_ext_list;
lwsl_notice("%s: CLEARING tx_draining_ext\n", __func__);
lwsl_ext("%s: CLEARING tx_draining_ext\n", __func__);
wsi->ws->tx_draining_ext = 0;
/* remove us from context draining ext list */
while (*w) {
@ -1559,7 +1561,7 @@ rops_write_role_protocol_ws(struct lws *wsi, unsigned char *buf, size_t len,
/* remove us from the list */
struct lws **w = &pt->ws.tx_draining_ext_list;
lwsl_notice("%s: CLEARING tx_draining_ext\n", __func__);
lwsl_ext("%s: CLEARING tx_draining_ext\n", __func__);
wsi->ws->tx_draining_ext = 0;
/* remove us from context draining ext list */
while (*w) {
@ -1584,7 +1586,7 @@ rops_write_role_protocol_ws(struct lws *wsi, unsigned char *buf, size_t len,
if (!(wpt & LWS_WRITE_NO_FIN) && len)
*wp &= ~LWS_WRITE_NO_FIN;
lwsl_notice("FORCED draining wp to 0x%02X (stashed 0x%02X, incoming 0x%02X)\n", *wp,
lwsl_ext("FORCED draining wp to 0x%02X (stashed 0x%02X, incoming 0x%02X)\n", *wp,
wsi->ws->tx_draining_stashed_wp, wpt);
// assert(0);
}
@ -1640,7 +1642,7 @@ rops_write_role_protocol_ws(struct lws *wsi, unsigned char *buf, size_t len,
// lwsl_notice("ext processed %d plaintext into %d compressed (wp 0x%x)\n", m, (int)ebuf.len, *wp);
if (n && ebuf.len) {
lwsl_notice("write drain len %d (wp 0x%x) SETTING tx_draining_ext\n", (int)ebuf.len, *wp);
lwsl_ext("write drain len %d (wp 0x%x) SETTING tx_draining_ext\n", (int)ebuf.len, *wp);
/* extension requires further draining */
wsi->ws->tx_draining_ext = 1;
wsi->ws->tx_draining_ext_list = pt->ws.tx_draining_ext_list;