X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.h;h=2759060cc433729a1aac15ef750257499eb63858;hb=c4e1966b2719d116fa7f3ac1e31b5517c6568728;hp=66470de3fb2177f4dea9558b79e36e20b1003d25;hpb=b331021d492fd5febb576a61717a489c5cc875ff;p=umurmur.git

diff --git a/src/client.h b/src/client.h
index 66470de..2759060 100644
--- a/src/client.h
+++ b/src/client.h
@@ -59,43 +59,46 @@
 
 #define IS_AUTH(_a_) ((_a_)->authenticated)
 
+struct channel;
+
 typedef struct {
-	int tcpfd;
 	SSL_handle_t *ssl;
-	bool_t SSLready;
-	bool_t shutdown_wait;
-	cryptState_t cryptState;
-	bool_t readBlockedOnWrite, writeBlockedOnRead;
-
-	struct sockaddr_storage remote_tcp;
-	struct sockaddr_storage remote_udp;
-  char addressString[INET6_ADDRSTRLEN];
-	uint8_t rxbuf[BUFSIZE], txbuf[BUFSIZE];
-	uint32_t rxcount, msgsize, drainleft, txcount, txsize;
-	int sessionId;
-	uint8_t key[KEY_LENGTH];
+	struct dlist node;
 	char *username;
-	bool_t bUDP, authenticated, deaf, mute, self_deaf, self_mute, recording, bOpus;
 	char *os, *release, *os_version;
+	uint32_t rxcount, msgsize, drainleft, txcount, txsize;
+	int sessionId;
 	uint32_t version;
 	int codec_count;
 	struct dlist codecs;
-	int availableBandwidth;
 	etimer_t lastActivity, connectTime, idleTime;
-	struct dlist node;
 	struct dlist txMsgQueue;
 	int txQueueCount;
-	void *channel; /* Ugly... */
+	int availableBandwidth;
+	struct channel *channel;
 	char *context;
 	struct dlist chan_node;
 	struct dlist voicetargets;
 	struct dlist tokens;
 	int tokencount;
-	uint8_t hash[20];
-	bool_t isAdmin;
-	bool_t isSuppressed;
+	int tcpfd;
 	float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
 	uint32_t UDPPackets, TCPPackets;
+
+	bool_t SSLready;
+	bool_t shutdown_wait;
+	bool_t readBlockedOnWrite, writeBlockedOnRead;
+	bool_t bUDP, authenticated, deaf, mute, self_deaf, self_mute, recording, bOpus;
+	bool_t isAdmin;
+	bool_t isSuppressed;
+
+	struct sockaddr_storage remote_tcp;
+	struct sockaddr_storage remote_udp;
+
+	uint8_t key[KEY_LENGTH];
+	uint8_t hash[20];
+	cryptState_t cryptState;
+	uint8_t rxbuf[BUFSIZE], txbuf[BUFSIZE];
 } client_t;
 
 typedef struct {
@@ -121,13 +124,16 @@ int Client_count(void);
 void Client_close(client_t *client);
 client_t *Client_iterate(client_t **client);
 int Client_send_message_except(client_t *client, message_t *msg);
-int Client_read_udp(void);
+int Client_read_udp(int udpsock);
 void Client_disconnect_all();
 int Client_voiceMsg(client_t *client, uint8_t *data, int len);
 void recheckCodecVersions(client_t *connectingClient);
 void Client_codec_add(client_t *client, int codec);
 void Client_codec_free(client_t *client);
 codec_t *Client_codec_iterate(client_t *client, codec_t **codec_itr);
-void Client_textmessage(client_t *client, char *text);
+void Client_textmessage(client_t *client, const char *text);
+bool_t Client_token_match(client_t *client, char const *str);
+void Client_token_free(client_t *client);
+void Client_token_add(client_t *client, char *token_string);
 
 #endif