projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix multiple channel links to one destination channel giving segfault and also make...
[umurmur.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index e0146f952ca46d44732a93ce93578bbe83264d81..79a143ee02190dddbff8e78f233357db3314f264 100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-64,7
+64,7
@@
int iCodecAlpha, iCodecBeta;
bool_t bPreferAlpha;
extern int* udpsocks;
bool_t bPreferAlpha;
extern int* udpsocks;
-extern bool hasv4;
+extern bool
_t
hasv4;
void Client_init()
{
void Client_init()
{
@@
-958,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);