X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=79a143ee02190dddbff8e78f233357db3314f264;hb=d53d3911ebf68f70e39d0cd660af7aac923127cb;hp=35fa7f250392e3c314edf000de574c84a98e06e6;hpb=bb5f5ae82bdcb7b5189032940d0b609dc12be70b;p=umurmur.git diff --git a/src/client.c b/src/client.c index 35fa7f2..79a143e 100644 --- a/src/client.c +++ b/src/client.c @@ -64,6 +64,7 @@ int iCodecAlpha, iCodecBeta; bool_t bPreferAlpha; extern int* udpsocks; +extern bool_t hasv4; void Client_init() { @@ -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) { + channellist_t *chl; 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); @@ -1008,8 +1011,8 @@ out: 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) {