This is an automated email from the ASF dual-hosted git repository. phrocker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 50091bfbccab140f7051b16c06ec3a7b305899b7 Author: Arpad Boda <[email protected]> AuthorDate: Tue Jun 4 14:59:39 2019 +0200 MINIFICPP-715 - RawSiteToSite: initiateResourceNegotiation functions returns success in case of uknown protocol This closes #581. Signed-off-by: Marc Parisi <[email protected]> --- libminifi/src/sitetosite/RawSocketProtocol.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libminifi/src/sitetosite/RawSocketProtocol.cpp b/libminifi/src/sitetosite/RawSocketProtocol.cpp index 008bf91..4a700c2 100644 --- a/libminifi/src/sitetosite/RawSocketProtocol.cpp +++ b/libminifi/src/sitetosite/RawSocketProtocol.cpp @@ -157,18 +157,15 @@ bool RawSiteToSiteClient::initiateResourceNegotiation() { return initiateResourceNegotiation(); } } - ret = -1; + logger_->log_error("Site2Site Negotiate protocol failed to find a common version with server"); return false; case NEGOTIATED_ABORT: - logger_->log_warn("Site2Site Negotiate protocol response ABORT"); - ret = -1; + logger_->log_error("Site2Site Negotiate protocol response ABORT"); return false; default: - logger_->log_warn("Negotiate protocol response unknown code %d", statusCode); - return true; + logger_->log_error("Negotiate protocol response unknown code %d", statusCode); + return false; } - - return true; } bool RawSiteToSiteClient::initiateCodecResourceNegotiation() { @@ -220,18 +217,15 @@ bool RawSiteToSiteClient::initiateCodecResourceNegotiation() { return initiateCodecResourceNegotiation(); } } - ret = -1; + logger_->log_error("Site2Site Negotiate codec failed to find a common version with server"); return false; case NEGOTIATED_ABORT: logger_->log_error("Site2Site Codec Negotiate response ABORT"); - ret = -1; return false; default: logger_->log_error("Negotiate Codec response unknown code %d", statusCode); - return true; + return false; } - - return true; } bool RawSiteToSiteClient::handShake() {
