Alpha 1.4 - Client

Author: Tetrapak0

Client/include/Client.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#define CURRENT_PROFILE profiles[current_profile]
+#define CURRENT_BUTTOM_M1_LOOP CURRENT_PROFILE.buttons[i-1]
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -11,9 +14,16 @@ using std::string;
 extern int sock;
 extern int send_result;
 extern int bytes_received;
+extern int port;
+extern int prev_port;
 
+extern bool failed;
 extern bool connected;
 extern bool kill;
+extern bool have_ip;
+extern bool have_port;
+
+extern char ip_address[16];
 
 extern string kill_reason;
 

Client/include/Config.h

@@ -5,6 +5,7 @@
 #include <vector>
 #include <string>
 #include <random>
+#include <atomic>
 
 #include "../../json.hpp"
 
@@ -16,17 +17,18 @@ using std::istreambuf_iterator;
 using std::random_device;
 using std::mt19937;
 using std::uniform_int_distribution;
+using std::atomic;
 
 using std::filesystem::exists;
 using std::filesystem::remove;
 using std::filesystem::create_directory;
+using std::filesystem::create_directories;
 
 using json = nlohmann::ordered_json;
 
 extern json config;
 
-extern bool have_ip;
-extern bool reconfiguring;
+extern atomic<bool> reconfiguring;
 
 extern char* homedir;
 
@@ -50,10 +52,14 @@ extern vector<profile> profiles;
 extern const string id_gen();
 extern const string rw_UUID();
 
-extern bool rw_ipstore();
+extern bool read_ipstore();
+extern bool read_portstore();
+extern void write_ipstore();
+extern void write_portstore();
+extern void remove_ipstore();
+extern void remove_portstore();
 
 extern void check_config();
-extern void set_properties();
-extern void remove_ipstore();
-extern void clear_config();
+extern void read_config();
+extern void remove_config();
 extern void write_config(string recvd_config);

Client/include/GUI.h

@@ -3,7 +3,6 @@
 #include "../../imgui/imgui.h"
 #include "../../imgui/backends/imgui_impl_sdl3.h"
 #include "../../imgui/backends/imgui_impl_sdlrenderer3.h"
-
 #include "../../imgui/backends/SDL3/SDL.h"
 
 #if defined(IMGUI_IMPL_OPENGL_ES2)
@@ -14,30 +13,11 @@
 
 #include "../../Helvetica.h"
 
-#define SDL_ERROR(fail_point) {												\
-	string what_error(fail_point);											\
-	string message = "Failed to initialize ";								\
-	message += what_error;													\
-	message += SDL_GetError();												\
-	const SDL_MessageBoxButtonData button_data[] = {						\
-		{SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT, 0, "OK"}					\
-	};																		\
-	int buttonid;															\
-	const SDL_MessageBoxData msgbox_data = {								\
-		SDL_MESSAGEBOX_ERROR,												\
-		NULL,																\
-		"Error!",															\
-		message.c_str(),													\
-		SDL_arraysize(button_data),											\
-		button_data,														\
-		NULL																\
-	};																		\
-	SDL_ShowMessageBox(&msgbox_data, &buttonid);							\
-	done = true;															\
-	exit(-1);																\
-}
-
-enum class screens { Home, Vol, Media, Spotify };
+#include <string>
+
+extern bool disconnected_modal;
+
+enum class screens { Home,/*, Vol, Media, Spotify */};
 
 extern int gui_init();
 
@@ -51,7 +31,9 @@ extern void draw_killed();
 extern void draw_setup();
 extern void draw_disconnected_alert();
 
-screens get_default_screen();
+extern void error_dialog(int type, std::string message);
+
+extern screens get_default_screen();
 
 #ifdef _DEBUG
 void draw_performance();

Client/include/Header.h

@@ -2,8 +2,8 @@
 
 #define SHORTCUT_PREFIX "SH"
 
-#define LOG(x) cerr << x << "\n";
-#define VAR_LOG(x, y) cerr << x << ": " << y << "\n";
+#define LOG(x) cerr << x << "\n"
+#define VARLOG(x, y) cerr << x << ": " << y << "\n"
 
 #include <iostream>
 #include <thread>
@@ -25,9 +25,4 @@ using std::vector;
 
 using std::to_string;
 
-extern bool failed; // TODO: Move to specific headers
-extern bool failed_backup;
 extern bool done;
-extern bool disconnected_modal;
-
-extern char ip_address[16];

Client/src/Client.cpp

@@ -1,24 +1,26 @@
 #include "../include/Header.h"
 #include "../include/Config.h"
 #include "../include/Client.h"
+#include "../include/GUI.h"
 
 struct timeval timeout;
 
 bool failed             = true;
 bool connected          = false;
-bool disconnected_modal = false;
 bool kill               = false;
+bool have_ip            = false;
+bool have_port          = false;
 
 int sock;
 int bytesReceived;
 int send_result;
+int port = 27015;
+int prev_port = port;
 
 char ip_address[16];
 
 string kill_reason;
 
-json config;
-
 int client_init() {
     const string ID = rw_UUID();
 
@@ -28,36 +30,63 @@ int client_init() {
     timeout.tv_sec = 5;
     if ((setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &timeout,  sizeof(timeout)) ||
          setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &timeout,  sizeof(timeout))  == -1)) {
-        done = true; cerr << "setsockopt failed\n"; return 1;
+        LOG("setsockopt failed"); done = true; return 1;
     }
+    // TODO: multiple saved servers. select which one to connect to
+    have_ip = read_ipstore();
+    have_port = read_portstore();
 
     struct sockaddr_in hint;
     hint.sin_family = AF_INET;
-    hint.sin_port = htons(27015);
-    have_ip = rw_ipstore();
-    check_config(); // MAYBETODO: Multiple computers -- different configs
+    check_config();
     do {
         if (!failed) {
+            if (prev_port != port) {
+                write_ipstore();
+                write_portstore();
+                prev_port = port;
+                close(sock);
+            	LOG("------------REBOOTING SOCK------------");
+                return client_init();
+            }
+            hint.sin_port = htons(port);
+            VARLOG("port", port);
+            VARLOG("hint.sin_port", hint.sin_port);
+            VARLOG("IP address", ip_address);
             inet_pton(AF_INET, ip_address, &hint.sin_addr);
             int connectRes = connect(sock, (struct sockaddr*)&hint, sizeof(hint));
-            cerr << "connectRes: " << connectRes << "\n";
+            VARLOG("connectRes", connectRes);
             if (connectRes == -1) failed = true;
             else                  connected = true;
         }
         if (done) return 0;
     } while (!connected);
-    if (!have_ip) rw_ipstore();
-    // if previous MAYBETODO is implemented, add a check_config here with current connected ip as param
+
+    if (!have_ip) write_ipstore();
+    if (!have_port) write_portstore();
 
     timeout.tv_sec = 0;
     if ((setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &timeout,  sizeof(timeout)) ||
          setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &timeout,  sizeof(timeout))  == -1)) {
-        cerr << "setsockopt failed\n"; done = true; return 1;
+        LOG("setsockopt failed"); done = true; return 1;
     }
 
     disconnected_modal = false;
+
     string message;
-    char* buf = new char[1024 * 256];
+    char* buf = nullptr;
+    try {
+		buf = new char[1024 * 256];
+	} catch (std::bad_alloc) {
+		LOG("Failed to allocate buffer.");
+		error_dialog(1, "Failed to allocate buffer.\n");
+		exit(-1);
+	}
+	if (buf == nullptr) {
+		LOG("Failed to allocate buffer.");
+		error_dialog(1, "Failed to allocate buffer.\n");
+		exit(-1);
+	}
     send_result = send(sock, ID.c_str(), ID.length() + 1, 0);
     do {
         memset(buf, 0, 1024 * 256);
@@ -78,7 +107,7 @@ int client_init() {
     connected = false;
     if (!kill) disconnected_modal = true;
     failed = true;
-	cerr << "------------REBOOTING SOCK------------\n";
+	LOG("------------REBOOTING SOCK------------");
     if (!done) return client_init();
     return 0;
 }