-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
#include "version.h"
#include "voicetarget.h"
+extern char system_string[], version_string[];
+
static int Client_read(client_t *client);
static int Client_write(client_t *client);
static int Client_send_udp(client_t *client, uint8_t *data, int len);
if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTICITY_TIMEOUT)) {
/* No activity from client - assume it is lost and close. */
- Log_info("Session ID %d timeout - closing", c->sessionId);
+ Log_info_client(c, "Timeout, closing.");
Client_free(c);
}
}
memcpy(&newclient->remote_tcp, remote, sizeof(struct sockaddr_in));
newclient->ssl = SSL_newconnection(newclient->tcpfd, &newclient->SSLready);
if (newclient->ssl == NULL) {
- Log_warn("SSL negotiation failed");
+ Log_warn("SSL negotiation failed with %s:%d", inet_ntoa(remote->sin_addr),
+ ntohs(remote->sin_port));
free(newclient);
return -1;
}
sendmsg->payload.version->has_version = true;
sendmsg->payload.version->version = PROTOCOL_VERSION;
sendmsg->payload.version->release = strdup(UMURMUR_VERSION);
- /* XXX - set OS to something relevant? */
- /* sendmsg->payload.version->os = strdup("Linux/OpenWRT"); */
-
+ sendmsg->payload.version->os = strdup(system_string);
+ sendmsg->payload.version->os_version = strdup(version_string);
Client_send_message(newclient, sendmsg);
return 0;
struct dlist *itr, *save;
message_t *sendmsg;
- Log_info("Disconnect client ID %d addr %s port %d", client->sessionId,
- inet_ntoa(client->remote_tcp.sin_addr),
- ntohs(client->remote_tcp.sin_port));
-
if (client->authenticated) {
+ int leave_id;
+ leave_id = Chan_playerLeave(client);
+ if (leave_id > 0) { /* Remove temp channel */
+ sendmsg = Msg_create(ChannelRemove);
+ sendmsg->payload.channelRemove->channel_id = leave_id;
+ Client_send_message_except(client, sendmsg);
+ }
sendmsg = Msg_create(UserRemove);
sendmsg->payload.userRemove->session = client->sessionId;
Client_send_message_except(client, sendmsg);
Voicetarget_free_all(client);
list_del(&client->node);
- list_del(&client->chan_node);
if (client->ssl)
SSL_free(client->ssl);
close(client->tcpfd);
if (client->os)
free(client->os);
if (client->playerName)
- free(client->playerName);
+ free(client->playerName);
+ if (client->context)
+ free(client->context);
free(client);
}
do {
errno = 0;
if (!client->msgsize)
- rc = SSL_read(client->ssl, client->rxbuf, 6 - client->rxcount);
+ rc = SSL_read(client->ssl, &client->rxbuf[client->rxcount], 6 - client->rxcount);
else if (client->drainleft > 0)
rc = SSL_read(client->ssl, client->rxbuf, client->drainleft > BUFSIZE ? BUFSIZE : client->drainleft);
else
else {
client->rxcount += rc;
if (!client->msgsize && client->rxcount >= 6) {
- uint32_t *msgLen = (uint32_t *) &client->rxbuf[2];
- client->msgsize = ntohl(*msgLen);
+ uint32_t msgLen;
+ memcpy(&msgLen, &client->rxbuf[2], sizeof(uint32_t));
+ client->msgsize = ntohl(msgLen);
}
if (client->msgsize > BUFSIZE - 6 && client->drainleft == 0) {
- Log_warn("Too big message received (%d). Discarding.", client->msgsize);
+ Log_info_client(client, "Too big message received (%d bytes). Discarding.", client->msgsize);
client->rxcount = client->msgsize = 0;
client->drainleft = client->msgsize;
}
return 0;
}
else if (SSL_get_error(client->ssl, rc) == SSL_ERROR_ZERO_RETURN) {
- Log_warn("Error: Zero return - closing");
+ Log_info_client(client, "Connection closed by peer");
if (!client->shutdown_wait)
Client_close(client);
}
/* Hmm. This is where we end up when the client closes its connection.
* Kind of strange...
*/
- Log_info("Connection closed by peer");
+ Log_info_client(client, "Connection closed by peer");
}
else {
- Log_warn("SSL error: %d - Closing connection.", SSL_get_error(client->ssl, rc));
+ Log_info_client(client, "SSL error: %d - Closing connection", SSL_get_error(client->ssl, rc));
}
Client_free(client);
return -1;
Timer_restart(&client->cryptState.tLastRequest);
sendmsg = Msg_create(CryptSetup);
- Log_info("Requesting voice channel crypt resync");
+ Log_info_client(client, "Requesting voice channel crypt resync");
Client_send_message(client, sendmsg);
}
}
if (itr->remote_tcp.sin_addr.s_addr == from.sin_addr.s_addr) {
if (checkDecrypt(itr, encrypted, buffer, len)) {
itr->key = key;
- Log_info("New UDP connection from %s port %d sessionId %d", inet_ntoa(from.sin_addr), ntohs(from.sin_port), itr->sessionId);
+ Log_info_client(itr, "New UDP connection port %d", ntohs(from.sin_port));
memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in));
break;
}
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 && /* Has positional data */
+ src->context != NULL && dst->context != NULL && /* ...both source and destination has context */
+ strcmp(src->context, dst->context) == 0) /* ...and the contexts match */
+ 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;
}
}
projects / umurmur.git / blobdiff