-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
if (client->os)
free(client->os);
if (client->playerName)
- free(client->playerName);
+ free(client->playerName);
+ if (client->context)
+ free(client->context);
free(client);
}
return 0;
}
+static inline void Client_send_voice(client_t *src, client_t *dst, uint8_t *data, int len, int poslen)
+{
+ if (IS_AUTH(dst) && dst != src && !dst->deaf) {
+ if (poslen > 0 && strcmp(src->context, dst->context) == 0)
+ Client_send_udp(dst, data, len);
+ else
+ Client_send_udp(dst, data, len - poslen);
+ }
+}
+
/* Handle decrypted voice message */
int Client_voiceMsg(client_t *client, uint8_t *data, int len)
{
offset = Pds_skip(pdi, counter & 0x7f);
} while ((counter & 0x80) && offset > 0);
- poslen = pdi->maxsize - pdi->offset; /* XXX - Add stripping of positional audio */
+ poslen = pdi->maxsize - pdi->offset; /* For stripping of positional info */
Pds_add_numval(pds, client->sessionId);
Pds_append_data_nosize(pds, data + 1, len - 1);
list_iterate(itr, &ch->clients) {
client_t *c;
c = list_get_entry(itr, client_t, chan_node);
- if (c != client && !c->deaf) {
- Client_send_udp(c, buffer, pds->offset + 1);
+ Client_send_voice(client, c, buffer, pds->offset + 1, poslen);
+ }
+ /* Channel links */
+ if (!list_empty(&ch->channel_links)) {
+ struct dlist *ch_itr;
+ list_iterate(ch_itr, &ch->channel_links) {
+ channel_t *ch_link;
+ ch_link = list_get_entry(ch_itr, channel_t, link_node);
+ list_iterate(itr, &ch_link->clients) {
+ client_t *c;
+ c = list_get_entry(itr, client_t, chan_node);
+ Log_debug("Linked voice from %s -> %s", ch->name, ch_link->name);
+ Client_send_voice(client, c, buffer, pds->offset + 1, poslen);
+ }
}
}
} else if ((vt = Voicetarget_get_id(client, target)) != NULL) { /* Targeted whisper */
list_iterate(itr, &ch->clients) {
client_t *c;
c = list_get_entry(itr, client_t, chan_node);
- if (c != client && !c->deaf && IS_AUTH(c)) {
- Client_send_udp(c, buffer, pds->offset + 1);
- }
+ Client_send_voice(client, c, buffer, pds->offset + 1, poslen);
}
}
/* Sessions */
client_t *c;
Log_debug("Whisper session %d", vt->sessions[i]);
while (Client_iterate(&c) != NULL) {
- if (c->sessionId == vt->sessions[i] && c != client && !c->deaf && IS_AUTH(c)) {
- Client_send_udp(c, buffer, pds->offset + 1);
+ if (c->sessionId == vt->sessions[i]) {
+ Client_send_voice(client, c, buffer, pds->offset + 1, poslen);
break;
}
}