SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string.h>
-#include <openssl/aes.h>
+#include <stdlib.h>
#include "log.h"
#include "list.h"
msg->payload.reject->has_type = true;
Client_send_message(client, msg);
- Log_info("Server reject reason: %s. Disconnecting session %d - %s@%s:%d",
- reason,
- client->sessionId,
- client->playerName,
- inet_ntoa(client->remote_tcp.sin_addr),
- ntohs(client->remote_tcp.sin_port));
-
+ Log_info_client(client, "Server reject reason: %s", reason);
}
static void sendPermissionDenied(client_t *client, const char *reason)
}
switch (msg->messageType) {
case Authenticate:
- /*
- * 1. Check stuff, Serverreject if not ok
- * 2. Setup UDP encryption -> MessageCryptSetup
- * 3. (Enter channel)
- * 4. MessageChannelAdd + MessageChannelDescUpdate for all channels
- * 5. (MessageChannelLink)
- * 6. MessageServerJoin
- * 7. MessagePlayerMove
- * 8. MessageServerJoin for all connected users
- * 9. PlayerDeaf/PlayerMute/PlayerSelfMuteDeaf for all users it applies to
- * 10. MessageServerSync
- */
-
Log_debug("Authenticate message received");
- Log_debug("Username: %s", msg->payload.authenticate->username);
+
+ if (IS_AUTH(client) || !msg->payload.authenticate->username) {
+ /* Authenticate message might be sent when a token is set by the user.*/
+ if (msg->payload.authenticate->n_tokens > 0) {
+ Log_debug("Tokens in auth message from %s", client->username);
+ }
+ break;
+ }
client->authenticated = true;
while (Client_iterate(&client_itr) != NULL) {
if (!IS_AUTH(client_itr))
continue;
- if (client_itr->playerName && strncmp(client_itr->playerName, msg->payload.authenticate->username, MAX_TEXT) == 0) {
+ if (client_itr->username && strncmp(client_itr->username, msg->payload.authenticate->username, MAX_TEXT) == 0) {
char buf[64];
sprintf(buf, "Username already in use");
Log_debug("Username already in use");
}
/* Name & password */
- client->playerName = strdup(msg->payload.authenticate->username);
+ client->username = strdup(msg->payload.authenticate->username);
/* Setup UDP encryption */
CryptState_init(&client->cryptState);
Client_send_message(client, sendmsg);
/* Channel stuff */
- Chan_playerJoin(defaultChan, client); /* Join default channel */
+ Chan_userJoin(defaultChan, client); /* Join default channel */
- /* Codec version */
- if (msg->payload.authenticate->n_celt_versions > MAX_CODECS)
- Log_warn("Client has more than %d CELT codecs. Ignoring %d codecs",
- MAX_CODECS, msg->payload.authenticate->n_celt_versions - MAX_CODECS);
-
- Log_debug("Client %d has %d CELT codecs", client->sessionId, msg->payload.authenticate->n_celt_versions);
+ /* Codec version */
+ Log_debug("Client %d has %d CELT codecs", client->sessionId,
+ msg->payload.authenticate->n_celt_versions);
if (msg->payload.authenticate->n_celt_versions > 0) {
int i;
- client->codec_count = msg->payload.authenticate->n_celt_versions > MAX_CODECS ?
- MAX_CODECS : msg->payload.authenticate->n_celt_versions;
- for (i = 0; i < client->codec_count; i++) {
- client->codecs[i] = msg->payload.authenticate->celt_versions[i];
- Log_debug("Client %d CELT codec ver 0x%x", client->sessionId, client->codecs[i]);
- }
+ codec_t *codec_itr;
+ client->codec_count = msg->payload.authenticate->n_celt_versions;
+
+ for (i = 0; i < client->codec_count; i++)
+ Client_codec_add(client, msg->payload.authenticate->celt_versions[i]);
+ codec_itr = NULL;
+ while (Client_codec_iterate(client, &codec_itr) != NULL)
+ Log_debug("Client %d CELT codec ver 0x%x", client->sessionId, codec_itr->codec);
+
} else {
- client->codecs[0] = (int32_t)0x8000000a;
+ Client_codec_add(client, (int32_t)0x8000000a);
client->codec_count = 1;
}
/* Iterate channels and send channel info */
ch_itr = NULL;
- Chan_iterate(&ch_itr);
- do {
+ while (Chan_iterate(&ch_itr) != NULL) {
sendmsg = Msg_create(ChannelState);
sendmsg->payload.channelState->has_channel_id = true;
sendmsg->payload.channelState->channel_id = ch_itr->id;
if (ch_itr->desc)
sendmsg->payload.channelState->description = strdup(ch_itr->desc);
Log_debug("Send channel info: %s", sendmsg->payload.channelState->name);
- Client_send_message(client, sendmsg);
-
- Chan_iterate(&ch_itr);
- } while (ch_itr != NULL);
+ Client_send_message(client, sendmsg);
+ }
- /* Not supporting channel links yet */
+ /* Iterate channels and send channel links info */
+ ch_itr = NULL;
+ while (Chan_iterate(&ch_itr) != NULL) {
+ if (ch_itr->linkcount > 0) { /* Has links */
+ uint32_t *links;
+ int i = 0;
+ struct dlist *itr;
+
+ sendmsg = Msg_create(ChannelState);
+ sendmsg->payload.channelState->has_channel_id = true;
+ sendmsg->payload.channelState->channel_id = ch_itr->id;
+ sendmsg->payload.channelState->n_links = ch_itr->linkcount;
+
+ links = (uint32_t *)malloc(ch_itr->linkcount * sizeof(uint32_t));
+ list_iterate(itr, &ch_itr->channel_links) { /* Iterate links */
+ channel_t *ch;
+ ch = list_get_entry(itr, channel_t, link_node);
+ links[i++] = ch->id;
+ }
+ sendmsg->payload.channelState->links = links;
+ Client_send_message(client, sendmsg);
+ }
+ }
/* Send user state for connecting user to other users */
sendmsg = Msg_create(UserState);
sendmsg->payload.userState->has_session = true;
sendmsg->payload.userState->session = client->sessionId;
- sendmsg->payload.userState->has_user_id = true;
- sendmsg->payload.userState->user_id = client->sessionId;
- sendmsg->payload.userState->name = strdup(client->playerName);
+ sendmsg->payload.userState->name = strdup(client->username);
sendmsg->payload.userState->has_channel_id = true;
sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id;
sendmsg = Msg_create(UserState);
sendmsg->payload.userState->has_session = true;
sendmsg->payload.userState->session = client_itr->sessionId;
- sendmsg->payload.userState->name = strdup(client_itr->playerName);
+ sendmsg->payload.userState->name = strdup(client_itr->username);
sendmsg->payload.userState->has_channel_id = true;
sendmsg->payload.userState->channel_id = ((channel_t *)client_itr->channel)->id;
sendmsg->payload.serverSync->allow_html = true; /* Support this? */
Client_send_message(client, sendmsg);
- Log_info("User %s authenticated", client->playerName);
+ Log_info_client(client, "User %s authenticated", client->username);
break;
case Ping:
sendPermissionDenied(client, "Not supported by uMurmur");
break;
}
+
+ msg->payload.userState->has_session = true;
+ msg->payload.userState->session = client->sessionId;
+ msg->payload.userState->has_actor = true;
+ msg->payload.userState->actor = client->sessionId;
+
if (msg->payload.userState->has_self_deaf) {
client->deaf = msg->payload.userState->self_deaf;
}
if (msg->payload.userState->has_self_mute) {
- client->mute = msg->payload.userState->self_mute;
+ client->mute = msg->payload.userState->self_mute;
+ if (!client->mute) {
+ msg->payload.userState->has_self_deaf = true;
+ msg->payload.userState->self_deaf = false;
+ client->deaf = false;
+ }
}
if (msg->payload.userState->has_channel_id) {
int leave_id;
- if (!Chan_playerJoin_id_test(msg->payload.userState->channel_id))
+ if (!Chan_userJoin_id_test(msg->payload.userState->channel_id))
break;
- leave_id = Chan_playerJoin_id(msg->payload.userState->channel_id, client);
+ leave_id = Chan_userJoin_id(msg->payload.userState->channel_id, client);
if (leave_id > 0) {
Log_debug("Removing channel ID %d", leave_id);
sendmsg = Msg_create(ChannelRemove);
/* Re-use message */
Msg_inc_ref(msg);
- msg->payload.userState->has_actor = true;
- msg->payload.userState->actor = client->sessionId;
+
Client_send_message_except(NULL, msg);
/* Need to send remove channel message _after_ UserState message */
do {
Chan_iterate(&ch_itr);
} while (ch_itr != NULL && ch_itr->id != msg->payload.textMessage->channel_id[i]);
- if (ch_itr == NULL)
- Log_warn("Channel id %d not found - ignoring.", msg->payload.textMessage->channel_id[i]);
- else {
+ if (ch_itr != NULL) {
struct dlist *itr;
list_iterate(itr, &ch_itr->clients) {
client_t *c;
for (j = 0; j < target->n_session; j++)
Voicetarget_add_session(client, targetId, target->session[j]);
if (target->has_channel_id) {
- if (target->has_links || target->has_children)
- Log_warn("Whisper to children or linked channels not implemented. Ignoring.");
- Voicetarget_add_channel(client, targetId, target->channel_id);
+ bool_t linked = false, children = false;
+ if (target->has_links)
+ linked = target->links;
+ if (target->has_children)
+ children = target->children;
+ Voicetarget_add_channel(client, targetId, target->channel_id, linked, children);
}
}
break;
Client_send_message(client, msg);
break;
case UDPTunnel:
+ client->bUDP = false;
Client_voiceMsg(client, msg->payload.UDPTunnel->packet.data, msg->payload.UDPTunnel->packet.len);
break;
case ChannelState:
sendmsg->payload.userState->channel_id = newchan->id;
Client_send_message_except(NULL, sendmsg);
- leave_id = Chan_playerJoin(newchan, client);
+ leave_id = Chan_userJoin(newchan, client);
if (leave_id > 0) {
Log_debug("Removing channel ID %d", leave_id);
sendmsg = Msg_create(ChannelRemove);
projects / umurmur.git / blobdiff