From 1a151d9e7cc8a45a32add472f6fadbc571518f01 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 23 Aug 2019 19:28:48 +0300
Subject: [PATCH] Correction for excessive ws header reads
---
components/net/cpp/src/peer.cpp | 7 ++++---
web-service/src/peer.js | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/components/net/cpp/src/peer.cpp b/components/net/cpp/src/peer.cpp
index 67d68ae52..5c7b9acdc 100644
--- a/components/net/cpp/src/peer.cpp
+++ b/components/net/cpp/src/peer.cpp
@@ -489,12 +489,12 @@ bool Peer::_data() {
UNIQUE_LOCK(recv_mtx_,lk);
- if (scheme_ == ftl::URI::SCHEME_WS) {
- LOG(INFO) << "Reading WS Header";
+ if (scheme_ == ftl::URI::SCHEME_WS && !ws_read_header_) {
+ //LOG(INFO) << "Reading WS Header";
wsheader_type ws;
ws.header_size = 0;
if (ws_parse(recv_buf_, ws) < 0) {
- LOG(ERROR) << "Bad WS header " << ws.header_size;
+ //LOG(ERROR) << "Bad WS header " << ws.header_size;
is_waiting_ = true;
return false;
}
@@ -505,6 +505,7 @@ bool Peer::_data() {
is_waiting_ = true;
return false;
}
+ ws_read_header_ = false;
lk.unlock();
diff --git a/web-service/src/peer.js b/web-service/src/peer.js
index ab8987f2c..505f53675 100644
--- a/web-service/src/peer.js
+++ b/web-service/src/peer.js
@@ -81,6 +81,7 @@ Peer.uuid = my_uuid;
Peer.prototype._dispatchNotification = function(name, args) {
if (this.bindings.hasOwnProperty(name)) {
+ console.log("Notification for: ", name);
this.bindings[name].apply(this, args);
} else {
console.log("Missing handler for: ", name);
--
GitLab