projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make logging more uniform. Fix copyright year
[umurmur.git]
/
src
/
client.h
diff --git
a/src/client.h
b/src/client.h
index b7460b635fd1d9227ee8a5fc018aa8340beea0c9..82792e9924312f9edb17b0065d0dbdadc7b0a54a 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.
@@
-46,10
+46,12
@@
#include "messages.h"
#include "crypt.h"
#include "timer.h"
#include "messages.h"
#include "crypt.h"
#include "timer.h"
+#include "pds.h"
#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)
@@
-67,17
+69,21
@@
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 *playerName;
bool_t authenticated, deaf, mute;
bool_t authenticated, deaf, mute;
+ char *os, *release;
+ uint32_t version;
+ int codec_count;
+ int32_t codecs[MAX_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;
@@
-94,5
+100,7
@@
client_t *Client_iterate(client_t **client);
int Client_send_message_except(client_t *client, message_t *msg);
int Client_read_udp(void);
void Client_disconnect_all();
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);
+void recheckCodecVersions();
#endif
#endif