added Socket class

Signed-off-by: Tolga Cakir <tolga@cevel.net>

src/main.cpp

@@ -190,7 +190,7 @@ int main(int argc, char *argv[]) {
 
 			break;
 		case Format::Socket:
-			if (streamer.enableSocket(ip, port)) {
+			if (streamer.socket.enable(ip, port)) {
 				return EXIT_FAILURE;
 			}
 

src/socket.cpp

@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) 2014 - 2016 Tolga Cakir <tolga@cevel.net>
+ *
+ * This source file is part of Sidewinder daemon and is distributed under the
+ * MIT License. For more information, see LICENSE file.
+ */
+
+#include <csignal>
+#include <iostream>
+
+#include <fcntl.h>
+#include <netdb.h>
+#include <unistd.h>
+
+#include <sys/socket.h>
+#include <sys/stat.h>
+
+#include <socket.hpp>
+
+int Socket::enable(std::string ip, std::string port) {
+	struct addrinfo hints = {};
+	struct addrinfo *result, *entry;
+
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_DGRAM;
+	hints.ai_flags = AI_PASSIVE;
+
+	// if <ip> is unconfigured, set it to nullptr, effectively IP 0.0.0.0
+	const char *ipAddress;
+
+	if (ip.empty()) {
+		ipAddress = nullptr;
+	} else {
+		ipAddress = ip.c_str();
+	}
+
+	auto ret = getaddrinfo(ipAddress, port.c_str(), &hints, &result);
+
+	if (ret) {
+		std::cerr << "Socket error: " << gai_strerror(ret) << std::endl;
+
+		return 1;
+	}
+
+	for (entry = result; entry != nullptr; entry = entry->ai_next) {
+		fd_ = socket(entry->ai_family, entry->ai_socktype, entry->ai_protocol);
+
+		if (fd_ < 0) {
+			// error, try next iteration
+			continue;
+		}
+
+		if (connect(fd_, entry->ai_addr, entry->ai_addrlen) != -1) {
+			// success
+			break;
+		}
+
+		close(fd_);
+		fd_ = -1;
+
+		return 1;
+	}
+
+	freeaddrinfo(result);
+
+	auto flags = fcntl(fd_, F_GETFL);
+
+	if (flags == -1) {
+		std::cerr << "Socket error: fcntl get flags." << std::endl;
+
+		return 1;
+	}
+
+	flags |= O_NONBLOCK;
+
+	if (fcntl(fd_, F_SETFL, flags) == -1) {
+		std::cerr << "Socket error: fcntl set flags." << std::endl;
+
+		return 1;
+	}
+
+	return 0;
+}
+
+void Socket::disable() {
+	if (fd_ != -1) {
+		close(fd_);
+		fd_ = -1;
+	}
+}
+
+void Socket::output(std::array<unsigned char, DATA_BUF> *buffer) {
+	if (fd_ == -1) {
+		return;
+	}
+
+	write(fd_, buffer->data(), buffer->size());
+}
+
+Socket::Socket() {
+	fd_ = -1;
+}
+
+Socket::~Socket() {
+	disable();
+}

src/socket.hpp

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2014 - 2016 Tolga Cakir <tolga@cevel.net>
+ *
+ * This source file is part of Sidewinder daemon and is distributed under the
+ * MIT License. For more information, see LICENSE file.
+ */
+
+#ifndef SOCKET_CLASS_H
+#define SOCKET_CLASS_H
+
+#include <array>
+#include <string>
+
+#include <gchd.hpp>
+
+class Socket {
+	public:
+		int enable(std::string ip, std::string port);
+		void disable();
+		void output(std::array<unsigned char, DATA_BUF> *buffer);
+		Socket();
+		~Socket();
+
+	private:
+		int fd_;
+		std::string output_;
+};
+
+#endif

src/streamer.cpp

@@ -35,78 +35,6 @@ void Streamer::disableDisk() {
 	}
 }
 
-int Streamer::enableSocket(std::string ip, std::string port) {
-	struct addrinfo hints = {};
-	struct addrinfo *result, *entry;
-
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_flags = AI_PASSIVE;
-
-	// if <ip> is unconfigured, set it to nullptr, effectively IP 0.0.0.0
-	const char *ipAddress;
-
-	if (ip.empty()) {
-		ipAddress = nullptr;
-	} else {
-		ipAddress = ip.c_str();
-	}
-
-	auto ret = getaddrinfo(ipAddress, port.c_str(), &hints, &result);
-
-	if (ret) {
-		std::cerr << "Socket error: " << gai_strerror(ret) << std::endl;
-
-		return 1;
-	}
-
-	for (entry = result; entry != nullptr; entry = entry->ai_next) {
-		socketFd_ = socket(entry->ai_family, entry->ai_socktype, entry->ai_protocol);
-
-		if (socketFd_ < 0) {
-			// error, try next iteration
-			continue;
-		}
-
-		if (connect(socketFd_, entry->ai_addr, entry->ai_addrlen) != -1) {
-			// success
-			break;
-		}
-
-		close(socketFd_);
-		socketFd_ = -1;
-
-		return 1;
-	}
-
-	freeaddrinfo(result);
-
-	auto flags = fcntl(socketFd_, F_GETFL);
-
-	if (flags == -1) {
-		std::cerr << "Socket error: fcntl get flags." << std::endl;
-
-		return 1;
-	}
-
-	flags |= O_NONBLOCK;
-
-	if (fcntl(socketFd_, F_SETFL, flags) == -1) {
-		std::cerr << "Socket error: fcntl set flags." << std::endl;
-
-		return 1;
-	}
-
-	return 0;
-}
-
-void Streamer::disableSocket() {
-	if (socketFd_ != -1) {
-		close(socketFd_);
-		socketFd_ = -1;
-	}
-}
-
 void Streamer::loop() {
 	std::array<unsigned char, DATA_BUF> buffer;
 
@@ -120,20 +48,15 @@ void Streamer::loop() {
 		}
 
 		fifo.output(&buffer);
-
-		if (socketFd_ != -1) {
-			write(socketFd_, buffer.data(), buffer.size());
-		}
+		socket.output(&buffer);
 	}
 }
 
 Streamer::Streamer(GCHD *gchd, Process *process) {
-	socketFd_ = -1;
 	gchd_ = gchd;
 	process_ = process;
 }
 
 Streamer::~Streamer() {
 	disableDisk();
-	disableSocket();
 }

src/streamer.hpp

@@ -16,20 +16,19 @@
 #include <fifo.hpp>
 #include <gchd.hpp>
 #include <process.hpp>
+#include <socket.hpp>
 
 class Streamer {
 	public:
 		int enableDisk(std::string diskPath);
 		void disableDisk();
-		int enableSocket(std::string ip, std::string port);
-		void disableSocket();
 		void loop();
 		Fifo fifo;
+		Socket socket;
 		Streamer(GCHD *gchd, Process *process);
 		~Streamer();
 
 	private:
-		int socketFd_;
 		std::ofstream diskStream_;
 		GCHD *gchd_;
 		Process *process_;