send string

slsReceiverSoftware/src/ClientInterface.cpp

@@ -797,58 +797,41 @@ int ClientInterface::stop_receiver(Interface &socket) {
 }
 
 int ClientInterface::set_file_dir(Interface &socket) {
-    char fPath[MAX_STR_LENGTH]{};
+    std::string fpath = socket.Receive(MAX_STR_LENGTH);
-    char retval[MAX_STR_LENGTH]{};
-    socket.Receive(fPath);
 
-    if (strlen(fPath) == 0) {
+    if (fpath.empty()) {
         throw RuntimeError("Cannot set empty file path");
     }
-    if (fPath[0] != '/')
+    if (fpath[0] != '/')
         throw RuntimeError("Receiver path needs to be absolute path");
-    LOG(logDEBUG1) << "Setting file path: " << fPath;
-    impl()->setFilePath(fPath);
-
-    std::string s = impl()->getFilePath();
-    sls::strcpy_safe(retval, s.c_str());
-    if ((s.empty()) || (strlen(fPath) && strcasecmp(fPath, retval)))
-        throw RuntimeError("Receiver file path does not exist");
-    else
-        LOG(logDEBUG1) << "file path:" << retval;
         
+    LOG(logDEBUG1) << "Setting file path: " << fpath;
+    impl()->setFilePath(fpath);
     return socket.Send(OK);
 }
 
 int ClientInterface::get_file_dir(Interface &socket) {
-    char retval[MAX_STR_LENGTH]{};
+    auto fpath = impl()->getFilePath();
-    std::string s = impl()->getFilePath();
+    LOG(logDEBUG1) << "file path:" << fpath;
-    sls::strcpy_safe(retval, s.c_str());
+    fpath.resize(MAX_STR_LENGTH);
-    LOG(logDEBUG1) << "file path:" << retval;
+    return socket.sendResult(fpath);
-    return socket.sendResult(retval);
 }
 
 int ClientInterface::set_file_name(Interface &socket) {
-    char fName[MAX_STR_LENGTH]{};
+    std::string fname = socket.Receive(MAX_STR_LENGTH);
-    char retval[MAX_STR_LENGTH]{};
+    if (fname.empty()) {
-    socket.Receive(fName);
-    if (strlen(fName) == 0) {
         throw RuntimeError("Cannot set empty file name");
     }
-    LOG(logDEBUG1) << "Setting file name: " << fName;
+    LOG(logDEBUG1) << "Setting file name: " << fname;
-    impl()->setFileName(fName);
+    impl()->setFileName(fname);
-
-    std::string s = impl()->getFileName();
-    sls::strcpy_safe(retval, s.c_str());
-    LOG(logDEBUG1) << "file name:" << retval;
     return socket.Send(OK);
 }
 
 int ClientInterface::get_file_name(Interface &socket) {
-    char retval[MAX_STR_LENGTH]{};
+    auto fname = impl()->getFileName();
-    std::string s = impl()->getFileName();
+    LOG(logDEBUG1) << "file name:" << fname;
-    sls::strcpy_safe(retval, s.c_str());
+    fname.resize(MAX_STR_LENGTH);
-    LOG(logDEBUG1) << "file name:" << retval;
+    return socket.sendResult(fname);
-    return socket.sendResult(retval);
 }
 
 int ClientInterface::set_file_index(Interface &socket) {

slsSupportLib/include/DataSocket.h

@@ -3,6 +3,7 @@
 #include "TypeTraits.h"
 #include <cstddef>
 #include <cstdint>
+#include <iostream>
 #include <netdb.h>
 #include <numeric>
 #include <string>
@@ -27,12 +28,16 @@ class DataSocket {
 
     int Send(const void *buffer, size_t size);
 
-    // Send everything that is not a vector by using address and sizeof
+    // Send everything that is not a vector or string 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
+        !is_vector<typename std::remove_reference<T>::type>::value &&
+            !std::is_same<typename std::remove_reference<T>::type,
+                          std::string>::value,
+        int>::type
     Send(T &&data) {
         return Send(&data, sizeof(data));
     }
@@ -41,6 +46,8 @@ class DataSocket {
         return Send(vec.data(), sizeof(T) * vec.size());
     }
 
+    int Send(const std::string &s);
+
     // Variadic template to send all arguments
     template <class... Args> int SendAll(Args &&... args) {
         auto l = std::initializer_list<int>{Send(args)...};
@@ -53,8 +60,7 @@ class DataSocket {
         return Receive(&arg, sizeof(arg));
     }
 
-    template<typename T>
+    template <typename T> int Receive(std::vector<T> &buff) {
-    int Receive(std::vector<T>& buff){
         return Receive(buff.data(), sizeof(T) * buff.size());
     }
 
@@ -64,6 +70,8 @@ class DataSocket {
         return arg;
     }
 
+    std::string Receive(size_t length);
+
     int read(void *buffer, size_t size);
     int write(void *buffer, size_t size);
     int setTimeOut(int t_seconds);

slsSupportLib/src/DataSocket.cpp

@@ -63,6 +63,14 @@ int DataSocket::Receive(void *buffer, size_t size) {
     }
 }
 
+std::string DataSocket::Receive(size_t length) {
+    std::string buff(length, '\0');
+    Receive(&buff[0], buff.size());
+    auto pos = buff.find('\0');
+    if (pos != std::string::npos)
+        buff.erase(pos);
+    return buff;
+}
 int DataSocket::Send(const void *buffer, size_t size) {
     int bytes_sent = 0;
     int data_size = static_cast<int>(size); // signed size
@@ -81,6 +89,8 @@ int DataSocket::Send(const void *buffer, size_t size) {
     return bytes_sent;
 }
 
+int DataSocket::Send(const std::string &s) { return Send(&s[0], s.size()); }
+
 int DataSocket::write(void *buffer, size_t size) {
     return ::write(getSocketId(), buffer, size);
 }