projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added cipher cache to cleanup
[umurmur.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index 35fa7f250392e3c314edf000de574c84a98e06e6..ae495008ff73bca29b4c2e9249c0dcaae1977f2a 100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-64,6
+64,7
@@
int iCodecAlpha, iCodecBeta;
bool_t bPreferAlpha;
extern int* udpsocks;
bool_t bPreferAlpha;
extern int* udpsocks;
+extern bool_t hasv4;
void Client_init()
{
void Client_init()
{
@@
-167,7
+168,7
@@
void Client_token_add(client_t *client, char *token_string)
client->tokencount++;
}
client->tokencount++;
}
-bool_t Client_token_match(client_t *client, char *str)
+bool_t Client_token_match(client_t *client, char
const
*str)
{
token_t *token;
struct dlist *itr;
{
token_t *token;
struct dlist *itr;
@@
-957,8
+958,10
@@
int Client_voiceMsg(client_t *client, uint8_t *data, int len)
if (vt->channels[i].linked && !list_empty(&ch->channel_links)) {
struct dlist *ch_itr;
list_iterate(ch_itr, &ch->channel_links) {
if (vt->channels[i].linked && !list_empty(&ch->channel_links)) {
struct dlist *ch_itr;
list_iterate(ch_itr, &ch->channel_links) {
+ channellist_t *chl;
channel_t *ch_link;
channel_t *ch_link;
- ch_link = list_get_entry(ch_itr, channel_t, link_node);
+ chl = list_get_entry(ch_itr, channellist_t, node);
+ ch_link = chl->chan;
list_iterate(itr, &ch_link->clients) {
client_t *c;
c = list_get_entry(itr, client_t, chan_node);
list_iterate(itr, &ch_link->clients) {
client_t *c;
c = list_get_entry(itr, client_t, chan_node);
@@
-1008,8
+1011,8
@@
out:
static int Client_send_udp(client_t *client, uint8_t *data, int len)
{
uint8_t *buf, *mbuf;
static int Client_send_udp(client_t *client, uint8_t *data, int len)
{
uint8_t *buf, *mbuf;
- int udpsock = (client->remote_udp.ss_family == AF_INET) ? udpsocks[0] : udpsocks[1];
+ int udpsock = (client->remote_udp.ss_family == AF_INET) ? udpsocks[0] : udpsocks[(hasv4) ? 1 : 0];
if (Util_clientAddressToPortUDP(client) != 0 && CryptState_isValid(&client->cryptState) &&
client->bUDP) {
if (Util_clientAddressToPortUDP(client) != 0 && CryptState_isValid(&client->cryptState) &&
client->bUDP) {