projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UDPTunnel message tx handling didn't set len parameter. Fixed.
[umurmur.git]
/
src
/
client.h
diff --git
a/src/client.h
b/src/client.h
index b6528ebff8289708eb99e66b361a8c2dba279539..93487d9e0c59dc09645278502df9a9011fcee034 100644
(file)
--- a/
src/client.h
+++ b/
src/client.h
@@
-1,5
+1,5
@@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-20
09
, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009
-2010
, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-20
10
, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
All rights reserved.
@@
-51,6
+51,7
@@
#define BUFSIZE 2048
#define UDP_BUFSIZE 512
#define INACTICITY_TIMEOUT 15 /* Seconds */
#define BUFSIZE 2048
#define UDP_BUFSIZE 512
#define INACTICITY_TIMEOUT 15 /* Seconds */
+#define MAX_CODECS 10
#define IS_AUTH(_a_) ((_a_)->authenticated)
#define IS_AUTH(_a_) ((_a_)->authenticated)
@@
-68,19
+69,27
@@
typedef struct {
uint32_t rxcount, msgsize, drainleft, txcount, txsize;
int sessionId;
uint64_t key;
uint32_t rxcount, msgsize, drainleft, txcount, txsize;
int sessionId;
uint64_t key;
- char playerName[MAX_TEXT];
- int playerId;
+ char *username;
bool_t authenticated, deaf, mute;
bool_t authenticated, deaf, mute;
+ char *os, *release;
+ uint32_t version;
+ int codec_count;
+ struct dlist codecs;
int availableBandwidth;
etimer_t lastActivity;
struct dlist node;
struct dlist txMsgQueue;
int txQueueCount;
int availableBandwidth;
etimer_t lastActivity;
struct dlist node;
struct dlist txMsgQueue;
int txQueueCount;
-
/* Channel
*/
- void *channel; /*Ugly... */
+
void *channel; /* Ugly...
*/
+ char *context;
struct dlist chan_node;
struct dlist chan_node;
+ struct dlist voicetargets;
} client_t;
} client_t;
+typedef struct {
+ int codec, count;
+ struct dlist node;
+} codec_t;
void Client_init();
int Client_getfds(struct pollfd *pollfds);
void Client_init();
int Client_getfds(struct pollfd *pollfds);
@@
-96,5
+105,9
@@
int Client_send_message_except(client_t *client, message_t *msg);
int Client_read_udp(void);
void Client_disconnect_all();
int Client_voiceMsg(client_t *client, uint8_t *data, int len);
int Client_read_udp(void);
void Client_disconnect_all();
int Client_voiceMsg(client_t *client, uint8_t *data, int len);
+void recheckCodecVersions();
+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);
#endif
#endif