projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to version 0.2.8.
[umurmur.git]
/
src
/
client.h
diff --git
a/src/client.h
b/src/client.h
index d2f935c2511c52dac9d0eca17b20dc34f80e400c..0e5e1353300fdb2e1fdd3e48fab9151f7b536b0c 100644
(file)
--- a/
src/client.h
+++ b/
src/client.h
@@
-1,5
+1,5
@@
-/* Copyright (C) 2009-201
0
, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-201
0
, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-201
1
, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-201
1
, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
All rights reserved.
@@
-31,6
+31,7
@@
#ifndef CLIENT_H_45786678
#define CLIENT_H_45786678
#ifndef CLIENT_H_45786678
#define CLIENT_H_45786678
+#include <config.h>
#include <stdint.h>
#include <unistd.h> /* close() */
#include <sys/types.h>
#include <stdint.h>
#include <unistd.h> /* close() */
#include <sys/types.h>
@@
-52,6
+53,8
@@
#define UDP_BUFSIZE 512
#define INACTICITY_TIMEOUT 15 /* Seconds */
#define MAX_CODECS 10
#define UDP_BUFSIZE 512
#define INACTICITY_TIMEOUT 15 /* Seconds */
#define MAX_CODECS 10
+#define MAX_TOKENSIZE 64
+#define MAX_TOKENS 32
#define IS_AUTH(_a_) ((_a_)->authenticated)
#define IS_AUTH(_a_) ((_a_)->authenticated)
@@
-70,7
+73,7
@@
typedef struct {
int sessionId;
uint64_t key;
char *username;
int sessionId;
uint64_t key;
char *username;
- bool_t bUDP, authenticated, deaf, mute;
+ bool_t bUDP, authenticated, deaf, mute
, recording
;
char *os, *release, *os_version;
uint32_t version;
int codec_count;
char *os, *release, *os_version;
uint32_t version;
int codec_count;
@@
-84,6
+87,8
@@
typedef struct {
char *context;
struct dlist chan_node;
struct dlist voicetargets;
char *context;
struct dlist chan_node;
struct dlist voicetargets;
+ struct dlist tokens;
+ int tokencount;
float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
uint32_t UDPPackets, TCPPackets;
} client_t;
float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
uint32_t UDPPackets, TCPPackets;
} client_t;
@@
-93,6
+98,11
@@
typedef struct {
struct dlist node;
} codec_t;
struct dlist node;
} codec_t;
+typedef struct {
+ char *token;
+ struct dlist node;
+} token_t;
+
void Client_init();
int Client_getfds(struct pollfd *pollfds);
void Client_janitor();
void Client_init();
int Client_getfds(struct pollfd *pollfds);
void Client_janitor();
@@
-100,6
+110,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_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);
int Client_count(void);
void Client_close(client_t *client);
client_t *Client_iterate(client_t **client);