merging refactor (replacing)

slsSupportLib/src/ServerSocket.cpp

@@ -0,0 +1,79 @@
+#include "ServerSocket.h"
+#include "DataSocket.h"
+#include "logger.h"
+#include "sls_detector_defs.h"
+#include "sls_detector_exceptions.h"
+#include "string_utils.h"
+
+#include <arpa/inet.h>
+#include <iostream>
+#include <stdexcept>
+#include <unistd.h>
+#include <cstring>
+#define DEFAULT_PACKET_SIZE 1286
+#define SOCKET_BUFFER_SIZE (100 * 1024 * 1024) // 100 MB
+#define DEFAULT_BACKLOG 5
+
+namespace sls {
+
+ServerSocket::ServerSocket(int port)
+    : DataSocket(socket(AF_INET, SOCK_STREAM, 0)), serverPort(port) {
+
+    struct sockaddr_in serverAddr;
+    serverAddr.sin_family = AF_INET;
+    serverAddr.sin_port = htons(port);
+    serverAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+
+    if (bind(getSocketId(), (struct sockaddr *)&serverAddr,
+             sizeof(serverAddr)) != 0) {
+        close();
+        throw std::runtime_error("Server ERROR: cannot  bind socket");
+    }
+    if (listen(getSocketId(), DEFAULT_BACKLOG) != 0) {
+        close();
+        throw std::runtime_error("Server ERROR: cannot  listen to socket");
+    }
+}
+
+DataSocket ServerSocket::accept() {
+    struct sockaddr_in clientAddr;
+    socklen_t addr_size = sizeof clientAddr;
+    int newSocket =
+        ::accept(getSocketId(), (struct sockaddr *)&clientAddr, &addr_size);
+    if (newSocket == -1) {
+        throw std::runtime_error("Server ERROR: socket accept failed\n");
+    }
+    inet_ntop(AF_INET, &(clientAddr.sin_addr), &thisClient_.front(),
+              INET_ADDRSTRLEN);
+    std::cout << "lastClient: " << lastClient_ << " thisClient: " << thisClient_
+              << '\n';
+    // Here goes any check for locks etc
+    lastClient_ = thisClient_;
+
+    return DataSocket(newSocket);
+}
+
+const std::string &ServerSocket::getLastClient() { return lastClient_; }
+
+int ServerSocket::getPort() const { return serverPort; }
+
+void ServerSocket::SendResult(int &ret, void* retval, int retvalSize, char* mess) {
+
+	// send success of operation
+	sendData(&ret, sizeof(ret));
+
+    if (ret == slsDetectorDefs::FAIL) {
+        // create error message if empty
+        if (!strlen(mess))  {
+            strcpy(mess, "No error message provided for this failure in server. Will mess up TCP.");
+        }
+        
+        sendData(mess, MAX_STR_LENGTH);
+        throw sls::RuntimeError(mess);  
+    }
+    // send return value
+    sendData(retval, retvalSize);
+}
+
+
+}; // namespace sls