Some cleanup. Removed sharedmemory_global.h

[umurmur.git] / src / sharedmemory_struct.h

diff --git a/src/sharedmemory_struct.h b/src/sharedmemory_struct.h
index a4011b35f7a4794992cdacbb89e69074e86bf209..de356c428fbab8c0ab07b0fd8f4d93acbf536812 100644 (file)
--- a/src/sharedmemory_struct.h
+++ b/src/sharedmemory_struct.h
@@ -1,11 +1,20 @@
+#include <arpa/inet.h>\r
+#include <stdint.h>\r
+#include "types.h"\r
+\r
 typedef struct\r
 {\r
+\r
   char username[121];\r
-  char ipaddress[46];\r
-  int tcp_port, udp_port;\r
+  char ipaddress[INET6_ADDRSTRLEN];\r
   char channel[121];\r
+  char os[121], release[121], os_version[121];\r
+  int tcp_port, udp_port;\r
   bool_t bUDP, authenticated, deaf, mute, self_deaf, self_mute, recording, bOpus;\r
+  int availableBandwidth;\r
   uint32_t online_secs, idle_secs;\r
+  bool_t isAdmin;\r
+  bool_t isSuppressed;\r
   float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;\r
   uint32_t UDPPackets, TCPPackets;\r
 \r
@@ -14,8 +23,10 @@ typedef struct
 typedef struct\r
 {\r
 \r
+  int shmtotal_size, shmclient_size;\r
   int clientcount, server_max_clients;\r
-  unsigned int umurmurd_pid; \r
-  shmclient_t client[];    \r
-  \r
-}shm_t;
\ No newline at end of file
+  unsigned int umurmurd_pid;\r
+  uint8_t alive;\r
+  shmclient_t client[];\r
+\r
+}shm_t;\r