X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.h;h=608c87c036f81d453f133ace43342af1ef3c3c0f;hb=320a5588a8f195ee982722729c2b8dc99c68756f;hp=f7b88c492993a65144357151ead09a8f22990ada;hpb=477a4a1b836a9693338dd2ef76782013f3fb0a16;p=umurmur.git

diff --git a/src/client.h b/src/client.h
index f7b88c4..608c87c 100644
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -31,7 +31,7 @@
 #ifndef CLIENT_H_45786678
 #define CLIENT_H_45786678
 
-#include <openssl/ssl.h>
+#include <config.h>
 #include <stdint.h>
 #include <unistd.h>             /* close() */
 #include <sys/types.h>
@@ -47,6 +47,7 @@
 #include "crypt.h"
 #include "timer.h"
 #include "pds.h"
+#include "ssl.h"
 
 #define BUFSIZE 8192
 #define UDP_BUFSIZE 512
@@ -57,7 +58,7 @@
 
 typedef struct {
 	int tcpfd;
-	SSL *ssl;
+	SSL_handle_t *ssl;
 	bool_t SSLready;
 	bool_t shutdown_wait;
 	cryptState_t cryptState;
@@ -70,13 +71,13 @@ typedef struct {
 	int sessionId;
 	uint64_t key;
 	char *username;
-	bool_t bUDP, authenticated, deaf, mute;
-	char *os, *release;
+	bool_t bUDP, authenticated, deaf, mute, recording;
+	char *os, *release, *os_version;
 	uint32_t version;
 	int codec_count;
 	struct dlist codecs;
 	int availableBandwidth;
-	etimer_t lastActivity;
+	etimer_t lastActivity, connectTime, idleTime;
 	struct dlist node;
 	struct dlist txMsgQueue;
 	int txQueueCount;
@@ -84,6 +85,8 @@ typedef struct {
 	char *context;
 	struct dlist chan_node;
 	struct dlist voicetargets;
+	float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
+	uint32_t UDPPackets, TCPPackets;
 } client_t;
 
 typedef struct {
@@ -98,6 +101,8 @@ int Client_add(int fd, struct sockaddr_in *remote);
 int Client_read_fd(int fd);
 int Client_write_fd(int fd);
 int Client_send_message(client_t *client, message_t *msg);
+int Client_send_message_ver(client_t *client, message_t *msg, uint32_t version);
+int Client_send_message_except_ver(client_t *client, message_t *msg, uint32_t version);
 int Client_count(void);
 void Client_close(client_t *client);
 client_t *Client_iterate(client_t **client);