code cleaning

CMakeLists.txt

 cmake_minimum_required(VERSION 3.9)
 project(Redis_Receiver)
 
-set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 option(REDISRECEIVER_BUILD_SHARED "Build Redisreceiver as a shared library." OFF)
 

Base-DAQ @ 8a0ea2d0

-Subproject commit 61d651c4f8cc0f06c41a4797723546ccdb6022d0
+Subproject commit 8a0ea2d0e699863df5fe1c91caf2d7b0855957be

include/Redis_Receiver.h

-/*
- *
- *  Created on: Mar 1, 2021
- *      Author: astrisw
- */
+
 #pragma once
 
 #include <Base_Configurator.h>
 #include <hiredis/hiredis.h>
-#include "../deps/Base-DAQ/include/Base_Receiver.h"
+#include <Base_Receiver.h>
+
 
-/*
- * class RedisReceiver
- * Implementation of a Redis packet Receiver
- */
 namespace inaf::oasbo::Receivers {
 
 class RedisReceiver: public BaseReceiver {

include/Redis_Receiver_Configurator.h

-
-#ifndef REDISRECEIVERCONFIGURATOR_H_
-#define REDISRECEIVERCONFIGURATOR_H_
-
-#include <Base_Configurator.h>
-#include <Redis_Receiver.h>
-
-namespace inaf::oasbo::Receivers{
-
-
-class RedisReceiverConfigurator : public BaseConfigurator{
-
-public:
-	RedisReceiverConfigurator(int argc, char **argv);
-	RedisReceiverConfigurator();
-
-	void setRedisIP(std::string val){this->params["redisIP"] = val;}
-	void setRedisPort(int val){this->params["redisPort"] = std::to_string(val);}
-	void setRedisKey(std::string val){this->params["redisKey"] = val;}
-
-
-	std::map<std::string,std::string> getParams(){return this->params;}
-	std::string getRedisIP(){return this->params["redisIP"];}
-	int getRedisPort(){return std::stoi(this->params["redisPort"]);}
-	std::string getRedisKey(){return this->params["redisKey"];}
-
-
-	BaseProtocol * createReceiver();
-	RedisReceiver * createRedisReceiver();
-	void createRedisReceiver(RedisReceiver &);
-
-
-	void printConfiguration(){
-		std::string confStr = "Redis Receiver Configuration:\n" + this->toString();
-		std::cout << confStr << std::endl;
-	}
-
-};
-}
-#endif

src/Redis_Receiver.cpp

@@ -8,9 +8,9 @@
 #include <sstream>
 #include <regex>
 
-#include <iostream>       // std::cout, std::endl
-#include <thread>         // std::this_thread::sleep_for
-#include <chrono>         // std::chrono::seconds
+#include <iostream>
+#include <thread>
+#include <chrono>
 #include <ctime>
 #include <iomanip>
 
@@ -109,12 +109,12 @@ int RedisReceiver::receiveFromClient(PacketLib::BasePacket &pack) {
 			freeReplyObject(r);
 			return -1;
 		}
-		pack.copyToBinaryPointer(reinterpret_cast<uint8_t*>(r->str),
+		pack.copyToMemory(reinterpret_cast<uint8_t*>(r->str),
 				header_size);
 		ssize_t tot_packet_size = pack.getHeaderSize() + pack.getPayloadSize()
 				+ pack.getTailSize();
 
-		if (!pack.isRecognizedHeader() || size < (tot_packet_size)) {
+		if (!pack.hasRecognizedHeader() || size < (tot_packet_size)) {
 			time_t now = time(nullptr);
 			std::cerr << "["
 					<< std::put_time(localtime(&now), "%Y-%m-%d %H:%M:%S")
@@ -126,7 +126,7 @@ int RedisReceiver::receiveFromClient(PacketLib::BasePacket &pack) {
 			return -1;
 		}
 
-		pack.copyToBinaryPointer(reinterpret_cast<uint8_t*>(r->str), size);
+		pack.copyToMemory(reinterpret_cast<uint8_t*>(r->str), size);
 		freeReplyObject(r);
 		return size;
 	}
@@ -208,6 +208,6 @@ void RedisReceiver::resetPacket(PacketLib::BasePacket &pack, int bytes) {
 	std::memset(buff, 0, bytes);
 	int toBeReset = std::min(
 			static_cast<int>(pack.getPacketStructureByteSize()), bytes);
-	pack.copyToBinaryPointer(buff, toBeReset);
+	pack.copyToMemory(buff, toBeReset);
 	delete[] buff;
 }