ident = silc_command_get_ident(ctx->payload);
/* Check for pending commands and mark to be exeucted */
- silc_server_command_pending_check(server, ctx,
- silc_command_get(ctx->payload), ident);
+ ctx->callbacks =
+ silc_server_command_pending_check(server, ctx,
+ silc_command_get(ctx->payload),
+ ident, &ctx->callbacks_count);
/* Execute command reply */
command = silc_command_get(ctx->payload);
silc_command_payload_free(cmd->payload);
if (cmd->sock)
silc_socket_free(cmd->sock); /* Decrease the reference counter */
+ silc_free(cmd->callbacks);
silc_free(cmd);
}
}
/* Check if we have this client cached already. */
- client = silc_idlist_find_client_by_id(server->local_list, client_id, NULL);
+ client = silc_idlist_find_client_by_id(server->local_list, client_id,
+ FALSE, NULL);
if (!client) {
client = silc_idlist_find_client_by_id(server->global_list, client_id,
- NULL);
+ FALSE, NULL);
global = TRUE;
}
if (!client) {
/* If router did not find such Client ID in its lists then this must
be bogus client or some router in the net is buggy. */
- if (server->server_type == SILC_ROUTER)
+ if (server->server_type != SILC_SERVER)
return FALSE;
/* Take hostname out of nick string if it includes it. */
- if (strchr(nickname, '@')) {
- int len = strcspn(nickname, "@");
- nick = silc_calloc(len + 1, sizeof(char));
- servername = silc_calloc((strlen(nickname) - len) + 1, sizeof(char));
- memcpy(nick, nickname, len);
- memcpy(servername, nickname + len + 1, strlen(nickname) - len);
- } else {
- nick = strdup(nickname);
- }
+ silc_parse_userfqdn(nickname, &nick, &servername);
/* We don't have that client anywhere, add it. The client is added
to global list since server didn't have it in the lists so it must be
strdup(username),
strdup(realname), client_id,
cmd->sock->user_data, NULL);
- if (!client)
+ if (!client) {
+ SILC_LOG_ERROR(("Could not add new client to the ID Cache"));
return FALSE;
+ }
- client->data.registered = TRUE;
+ client->data.status |=
+ (SILC_IDLIST_STATUS_REGISTERED | SILC_IDLIST_STATUS_RESOLVED);
+ client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
client->mode = mode;
client->servername = servername;
} else {
SILC_LOG_DEBUG(("Updating client data"));
/* Take hostname out of nick string if it includes it. */
- if (strchr(nickname, '@')) {
- int len = strcspn(nickname, "@");
- nick = silc_calloc(len + 1, sizeof(char));
- servername = silc_calloc((strlen(nickname) - len) + 1, sizeof(char));
- memcpy(nick, nickname, len);
- memcpy(servername, nickname + len + 1, strlen(nickname) - len);
- } else {
- nick = strdup(nickname);
- }
+ silc_parse_userfqdn(nickname, &nick, &servername);
- if (client->nickname)
- silc_free(client->nickname);
- if (client->username)
- silc_free(client->username);
- if (client->userinfo)
- silc_free(client->userinfo);
+ /* Remove the old cache entry */
+ silc_idcache_del_by_context(global ? server->global_list->clients :
+ server->local_list->clients, client);
+
+ silc_free(client->nickname);
+ silc_free(client->username);
+ silc_free(client->userinfo);
+ silc_free(client->servername);
client->nickname = nick;
client->username = strdup(username);
client->userinfo = strdup(realname);
- client->mode = mode;
client->servername = servername;
+ client->mode = mode;
+ client->data.status |= SILC_IDLIST_STATUS_RESOLVED;
+ client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
- /* Remove the old cache entry and create a new one */
- silc_idcache_del_by_context(global ? server->global_list->clients :
- server->local_list->clients, client);
+ /* Create new cache entry */
silc_idcache_add(global ? server->global_list->clients :
server->local_list->clients, nick, client->id,
client, FALSE);
/* Check if we have this client cached already. */
client = silc_idlist_find_client_by_id(server->local_list, client_id,
- &cache);
+ FALSE, &cache);
if (!client) {
client = silc_idlist_find_client_by_id(server->global_list,
- client_id, &cache);
+ client_id, FALSE, &cache);
global = TRUE;
}
if (!client) {
/* If router did not find such Client ID in its lists then this must
be bogus client or some router in the net is buggy. */
- if (server->server_type == SILC_ROUTER)
+ if (server->server_type != SILC_SERVER)
return FALSE;
/* Take hostname out of nick string if it includes it. */
- if (strchr(nickname, '@')) {
- int len = strcspn(nickname, "@");
- nick = silc_calloc(len + 1, sizeof(char));
- servername = silc_calloc((strlen(nickname) - len) + 1, sizeof(char));
- memcpy(nick, nickname, len);
- memcpy(servername, nickname + len + 1, strlen(nickname) - len);
- } else {
- nick = strdup(nickname);
- }
+ silc_parse_userfqdn(nickname, &nick, &servername);
/* We don't have that client anywhere, add it. The client is added
to global list since server didn't have it in the lists so it must be
strdup(username), strdup(realname),
silc_id_dup(client_id, SILC_ID_CLIENT),
cmd->sock->user_data, NULL);
- if (!client)
+ if (!client) {
+ SILC_LOG_ERROR(("Could not add new client to the ID Cache"));
return FALSE;
+ }
- client->data.registered = FALSE;
+ client->data.status &= ~SILC_IDLIST_STATUS_REGISTERED;
client = silc_idlist_find_client_by_id(server->global_list,
- client_id, &cache);
+ client_id, TRUE, &cache);
cache->expire = SILC_ID_CACHE_EXPIRE_DEF;
client->servername = servername;
} else {
/* We have the client already, update the data */
/* Take hostname out of nick string if it includes it. */
- if (strchr(nickname, '@')) {
- int len = strcspn(nickname, "@");
- nick = silc_calloc(len + 1, sizeof(char));
- servername = silc_calloc((strlen(nickname) - len) + 1, sizeof(char));
- memcpy(nick, nickname, len);
- memcpy(servername, nickname + len + 1, strlen(nickname) - len);
- } else {
- nick = strdup(nickname);
- }
+ silc_parse_userfqdn(nickname, &nick, &servername);
- if (client->nickname)
- silc_free(client->nickname);
- if (client->username)
- silc_free(client->username);
+ silc_free(client->nickname);
+ silc_free(client->username);
client->nickname = nick;
client->username = strdup(username);
SILC_LOG_DEBUG(("Received client information"));
client = silc_idlist_find_client_by_id(server->local_list,
- client_id, NULL);
+ client_id, FALSE, NULL);
if (!client) {
client = silc_idlist_find_client_by_id(server->global_list, client_id,
- NULL);
+ FALSE, NULL);
global = TRUE;
}
if (!client) {
/* If router did not find such Client ID in its lists then this must
be bogus client or some router in the net is buggy. */
- if (server->server_type == SILC_ROUTER)
+ if (server->server_type != SILC_SERVER)
goto error;
-
- /* Take hostname out of nick string if it includes it. */
- if (name) {
- if (strchr(name, '@')) {
- int len = strcspn(name, "@");
- nick = silc_calloc(len + 1, sizeof(char));
- memcpy(nick, name, len);
- } else {
- nick = strdup(name);
- }
- }
+
+ /* Take nickname */
+ if (name)
+ silc_parse_userfqdn(name, &nick, NULL);
/* We don't have that client anywhere, add it. The client is added
to global list since server didn't have it in the lists so it must be
client = silc_idlist_add_client(server->global_list, nick,
info ? strdup(info) : NULL, NULL,
client_id, cmd->sock->user_data, NULL);
- client->data.registered = TRUE;
+ if (!client) {
+ SILC_LOG_ERROR(("Could not add new client to the ID Cache"));
+ goto error;
+ }
+ client->data.status |= SILC_IDLIST_STATUS_REGISTERED;
+ client->data.status |= SILC_IDLIST_STATUS_RESOLVED;
+ client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
} else {
/* We have the client already, update the data */
SILC_LOG_DEBUG(("Updating client data"));
- /* Take hostname out of nick string if it includes it. */
+ /* Take nickname */
if (name) {
- if (strchr(name, '@')) {
- int len = strcspn(name, "@");
- nick = silc_calloc(len + 1, sizeof(char));
- memcpy(nick, name, len);
- } else {
- nick = strdup(name);
- }
- }
-
- if (name && client->nickname)
+ silc_parse_userfqdn(name, &nick, NULL);
+
+ /* Remove the old cache entry */
+ silc_idcache_del_by_context(global ? server->global_list->clients :
+ server->local_list->clients, client);
+
silc_free(client->nickname);
-
- if (nick)
client->nickname = nick;
+ }
- if (info && client->username) {
+ if (info) {
silc_free(client->username);
client->username = strdup(info);
}
+
+ client->data.status |= SILC_IDLIST_STATUS_RESOLVED;
+ client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
- /* Remove the old cache entry and create a new one */
if (name) {
- silc_idcache_del_by_context(global ? server->global_list->clients :
- server->local_list->clients, client);
+ /* Add new cache entry */
silc_idcache_add(global ? server->global_list->clients :
server->local_list->clients, nick, client->id,
client, FALSE);
SILC_LOG_DEBUG(("Received server information"));
server_entry = silc_idlist_find_server_by_id(server->local_list,
- server_id, NULL);
+ server_id, FALSE, NULL);
if (!server_entry)
server_entry = silc_idlist_find_server_by_id(server->global_list,
- server_id, NULL);
+ server_id, FALSE, NULL);
if (!server_entry) {
/* If router did not find such Server ID in its lists then this must
- be bogus client or some router in the net is buggy. */
- if (server->server_type == SILC_ROUTER)
+ be bogus server or some router in the net is buggy. */
+ if (server->server_type != SILC_SERVER)
goto error;
/* We don't have that server anywhere, add it. */
silc_free(server_id);
goto error;
}
+ server_entry->data.status |= SILC_IDLIST_STATUS_REGISTERED;
+ server_entry->data.status |= SILC_IDLIST_STATUS_RESOLVED;
+ server_entry->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
server_id = NULL;
}
channel = silc_idlist_find_channel_by_id(server->global_list, channel_id,
NULL);
if (!channel) {
- /* If router did not find such Server ID in its lists then this must
- be bogus client or some router in the net is buggy. */
- if (server->server_type == SILC_ROUTER)
+ /* If router did not find such Channel ID in its lists then this must
+ be bogus channel or some router in the net is buggy. */
+ if (server->server_type != SILC_SERVER)
goto error;
/* We don't have that server anywhere, add it. */
if (tmp_len > 256)
goto out;
- entry = silc_idlist_find_server_by_id(server->local_list, server_id, NULL);
+ entry = silc_idlist_find_server_by_id(server->local_list, server_id,
+ FALSE, NULL);
if (!entry) {
entry = silc_idlist_find_server_by_id(server->global_list, server_id,
- NULL);
+ FALSE, NULL);
if (!entry) {
/* Add the server to global list */
server_id = silc_id_dup(server_id, SILC_ID_SERVER);
silc_free(server_id);
goto out;
}
+ entry->data.status |= SILC_IDLIST_STATUS_REGISTERED;
}
}
if (!server_id)
goto out;
- entry = silc_idlist_find_server_by_id(server->local_list, server_id, NULL);
+ entry = silc_idlist_find_server_by_id(server->local_list, server_id,
+ TRUE, NULL);
if (!entry) {
entry = silc_idlist_find_server_by_id(server->global_list, server_id,
- NULL);
+ TRUE, NULL);
if (!entry)
goto out;
}
(created == 0 ? "existing" : "created"), channel_name,
silc_id_render(id, SILC_ID_CHANNEL)));
+ /* If the channel is found from global list we must move it to the
+ local list. */
+ entry = silc_idlist_find_channel_by_name(server->global_list,
+ channel_name, &cache);
+ if (entry)
+ silc_idlist_del_channel(server->global_list, entry);
+
/* Add the channel to our local list. */
entry = silc_idlist_add_channel(server->local_list, strdup(channel_name),
SILC_CHANNEL_MODE_NONE, id,
out:
SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN);
- if (client_id)
- silc_free(client_id);
+ silc_free(client_id);
silc_server_command_reply_free(cmd);
if (client_id_list)
if (!channel) {
SilcBuffer idp;
- if (server->server_type == SILC_ROUTER)
+ if (server->server_type != SILC_SERVER)
goto out;
idp = silc_id_payload_encode(channel_id, SILC_ID_CHANNEL);
client_id = silc_id_payload_get_id(idp);
client = silc_idlist_find_client_by_id(server->local_list, client_id,
- NULL);
+ TRUE, NULL);
if (!client) {
client = silc_idlist_find_client_by_id(server->global_list,
- client_id, NULL);
+ client_id, TRUE, NULL);
if (!client)
goto out;
}
server_id = silc_id_payload_get_id(idp);
server_entry = silc_idlist_find_server_by_id(server->local_list, server_id,
- NULL);
+ TRUE, NULL);
if (!server_entry) {
server_entry = silc_idlist_find_server_by_id(server->global_list,
- server_id, NULL);
+ server_id, TRUE, NULL);
if (!server_entry)
goto out;
}
projects / silc.git / blobdiff