Merge branch 'developer' into eiger

slsSupportLib/include/ClientSocket.h

@@ -15,6 +15,7 @@ class ClientSocket : public DataSocket {
     int sendCommandThenRead(int fnum, const void *args, size_t args_size,
                             void *retval, size_t retval_size);
 
+    std::string readErrorMessage();
   private:
     void readReply(int &ret, void *retval, size_t retval_size);
     struct sockaddr_in serverAddr {};

slsSupportLib/include/DataSocket.h

@@ -1,10 +1,12 @@
 #pragma once
 
+#include "TypeTraits.h"
 #include <cstddef>
 #include <cstdint>
 #include <netdb.h>
 #include <numeric>
 #include <string>
+#include <vector>
 namespace sls {
 
 /* Base class for TCP socket, this is used to send data between detector, client
@@ -24,9 +26,21 @@ class DataSocket {
     int getSocketId() const { return sockfd_; }
 
     int Send(const void *buffer, size_t size);
-    template <typename T> int Send(T &&data) {
+
+    // Send everything that is not a vector by using address and sizeof
+    // TODO! We probably should restrict this even more to avoid bugs when
+    // we send object instead of data
+    template <typename T>
+    typename std::enable_if<
+        !is_vector<typename std::remove_reference<T>::type>::value, int>::type
+    Send(T &&data) {
         return Send(&data, sizeof(data));
     }
+
+    template <typename T> int Send(const std::vector<T> &vec) {
+        return Send(vec.data(), sizeof(T) * vec.size());
+    }
+
     // Variadic template to send all arguments
     template <class... Args> int SendAll(Args &&... args) {
         auto l = std::initializer_list<int>{Send(args)...};
@@ -34,10 +48,16 @@ class DataSocket {
         return sum;
     }
     int Receive(void *buffer, size_t size);
+    
     template <typename T> int Receive(T &arg) {
         return Receive(&arg, sizeof(arg));
     }
 
+    template<typename T>
+    int Receive(std::vector<T>& buff){
+        return Receive(buff.data(), sizeof(T) * buff.size());
+    }
+
     template <typename T> T Receive() {
         T arg;
         Receive(&arg, sizeof(arg));

slsSupportLib/include/TypeTraits.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <type_traits>
+#include <vector>
 
 namespace sls {
 
@@ -62,14 +63,17 @@ template <typename T>
 struct is_container<
     T, typename std::conditional<
            false,
-           is_container_helper<typename T::value_type, typename T::size_type,
-                               typename T::iterator, typename T::const_iterator,
-                               decltype(std::declval<T>().size()),
-                               decltype(std::declval<T>().begin()),
-                               decltype(std::declval<T>().end()),
-                               decltype(std::declval<T>().cbegin()),
-                               decltype(std::declval<T>().cend()),
-                               decltype(std::declval<T>().empty())>,
+           is_container_helper<
+               typename std::remove_reference<T>::type::value_type,
+               typename std::remove_reference<T>::type::size_type,
+               typename std::remove_reference<T>::type::iterator,
+               typename std::remove_reference<T>::type::const_iterator,
+               decltype(std::declval<T>().size()),
+               decltype(std::declval<T>().begin()),
+               decltype(std::declval<T>().end()),
+               decltype(std::declval<T>().cbegin()),
+               decltype(std::declval<T>().cend()),
+               decltype(std::declval<T>().empty())>,
            void>::type> : public std::true_type {};
 
 /**
@@ -92,4 +96,9 @@ struct is_light_container<
                                decltype(std::declval<T>().end())>,
            void>::type> : public std::true_type {};
 
+template <typename T> struct is_vector : public std::false_type {};
+
+template <typename T>
+struct is_vector<std::vector<T>> : public std::true_type {};
+
 } // namespace sls

slsSupportLib/src/ClientSocket.cpp

@@ -101,4 +101,10 @@ void ClientSocket::readReply(int &ret, void *retval, size_t retval_size) {
     }
 }
 
+std::string ClientSocket::readErrorMessage(){
+    std::string error_msg(MAX_STR_LENGTH, '\0');
+    Receive(&error_msg[0], error_msg.size());
+    return error_msg;
+}
+
 }; // namespace sls