X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fsharedmemory_struct.h;h=649aac5fcf6ea6e60d57a26faae6f06c133ebdc3;hb=046935044fe8d2dce3540ad0c385d30edec1f4bf;hp=88eb0c5e54d633e8c2dd785655398f4215761807;hpb=336d27baf938a957177e4c26c2b5c6c4172aa0a6;p=umurmur.git

diff --git a/src/sharedmemory_struct.h b/src/sharedmemory_struct.h
index 88eb0c5..649aac5 100644
--- a/src/sharedmemory_struct.h
+++ b/src/sharedmemory_struct.h
@@ -1,21 +1,29 @@
-typedef struct
-{
-  char username[121];
-  char ipaddress[46];
-  int tcp_port, udp_port;
-  char channel[121];
-  bool_t bUDP, authenticated, deaf, mute, self_deaf, self_mute, recording, bOpus;
-  etimer_t lastActivity, connectTime, idleTime;
-  float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
-  uint32_t UDPPackets, TCPPackets;
-
-}shmclient_t;
-
-typedef struct
-{
-
-  int clientcount, server_max_clients;
-  unsigned int umurmurd_pid; //Use this to make sure umurmurd is still running so I can allow more than one connection.
-  shmclient_t client[];    //MJP BUG: Use max usersetting from conf file
-  
-}shm_t;
\ No newline at end of file
+#include <arpa/inet.h>
+#include <stdint.h>
+#include "types.h"
+
+typedef struct
+{
+  char username[121];
+  char ipaddress[INET6_ADDRSTRLEN];
+  char channel[121];
+  char os[121], release[121], os_version[121];
+  int tcp_port, udp_port;
+  bool_t bUDP, authenticated, deaf, mute, self_deaf, self_mute, recording, bOpus;
+  int availableBandwidth;
+  uint32_t online_secs, idle_secs;
+  uint8_t hash[20];
+  bool_t isAdmin;
+  bool_t isSuppressed;
+  float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
+  uint32_t UDPPackets, TCPPackets;
+} shmclient_t;
+
+typedef struct
+{
+  int shmtotal_size, shmclient_size;
+  int clientcount, server_max_clients;
+  unsigned int umurmurd_pid;
+  uint8_t alive;
+  shmclient_t client[];
+} shm_t;