From 820598c1799f38ae93406a70e368625d8818dfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 25 Apr 2016 12:43:49 -0400
Subject: [PATCH] network engine: change sendError message argument to
std::string
---
include/opendht/network_engine.h | 2 +-
src/network_engine.cpp | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/opendht/network_engine.h b/include/opendht/network_engine.h
index ec4f7e74..ace4b6d0 100644
--- a/include/opendht/network_engine.h
+++ b/include/opendht/network_engine.h
@@ -563,7 +563,7 @@ private:
socklen_t salen,
TransId tid,
uint16_t code,
- const char *message,
+ const std::string& message,
bool include_id=false);
RequestAnswer deserializeNodesValues(ParsedMessage& msg);
diff --git a/src/network_engine.cpp b/src/network_engine.cpp
index 4dc267b8..09b0ac0f 100644
--- a/src/network_engine.cpp
+++ b/src/network_engine.cpp
@@ -708,7 +708,7 @@ NetworkEngine::sendError(const sockaddr* sa,
socklen_t salen,
TransId tid,
uint16_t code,
- const char *message,
+ const std::string& message,
bool include_id) {
msgpack::sbuffer buffer;
msgpack::packer<msgpack::sbuffer> pk(&buffer);
@@ -716,8 +716,7 @@ NetworkEngine::sendError(const sockaddr* sa,
pk.pack(std::string("e")); pk.pack_array(2);
pk.pack(code);
- pk.pack_str(strlen(message));
- pk.pack_str_body(message, strlen(message));
+ pk.pack(message);
if (include_id) {
pk.pack(std::string("r")); pk.pack_map(1);
--
GitLab