#include "list.h"
#include "client.h"
#include "messages.h"
+#include "messagehandler.h"
#include "crypt.h"
#include "channel.h"
#include "conf.h"
#include "voicetarget.h"
+#define MAX_TEXT 512
+
extern channel_t *defaultChan;
extern int iCodecAlpha, iCodecBeta;
extern bool_t bPreferAlpha;
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)
goto disconnect;
}
}
- if (msg->payload.authenticate->password && strncmp(getStrConf(PASSPHRASE), msg->payload.authenticate->password, MAX_TEXT) != 0) {
- char buf[64];
- sprintf(buf, "Wrong server password");
- Log_debug("Wrong server password: %s", msg->payload.authenticate->password);
- sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__WrongServerPW);
- goto disconnect;
+ if (strlen(getStrConf(PASSPHRASE)) > 0) {
+ if (!msg->payload.authenticate->password || strncmp(getStrConf(PASSPHRASE), msg->payload.authenticate->password, MAX_TEXT) != 0) {
+ char buf[64];
+ sprintf(buf, "Wrong server password");
+ sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__WrongServerPW);
+ Log_debug("Wrong server password: %s", msg->payload.authenticate->password);
+ goto disconnect;
+ }
}
if (strlen(msg->payload.authenticate->username) == 0 ||
strlen(msg->payload.authenticate->username) >= MAX_TEXT) { /* XXX - other invalid names? */
sendmsg->payload.channelState->parent = ch_itr->parent->id;
}
sendmsg->payload.channelState->name = strdup(ch_itr->name);
- if (strlen(ch_itr->desc) > 0) {
+ 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);
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->playerName);
break;
case Ping:
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;