SILC_SERVER_CMD(leave, LEAVE, SILC_CF_LAG_STRICT | SILC_CF_REG),
SILC_SERVER_CMD(users, USERS, SILC_CF_LAG | SILC_CF_REG),
SILC_SERVER_CMD(getkey, GETKEY, SILC_CF_LAG | SILC_CF_REG),
+ SILC_SERVER_CMD(service, SERVICE, SILC_CF_LAG_STRICT | SILC_CF_REG),
SILC_SERVER_CMD(connect, PRIV_CONNECT,
SILC_CF_LAG | SILC_CF_REG | SILC_CF_OPER),
reply->timeout =
silc_schedule_task_add(server->schedule, 0,
silc_server_command_pending_timeout, reply,
- timeout ? timeout : 10, 0,
+ timeout ? timeout : 12, 0,
SILC_TASK_TIMEOUT, SILC_TASK_PRI_LOW);
silc_dlist_add(server->pending_commands, reply);
{
SilcBuffer buffer;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
SILC_LOG_DEBUG(("Sending command status %d", status));
buffer =
{
SilcBuffer buffer;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
SILC_LOG_DEBUG(("Sending command status %d", status));
buffer =
{
SilcBuffer buffer;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
SILC_LOG_DEBUG(("Sending command status %d", status));
buffer =
if (!silc_command_get_status(cmdr->payload, NULL, NULL)) {
SilcBuffer buffer;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
/* Send the same command reply payload */
silc_command_set_command(cmdr->payload, silc_command_get(cmd->payload));
silc_command_set_ident(cmdr->payload,
SilcServerCommandContext cmd = (SilcServerCommandContext)context;
SilcClientEntry client = (SilcClientEntry)cmd->sock->user_data;
SilcServer server = cmd->server;
- SilcBuffer packet, nidp, oidp = NULL;
+ SilcBuffer nidp, oidp = NULL;
SilcClientID *new_id;
SilcUInt32 nick_len;
unsigned char *nick, *nickc = NULL;
}
/* Check for same nickname */
- if (!memcmp(client->nickname, nick, nick_len)) {
+ if (strlen(client->nickname) == nick_len &&
+ !memcmp(client->nickname, nick, nick_len)) {
nidp = silc_id_payload_encode(client->id, SILC_ID_CLIENT);
silc_free(nickc);
goto send_reply;
send_reply:
/* Send the new Client ID as reply command back to client */
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_NICK,
- SILC_STATUS_OK, 0, ident, 2,
- 2, nidp->data, nidp->len,
- 3, nick, nick_len);
- silc_server_packet_send(cmd->server, cmd->sock, SILC_PACKET_COMMAND_REPLY,
- 0, packet->data, packet->len, FALSE);
-
- silc_buffer_free(packet);
+ silc_server_send_command_reply(cmd->server, cmd->sock,
+ SILC_COMMAND_NICK,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, nidp->data, nidp->len,
+ 3, nick, nick_len);
silc_buffer_free(nidp);
if (oidp)
silc_buffer_free(oidp);
SilcUInt32 gch_count)
{
int i, k;
- SilcBuffer packet, idp;
+ SilcBuffer idp;
SilcChannelEntry entry;
SilcStatus status;
SilcUInt16 ident = silc_command_get_ident(cmd->payload);
}
/* Send the reply */
- packet =
- silc_command_reply_payload_encode_va(SILC_COMMAND_LIST,
- status, 0, ident, 4,
- 2, idp->data, idp->len,
- 3, entry->channel_name,
- strlen(entry->channel_name),
- 4, topic, topic ? strlen(topic) : 0,
- 5, usercount, 4);
- silc_server_packet_send(cmd->server, cmd->sock,
- SILC_PACKET_COMMAND_REPLY, 0, packet->data,
- packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(cmd->server, cmd->sock, SILC_COMMAND_LIST,
+ status, 0, ident, 4,
+ 2, idp->data, idp->len,
+ 3, entry->channel_name,
+ strlen(entry->channel_name),
+ 4, topic, topic ? strlen(topic) : 0,
+ 5, usercount, 4);
silc_buffer_free(idp);
k++;
}
}
/* Send the reply */
- packet =
- silc_command_reply_payload_encode_va(SILC_COMMAND_LIST,
- status, 0, ident, 4,
- 2, idp->data, idp->len,
- 3, entry->channel_name,
- strlen(entry->channel_name),
- 4, topic, topic ? strlen(topic) : 0,
- 5, usercount, 4);
- silc_server_packet_send(cmd->server, cmd->sock,
- SILC_PACKET_COMMAND_REPLY, 0, packet->data,
- packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(cmd->server, cmd->sock, SILC_COMMAND_LIST,
+ status, 0, ident, 4,
+ 2, idp->data, idp->len,
+ 3, entry->channel_name,
+ strlen(entry->channel_name),
+ 4, topic, topic ? strlen(topic) : 0,
+ 5, usercount, 4);
silc_buffer_free(idp);
k++;
}
SilcBuffer tmpbuf;
SilcUInt16 old_ident;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
SilcChannelID *channel_id;
SilcChannelEntry channel;
SilcChannelClientEntry chl;
- SilcBuffer packet, idp;
+ SilcBuffer idp;
unsigned char *tmp;
SilcUInt32 argc, tmp_len;
SilcUInt16 ident = silc_command_get_ident(cmd->payload);
/* Send the topic to client as reply packet */
idp = silc_id_payload_encode(channel_id, SILC_ID_CHANNEL);
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_TOPIC,
- SILC_STATUS_OK, 0, ident, 2,
- 2, idp->data, idp->len,
- 3, channel->topic,
- channel->topic ?
- strlen(channel->topic) : 0);
- silc_server_packet_send(cmd->server, cmd->sock, SILC_PACKET_COMMAND_REPLY,
- 0, packet->data, packet->len, FALSE);
-
- silc_buffer_free(packet);
+ silc_server_send_command_reply(cmd->server, cmd->sock, SILC_COMMAND_TOPIC,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, idp->data, idp->len,
+ 3, channel->topic,
+ channel->topic ?
+ strlen(channel->topic) : 0);
silc_buffer_free(idp);
silc_free(channel_id);
SilcIDListData idata;
SilcArgumentPayload args;
SilcHashTableList htl;
- SilcBuffer packet, list, tmp2;
+ SilcBuffer list, tmp2;
SilcBufferStruct alist;
unsigned char *tmp, *atype = NULL;
SilcUInt32 len, type, len2;
}
/* Now add or delete the information. */
- silc_server_inviteban_process(server, channel->invite_list,
- (SilcUInt8)atype[0], args);
+ if (!silc_server_inviteban_process(server, channel->invite_list,
+ (SilcUInt8)atype[0], args)) {
+ silc_server_command_send_status_reply(
+ cmd, SILC_COMMAND_INVITE,
+ SILC_STATUS_ERR_NOT_ENOUGH_PARAMS,
+ 0);
+ goto out;
+ }
}
silc_argument_payload_free(args);
}
/* Send command reply */
tmp = silc_argument_get_arg_type(cmd->args, 1, &len);
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_INVITE,
- SILC_STATUS_OK, 0, ident, 2,
- 2, tmp, len,
- 3, type && list ?
- list->data : NULL,
- type && list ? list->len : 0);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_INVITE,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, tmp, len,
+ 3, type && list ?
+ list->data : NULL,
+ type && list ? list->len : 0);
silc_buffer_free(list);
out:
{
SilcServerCommandContext cmd = (SilcServerCommandContext)context;
SilcServer server = cmd->server;
- SilcBuffer packet, idp;
+ SilcBuffer idp;
unsigned char *tmp;
SilcUInt32 tmp_len;
char *dest_server = NULL, *server_info = NULL, *server_name;
SilcBuffer tmpbuf;
SilcUInt16 old_ident;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
SilcBuffer tmpbuf;
SilcUInt16 old_ident;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
server_name = entry->server_name;
/* Send the reply */
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_INFO,
- SILC_STATUS_OK, 0, ident, 3,
- 2, idp->data, idp->len,
- 3, server_name,
- strlen(server_name),
- 4, server_info,
- server_info ?
- strlen(server_info) : 0);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
-
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_INFO,
+ SILC_STATUS_OK, 0, ident, 3,
+ 2, idp->data, idp->len,
+ 3, server_name,
+ strlen(server_name),
+ 4, server_info,
+ server_info ?
+ strlen(server_info) : 0);
silc_buffer_free(idp);
out:
statistical information. */
if (!cmd->pending && server->server_type != SILC_ROUTER &&
!server->standalone) {
+ SilcBuffer idp;
+
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
/* Send request to our router */
- SilcBuffer idp = silc_id_payload_encode(server->router->id,
- SILC_ID_SERVER);
+ idp = silc_id_payload_encode(server->router->id,
+ SILC_ID_SERVER);
packet = silc_command_payload_encode_va(SILC_COMMAND_STATS,
++server->cmd_ident, 1,
1, idp->data, idp->len);
SILC_STR_UI_INT(server->stat.router_ops),
SILC_STR_END);
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_STATS,
- SILC_STATUS_OK, 0, ident, 2,
- 2, tmp, tmp_len,
- 3, stats->data, stats->len);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY,
- 0, packet->data, packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_STATS,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, tmp, tmp_len,
+ 3, stats->data, stats->len);
silc_buffer_free(stats);
out:
passphrase = silc_memdup(tmp, tmp_len);
if (!passphrase || !channel->passphrase ||
+ strlen(channel->passphrase) != strlen(passphrase) ||
memcmp(passphrase, channel->passphrase, strlen(channel->passphrase))) {
chidp = silc_id_payload_encode(channel->id, SILC_ID_CHANNEL);
silc_server_command_send_status_data(cmd, SILC_COMMAND_JOIN,
silc_server_packet_send(server, sock, SILC_PACKET_COMMAND_REPLY, 0,
reply->data, reply->len, FALSE);
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
/* Send JOIN notify to locally connected clients on the channel. If
we are normal server then router will send or have sent JOIN notify
already. However since we've added the client already to our channel
/* Check for valid channel name. This is cached, the original is saved
in the channel context. */
- channel_namec = silc_identifier_check(tmp, tmp_len, SILC_STRING_UTF8, 256,
- NULL);
+ channel_namec = silc_channel_name_check(tmp, tmp_len, SILC_STRING_UTF8, 256,
+ NULL);
if (!channel_namec) {
silc_server_command_send_status_reply(cmd, SILC_COMMAND_JOIN,
SILC_STATUS_ERR_BAD_CHANNEL, 0);
goto out;
}
+#ifndef SILC_DIST_INPLACE
+ /* Limit how many channels client can join */
+ if (!cmd->pending && entry->channels &&
+ silc_hash_table_count(entry->channels) >=
+ server->config->param.chlimit) {
+ silc_server_command_send_status_reply(cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_RESOURCE_LIMIT,
+ 0);
+ goto out;
+ }
+#endif /* SILC_DIST_INPLACE */
+
silc_free(client_id);
client_id = silc_id_dup(entry->id, SILC_ID_CLIENT);
channel = silc_server_create_new_channel(server, server->id, cipher,
hmac, channel_name, TRUE);
if (!channel) {
- silc_server_command_send_status_data(
- cmd, SILC_COMMAND_JOIN,
- SILC_STATUS_ERR_UNKNOWN_ALGORITHM,
- 0, 2, cipher, strlen(cipher));
+ if (cipher) {
+ silc_server_command_send_status_data(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM,
+ 0, 2, cipher, strlen(cipher));
+ } else if (hmac) {
+ silc_server_command_send_status_data(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM,
+ 0, 2, hmac, strlen(hmac));
+ } else {
+ silc_server_command_send_status_reply(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_RESOURCE_LIMIT,
+ 0);
+ }
silc_free(client_id);
goto out;
}
goto out;
}
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
channel = silc_server_create_new_channel(server, server->id, cipher,
hmac, channel_name, TRUE);
if (!channel) {
- silc_server_command_send_status_data(
- cmd, SILC_COMMAND_JOIN,
- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, 0,
- 2, cipher, strlen(cipher));
+ if (cipher) {
+ silc_server_command_send_status_data(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM,
+ 0, 2, cipher, strlen(cipher));
+ } else if (hmac) {
+ silc_server_command_send_status_data(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM,
+ 0, 2, hmac, strlen(hmac));
+ } else {
+ silc_server_command_send_status_reply(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_RESOURCE_LIMIT,
+ 0);
+ }
silc_free(client_id);
goto out;
}
channel = silc_server_create_new_channel(server, server->id, cipher,
hmac, channel_name, TRUE);
if (!channel) {
- silc_server_command_send_status_data(
- cmd, SILC_COMMAND_JOIN,
- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, 0,
- 2, cipher, strlen(cipher));
+ if (cipher) {
+ silc_server_command_send_status_data(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM,
+ 0, 2, cipher, strlen(cipher));
+ } else if (hmac) {
+ silc_server_command_send_status_data(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM,
+ 0, 2, hmac, strlen(hmac));
+ } else {
+ silc_server_command_send_status_reply(
+ cmd, SILC_COMMAND_JOIN,
+ SILC_STATUS_ERR_RESOURCE_LIMIT,
+ 0);
+ }
silc_free(client_id);
goto out;
}
{
SilcServerCommandContext cmd = (SilcServerCommandContext)context;
SilcServer server = cmd->server;
- SilcBuffer packet, idp;
+ SilcBuffer idp;
char *motd, *dest_server = NULL;
SilcUInt32 motd_len;
SilcUInt16 ident = silc_command_get_ident(cmd->payload);
/* Send motd */
motd = silc_file_readfile(server->config->server_info->motd_file,
&motd_len);
- if (!motd)
+ if (!motd) {
+ /* No motd */
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_MOTD,
+ SILC_STATUS_OK, 0, ident, 1,
+ 2, idp->data, idp->len);
goto out;
+ }
motd[motd_len] = 0;
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_MOTD,
- SILC_STATUS_OK, 0,
- ident, 2,
- 2, idp->data, idp->len,
- 3, motd, motd_len);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_MOTD,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, idp->data, idp->len,
+ 3, motd, motd_len);
} else {
/* No motd */
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_MOTD,
- SILC_STATUS_OK, 0,
- ident, 1,
- 2, idp->data, idp->len);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_MOTD,
+ SILC_STATUS_OK, 0, ident, 1,
+ 2, idp->data, idp->len);
}
-
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
- silc_buffer_free(packet);
silc_buffer_free(idp);
} else {
SilcServerEntry entry;
SilcBuffer tmpbuf;
SilcUInt16 old_ident;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
SilcBuffer tmpbuf;
SilcUInt16 old_ident;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
}
idp = silc_id_payload_encode(entry->id, SILC_ID_SERVER);
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_MOTD,
- SILC_STATUS_OK, 0, ident, 2,
- 2, idp->data, idp->len,
- 3, entry->motd,
- entry->motd ?
- strlen(entry->motd) : 0);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_MOTD,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, idp->data, idp->len,
+ 3, entry->motd,
+ entry->motd ?
+ strlen(entry->motd) : 0);
silc_buffer_free(idp);
}
SilcServerCommandContext cmd = (SilcServerCommandContext)context;
SilcServer server = cmd->server;
SilcClientEntry client = (SilcClientEntry)cmd->sock->user_data;
- SilcBuffer packet;
unsigned char *tmp_mask, m[4];
SilcUInt32 mask = 0;
SilcUInt16 ident = silc_command_get_ident(cmd->payload);
/* Send command reply to sender */
SILC_PUT32_MSB(client->mode, m);
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_UMODE,
- SILC_STATUS_OK, 0, ident, 1,
- 2, m, sizeof(m));
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_UMODE,
+ SILC_STATUS_OK, 0, ident, 1,
+ 2, m, sizeof(m));
out:
silc_server_command_free(cmd);
SilcChannelID *channel_id = NULL;
SilcChannelEntry channel;
SilcChannelClientEntry chl;
- SilcBuffer packet, cidp;
+ SilcBuffer cidp;
unsigned char *tmp, *tmp_id, *tmp_mask, *chpkdata = NULL;
char *cipher = NULL, *hmac = NULL, *passphrase = NULL, ulimit[4];
SilcUInt32 mode_mask = 0, old_mask = 0, tmp_len, tmp_len2, chpklen;
if (channel->channel_pubkeys)
chpklist = silc_server_get_channel_pk_list(server, channel,
FALSE, FALSE);
- packet =
- silc_command_reply_payload_encode_va(SILC_COMMAND_CMODE,
- SILC_STATUS_OK, 0, ident, 4,
- 2, tmp_id, tmp_len2,
- 3, m, sizeof(m),
- 4, fkey ? fkey->data : NULL,
- fkey ? fkey->len : 0,
- 5, chpklist ? chpklist->data : NULL,
- chpklist ? chpklist->len : 0);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_CMODE,
+ SILC_STATUS_OK, 0, ident, 4,
+ 2, tmp_id, tmp_len2,
+ 3, m, sizeof(m),
+ 4, fkey ? fkey->data : NULL,
+ fkey ? fkey->len : 0,
+ 5, chpklist ? chpklist->data : NULL,
+ chpklist ? chpklist->len : 0);
goto out;
}
new channel key. Clients are not using private channel keys
anymore after this. */
+ /* if we don't remove the flag from the mode
+ * silc_server_create_channel_key won't create a new key */
+ channel->mode &= ~SILC_CHANNEL_MODE_PRIVKEY;
+
/* Re-generate channel key */
if (!silc_server_create_channel_key(server, channel, 0))
goto out;
if (mode_mask & SILC_CHANNEL_MODE_HMAC) {
if (!(channel->mode & SILC_CHANNEL_MODE_HMAC)) {
/* HMAC to use protect the traffic */
- unsigned char hash[32];
+ unsigned char hash[SILC_HASH_MAXLEN];
SilcHmac newhmac;
/* Get hmac */
/* Hmac mode is unset. Remove the hmac and revert back to
default hmac */
SilcHmac newhmac;
- unsigned char hash[32];
+ unsigned char hash[SILC_HASH_MAXLEN];
hmac = channel->hmac_name;
/* Delete old hmac and allocate default one */
chpklist = silc_server_get_channel_pk_list(server, channel, FALSE, FALSE);
/* Send command reply to sender */
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_CMODE,
- SILC_STATUS_OK, 0, ident, 5,
- 2, tmp_id, tmp_len2,
- 3, tmp_mask, 4,
- 4, fkey ? fkey->data : NULL,
- fkey ? fkey->len : 0,
- 5, chpklist ? chpklist->data :
- NULL, chpklist ? chpklist->len
- : 0,
- 6, (mode_mask &
- SILC_CHANNEL_MODE_ULIMIT ?
- ulimit : NULL),
- (mode_mask &
- SILC_CHANNEL_MODE_ULIMIT ?
- sizeof(ulimit) : 0));
-
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
-
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_CMODE,
+ SILC_STATUS_OK, 0, ident, 5,
+ 2, tmp_id, tmp_len2,
+ 3, tmp_mask, 4,
+ 4, fkey ? fkey->data : NULL,
+ fkey ? fkey->len : 0,
+ 5, chpklist ? chpklist->data :
+ NULL, chpklist ? chpklist->len
+ : 0,
+ 6, (mode_mask &
+ SILC_CHANNEL_MODE_ULIMIT ?
+ ulimit : NULL),
+ (mode_mask &
+ SILC_CHANNEL_MODE_ULIMIT ?
+ sizeof(ulimit) : 0));
silc_buffer_free(cidp);
out:
SilcChannelEntry channel;
SilcClientEntry target_client;
SilcChannelClientEntry chl;
- SilcBuffer packet, idp;
+ SilcBuffer idp;
unsigned char *tmp_id, *tmp_ch_id, *tmp_mask;
SilcUInt32 target_mask, sender_mask = 0, tmp_len, tmp_ch_len;
int notify = FALSE;
}
/* Send command reply to sender */
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_CUMODE,
- SILC_STATUS_OK, 0, ident, 3,
- 2, tmp_mask, 4,
- 3, tmp_ch_id, tmp_ch_len,
- 4, tmp_id, tmp_len);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
-
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_CUMODE,
+ SILC_STATUS_OK, 0, ident, 3,
+ 2, tmp_mask, 4,
+ 3, tmp_ch_id, tmp_ch_len,
+ 4, tmp_id, tmp_len);
silc_buffer_free(idp);
out:
SilcClientID *client_id;
SilcChannelEntry channel;
SilcChannelClientEntry chl;
- SilcBuffer idp, packet;
+ SilcBuffer idp;
SilcUInt32 tmp_len, target_idp_len, clen;
SilcUInt16 ident = silc_command_get_ident(cmd->payload);
unsigned char *tmp, *comment, *target_idp;
/* Send the reply back to the client */
- packet =
- silc_command_reply_payload_encode_va(SILC_COMMAND_KICK,
- SILC_STATUS_OK, 0, ident, 2,
- 2, tmp, tmp_len,
- 3, target_idp, target_idp_len);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_KICK,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, tmp, tmp_len,
+ 3, target_idp, target_idp_len);
/* Send KICKED notify to local clients on the channel */
idp = silc_id_payload_encode(client->id, SILC_ID_CLIENT);
silc_argument_payload_encode_one(NULL, target_idp, target_idp_len, 3);
SilcArgumentPayload args =
silc_argument_payload_parse(ab->data, ab->len, 1);
+
silc_server_inviteban_process(server, channel->invite_list, 1, args);
silc_buffer_free(ab);
silc_argument_payload_free(args);
SILC_SERVER_CMD_FUNC(watch)
{
SilcServerCommandContext cmd = (SilcServerCommandContext)context;
- SilcServerEntry server_entry;
SilcServer server = cmd->server;
char *add_nick, *del_nick;
SilcUInt32 add_nick_len, del_nick_len, tmp_len, pk_len;
- unsigned char hash[16], *tmp, *pk, *nick;
+ unsigned char hash[SILC_HASH_MAXLEN], *tmp, *pk, *nick;
SilcClientEntry client;
SilcClientID *client_id = NULL;
+ SilcUInt16 old_ident;
SILC_SERVER_COMMAND_CHECK(SILC_COMMAND_WATCH, cmd, 1, 3);
if (!cmd->pending) {
/* Send the command to router */
SilcBuffer tmpbuf;
- SilcUInt16 old_ident;
+
+ /* If backup receives this from primary, handle it locally */
+ if (server->server_type == SILC_BACKUP_ROUTER &&
+ cmd->sock == SILC_PRIMARY_ROUTE(server))
+ goto process_watch;
SILC_LOG_DEBUG(("Forwarding WATCH to router"));
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
cmd->pending = TRUE;
silc_command_set_ident(cmd->payload, old_ident);
silc_buffer_free(tmpbuf);
- } else if (context2) {
- /* Received reply from router, just send same data to the client. */
+ goto out;
+ } else {
SilcServerCommandReplyContext reply = context2;
SilcStatus status;
- SILC_LOG_DEBUG(("Received reply to WATCH from router"));
+ if (!reply)
+ goto out;
+
silc_command_get_status(reply->payload, &status, NULL);
- silc_server_command_send_status_reply(cmd, SILC_COMMAND_WATCH, status,
- 0);
+
+ /* Backup router handles the WATCH command also. */
+ if (server->server_type != SILC_BACKUP_ROUTER ||
+ SILC_STATUS_IS_ERROR(status)) {
+ /* Received reply from router, just send same data to the client. */
+ SILC_LOG_DEBUG(("Received reply to WATCH from router"));
+ silc_server_command_send_status_reply(cmd, SILC_COMMAND_WATCH, status,
+ 0);
+ goto out;
+ }
}
- goto out;
}
/* We are router and keep the watch list for local cell */
+ process_watch:
/* Get the client ID */
tmp = silc_argument_get_arg_type(cmd->args, 1, &tmp_len);
client = silc_idlist_find_client_by_id(server->local_list,
client_id, TRUE, NULL);
if (!client) {
- silc_server_command_send_status_data(cmd, SILC_COMMAND_WATCH,
- SILC_STATUS_ERR_NO_SUCH_CLIENT_ID, 0,
- 2, tmp, tmp_len);
- goto out;
+ /* Backup checks global list also */
+ if (server->server_type == SILC_BACKUP_ROUTER)
+ client = silc_idlist_find_client_by_id(server->global_list,
+ client_id, TRUE, NULL);
+ if (!client) {
+ silc_server_command_send_status_data(cmd, SILC_COMMAND_WATCH,
+ SILC_STATUS_ERR_NO_SUCH_CLIENT_ID,
+ 0, 2, tmp, tmp_len);
+ goto out;
+ }
}
/* Take public key for watching by public key */
}
}
+ /* Send reply */
+ silc_server_command_send_status_reply(cmd, SILC_COMMAND_WATCH,
+ SILC_STATUS_OK, 0);
+
/* Distribute the watch list to backup routers too */
if (server->backup) {
SilcBuffer tmpbuf;
+
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
+ old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
silc_server_backup_send(server, cmd->sock->user_data, SILC_PACKET_COMMAND,
cmd->packet->flags, tmpbuf->data, tmpbuf->len,
FALSE, TRUE);
+ silc_command_set_ident(cmd->payload, old_ident);
silc_buffer_free(tmpbuf);
}
- silc_server_command_send_status_reply(cmd, SILC_COMMAND_WATCH,
- SILC_STATUS_OK, 0);
-
out:
silc_free(client_id);
silc_server_command_free(cmd);
username = silc_identifier_check(username, tmp_len, SILC_STRING_UTF8, 128,
&tmp_len);
if (!username) {
- silc_server_command_send_status_reply(cmd, SILC_COMMAND_OPER,
+ silc_server_command_send_status_reply(cmd, SILC_COMMAND_SILCOPER,
SILC_STATUS_ERR_BAD_USERNAME,
0);
goto out;
}
if (!result) {
/* Authentication failed */
- silc_server_command_send_status_reply(cmd, SILC_COMMAND_OPER,
+ silc_server_command_send_status_reply(cmd, SILC_COMMAND_SILCOPER,
SILC_STATUS_ERR_AUTH_FAILED, 0);
goto out;
}
SilcServerCommandContext cmd = (SilcServerCommandContext)context;
SilcServer server = cmd->server;
SilcClientEntry client = (SilcClientEntry)cmd->sock->user_data;
- SilcBuffer packet, list, tmp2;
+ SilcBuffer list, tmp2;
SilcChannelEntry channel;
SilcChannelClientEntry chl;
SilcChannelID *channel_id = NULL;
}
/* Now add or delete the information. */
- silc_server_inviteban_process(server, channel->ban_list,
- (SilcUInt8)atype[0], args);
+ if (!silc_server_inviteban_process(server, channel->ban_list,
+ (SilcUInt8)atype[0], args)) {
+ silc_server_command_send_status_reply(
+ cmd, SILC_COMMAND_BAN,
+ SILC_STATUS_ERR_NOT_ENOUGH_PARAMS,
+ 0);
+ goto out;
+ }
}
silc_argument_payload_free(args);
}
}
/* Send the reply back to the client */
- packet =
- silc_command_reply_payload_encode_va(SILC_COMMAND_BAN,
- SILC_STATUS_OK, 0, ident, 2,
- 2, id, id_len,
- 3, list ? list->data : NULL,
- list ? list->len : 0);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
-
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_BAN,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, id, id_len,
+ 3, list ? list->data : NULL,
+ list ? list->len : 0);
silc_buffer_free(list);
out:
SilcServer server = cmd->server;
SilcChannelEntry channel;
SilcChannelID *id = NULL;
- SilcBuffer packet, idp;
+ SilcBuffer idp;
unsigned char *channel_id;
SilcUInt32 channel_id_len;
SilcBuffer client_id_list;
/* Check channel name */
if (channel_name) {
- channel_namec = silc_identifier_check(channel_name, strlen(channel_name),
- SILC_STRING_UTF8, 256, NULL);
+ channel_namec = silc_channel_name_check(channel_name, strlen(channel_name),
+ SILC_STRING_UTF8, 256, NULL);
if (!channel_namec) {
silc_server_command_send_status_reply(cmd, SILC_COMMAND_USERS,
SILC_STATUS_ERR_BAD_CHANNEL, 0);
!cmd->pending) {
SilcBuffer tmpbuf;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
/* Send reply */
idp = silc_id_payload_encode(channel->id, SILC_ID_CHANNEL);
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_USERS,
- SILC_STATUS_OK, 0, ident, 4,
- 2, idp->data, idp->len,
- 3, lc, 4,
- 4, client_id_list ?
- client_id_list->data : NULL,
- client_id_list ?
- client_id_list->len : 0,
- 5, client_mode_list ?
- client_mode_list->data : NULL,
- client_mode_list ?
- client_mode_list->len : 0);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
-
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_USERS,
+ SILC_STATUS_OK, 0, ident, 4,
+ 2, idp->data, idp->len,
+ 3, lc, 4,
+ 4, client_id_list ?
+ client_id_list->data : NULL,
+ client_id_list ?
+ client_id_list->len : 0,
+ 5, client_mode_list ?
+ client_mode_list->data : NULL,
+ client_mode_list ?
+ client_mode_list->len : 0);
silc_buffer_free(idp);
- silc_buffer_free(packet);
if (client_id_list)
silc_buffer_free(client_id_list);
if (client_mode_list)
{
SilcServerCommandContext cmd = (SilcServerCommandContext)context;
SilcServer server = cmd->server;
- SilcBuffer packet;
SilcClientEntry client;
SilcServerEntry server_entry;
SilcClientID *client_id = NULL;
if (!dest_sock)
goto out;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
SilcBuffer tmpbuf;
SilcUInt16 old_ident;
+ /* Statistics */
+ cmd->server->stat.commands_sent++;
+
old_ident = silc_command_get_ident(cmd->payload);
silc_command_set_ident(cmd->payload, ++server->cmd_ident);
tmpbuf = silc_command_payload_encode_payload(cmd->payload);
}
tmp = silc_argument_get_arg_type(cmd->args, 1, &tmp_len);
- packet = silc_command_reply_payload_encode_va(SILC_COMMAND_GETKEY,
- SILC_STATUS_OK, 0, ident, 2,
- 2, tmp, tmp_len,
- 3, pk ? pk->data : NULL,
- pk ? pk->len : 0);
- silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0,
- packet->data, packet->len, FALSE);
- silc_buffer_free(packet);
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_GETKEY,
+ SILC_STATUS_OK, 0, ident, 2,
+ 2, tmp, tmp_len,
+ 3, pk ? pk->data : NULL,
+ pk ? pk->len : 0);
out:
if (idp)
silc_server_command_free(cmd);
}
+/* Server side of command SERVICE. */
+/* XXX currently this just sends empty reply back */
+
+SILC_SERVER_CMD_FUNC(service)
+{
+ SilcServerCommandContext cmd = (SilcServerCommandContext)context;
+ SilcServer server = cmd->server;
+ SilcUInt32 tmp_len, auth_len;
+ unsigned char *service_name, *auth;
+ bool send_list = FALSE;
+ SilcUInt16 ident = silc_command_get_ident(cmd->payload);
+
+ SILC_SERVER_COMMAND_CHECK(SILC_COMMAND_SERVICE, cmd, 0, 256);
+
+ /* Get requested service */
+ service_name = silc_argument_get_arg_type(cmd->args, 1, &tmp_len);
+ if (service_name && tmp_len) {
+ /* Verify service name */
+ if (!silc_identifier_verify(service_name, tmp_len,
+ SILC_STRING_UTF8, 256)) {
+ silc_server_command_send_status_reply(cmd, SILC_COMMAND_SERVICE,
+ SILC_STATUS_ERR_NOT_ENOUGH_PARAMS,
+ 0);
+ goto out;
+ }
+ }
+
+ /* Get authentication payload if present */
+ auth = silc_argument_get_arg_type(cmd->args, 2, &auth_len);
+ if (auth) {
+ /* XXX */
+ }
+
+
+ send_list = TRUE;
+
+ /* Send our service list back */
+ silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_SERVICE,
+ SILC_STATUS_OK, 0, ident, 0);
+
+ out:
+ silc_server_command_free(cmd);
+}
+
/* Private range commands, specific to this implementation */
projects / silc.git / blobdiff