1 files changed, 22 insertions, 34 deletions
diff --git a/include/ouroboros/sockets.h.in b/include/ouroboros/sockets.h.in
index 9ab2314f..1a6974ac 100644
--- a/include/ouroboros/sockets.h.in
+++ b/include/ouroboros/sockets.h.in
@@ -1,10 +1,10 @@
 /*
- * Ouroboros - Copyright (C) 2016 - 2020
+ * Ouroboros - Copyright (C) 2016 - 2024
  *
  * The sockets layer to communicate between daemons
  *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
+ *    Dimitri Staessens <dimitri@ouroboros.rocks>
+ *    Sander Vrijders   <sander@ouroboros.rocks>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -20,49 +20,37 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
-#ifndef OUROBOROS_SOCKETS_H
-#define OUROBOROS_SOCKETS_H
+#ifndef OUROBOROS_LIB_SOCKETS_H
+#define OUROBOROS_LIB_SOCKETS_H
 
-#include <ouroboros/qos.h>
+#include <ouroboros/protobuf.h>
 
 #include <sys/types.h>
 
-#include "ipcp_config.pb-c.h"
-typedef IpcpConfigMsg ipcp_config_msg_t;
-typedef LayerInfoMsg layer_info_msg_t;
-
-#include "irmd_messages.pb-c.h"
-typedef IrmMsg irm_msg_t;
-typedef IpcpInfoMsg ipcp_info_msg_t;
-typedef NameInfoMsg name_info_msg_t;
-
-#include "ipcpd_messages.pb-c.h"
-typedef IpcpMsg ipcp_msg_t;
-
-#include "qosspec.pb-c.h"
-typedef QosspecMsg qosspec_msg_t;
-
-#define SOCK_PATH "/var/run/ouroboros/"
-#define SOCK_PATH_SUFFIX ".sock"
+#ifndef OUROBOROS_TEST
+ #define SOCK_PATH             "/var/run/ouroboros/"
+#else
+ #define SOCK_PATH             "/tmp/"
+#endif
+#define SOCK_PATH_SUFFIX      ".sock"
 
-#define IRM_SOCK_PATH SOCK_PATH "irm" SOCK_PATH_SUFFIX
-#define IPCP_SOCK_PATH_PREFIX SOCK_PATH "ipcp"
+#define IRM_SOCK_PATH         SOCK_PATH "irm" SOCK_PATH_SUFFIX
+#define IPCP_SOCK_PATH_PREFIX SOCK_PATH "ipcp."
 
-#define SOCK_BUF_SIZE @SOCK_BUF_SIZE@
+#define SOCK_BUF_SIZE         @SOCK_BUF_SIZE@
 
-/* Returns the full socket path of an IPCP */
-char *      ipcp_sock_path(pid_t pid);
+char *      sock_path(pid_t        pid,
+                      const char * path);
 
 int         server_socket_open(char * file_name);
 
 int         client_socket_open(char * file_name);
 
-irm_msg_t * send_recv_irm_msg(irm_msg_t * msg);
-
+int         send_recv_msg(buffer_t * buf);
 
-/* qos message conversion needed in different components */
-qosspec_msg_t spec_to_msg(const qosspec_t * qs);
+irm_msg_t * send_recv_irm_msg(irm_msg_t * msg);
 
-qosspec_t     msg_to_spec(const qosspec_msg_t * msg);
+/* cleanup socket when cancelling thread */
+void __cleanup_close_ptr(void * o);
 
-#endif
+#endif /* OUROBOROS_LIB_SOCKETS_H */