From d4402ce382c42aae11b19599bd91f9e4d93b541c Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 24 Mar 2021 18:36:38 +0100
Subject: [PATCH] fix memleak
---
common/cpp/CMakeLists.txt | 3 ++-
common/cpp/include/asapo/common/networking.h | 1 +
common/cpp/include/asapo/common/version.h.in | 1 -
examples/consumer/getnext/getnext.cpp | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/cpp/CMakeLists.txt b/common/cpp/CMakeLists.txt
index f59ad1bcf..4f29376de 100644
--- a/common/cpp/CMakeLists.txt
+++ b/common/cpp/CMakeLists.txt
@@ -20,7 +20,8 @@ endif()
install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/common
DESTINATION include/asapo
- PATTERN "*.h.in" EXCLUDE)
+ PATTERN "*.h.in" EXCLUDE
+ PATTERN "*/internal" EXCLUDE)
install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/logger
DESTINATION include/asapo )
diff --git a/common/cpp/include/asapo/common/networking.h b/common/cpp/include/asapo/common/networking.h
index 87346e915..79f29abb4 100644
--- a/common/cpp/include/asapo/common/networking.h
+++ b/common/cpp/include/asapo/common/networking.h
@@ -68,6 +68,7 @@ struct GenericRequestHeader {
op_code{i_op_code}, data_id{i_data_id}, data_size{i_data_size}, meta_size{i_meta_size} {
strncpy(message, i_message.c_str(), kMaxMessageSize);
strncpy(stream, i_stream.c_str(), kMaxMessageSize);
+ strncpy(api_version,"v0.0", kMaxVersionSize);
}
Opcode op_code;
diff --git a/common/cpp/include/asapo/common/version.h.in b/common/cpp/include/asapo/common/version.h.in
index 0eff85ff8..5edb453a4 100644
--- a/common/cpp/include/asapo/common/version.h.in
+++ b/common/cpp/include/asapo/common/version.h.in
@@ -29,7 +29,6 @@ inline std::string GetRdsApiVersion() {
return "@ASAPO_RDS_API_VER@";
}
-
inline int VersionToNumber(const std::string& version) {
return int(atof(version.c_str()+2)*1000);
}
diff --git a/examples/consumer/getnext/getnext.cpp b/examples/consumer/getnext/getnext.cpp
index 495c137fd..ae48a1a29 100644
--- a/examples/consumer/getnext/getnext.cpp
+++ b/examples/consumer/getnext/getnext.cpp
@@ -19,6 +19,7 @@ std::mutex lock;
uint64_t file_size = 0;
+
inline std::string ConnectionTypeToString(asapo::NetworkConnectionType type) {
switch (type) {
case asapo::NetworkConnectionType::kUndefined:
--
GitLab