X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fserver.c;h=f0ed13f8e6b1950302bfdb8045d0f1e150ffcdb1;hb=d47a87b03b846e2333ef57b2c0d81f1644992964;hp=8f58188eb09208c6ad063a129977e3f3be65435c;hpb=6b9bd8ef71943b580d26d0a686bc2ebdc55f2731;p=silc.git diff --git a/apps/silcd/server.c b/apps/silcd/server.c index 8f58188e..f0ed13f8 100644 --- a/apps/silcd/server.c +++ b/apps/silcd/server.c @@ -115,21 +115,20 @@ int silc_server_init(SilcServer server) SilcServerID *id; SilcServerEntry id_entry; SilcIDListPurge purge; - SilcServerConfigSectionListenPort *listen; SILC_LOG_DEBUG(("Initializing server")); assert(server); assert(server->config); /* Set public and private keys */ - if (!server->config->server_keys || - !server->config->server_keys->public_key || - !server->config->server_keys->private_key) { + if (!server->config->server_info || + !server->config->server_info->public_key || + !server->config->server_info->private_key) { SILC_LOG_ERROR(("Server public key and/or private key does not exist")); return FALSE; } - server->public_key = server->config->server_keys->public_key; - server->private_key = server->config->server_keys->private_key; + server->public_key = server->config->server_info->public_key; + server->private_key = server->config->server_info->private_key; /* XXX After server is made as Silc Server Library this can be given as argument, for now this is hard coded */ @@ -141,18 +140,14 @@ int silc_server_init(SilcServer server) server->params->protocol_timeout = 60; server->params->require_reverse_mapping = FALSE; - /* Set log files where log message should be saved. */ - server->config->server = server; - silc_server_config_setlogfiles(server->config); - /* Register all configured ciphers, PKCS and hash functions. */ - if (!silc_server_config_register_ciphers(server->config)) + if (!silc_server_config_register_ciphers(server)) silc_cipher_register_default(); - if (!silc_server_config_register_pkcs(server->config)) + if (!silc_server_config_register_pkcs(server)) silc_pkcs_register_default(); - if (!silc_server_config_register_hashfuncs(server->config)) + if (!silc_server_config_register_hashfuncs(server)) silc_hash_register_default(); - if (!silc_server_config_register_hmacs(server->config)) + if (!silc_server_config_register_hmacs(server)) silc_hmac_register_default(); /* Initialize random number generator for the server. */ @@ -164,9 +159,6 @@ int silc_server_init(SilcServer server) silc_hash_alloc("md5", &server->md5hash); silc_hash_alloc("sha1", &server->sha1hash); - /* Initialize none cipher */ - silc_cipher_alloc("none", &server->none_cipher); - /* Allocate PKCS context for local public and private keys */ silc_pkcs_alloc(server->public_key->name, &server->pkcs); silc_pkcs_public_key_set(server->pkcs, server->public_key); @@ -175,24 +167,23 @@ int silc_server_init(SilcServer server) /* Create a listening server. Note that our server can listen on multiple ports. All listeners are created here and now. */ sock_count = 0; - listen = server->config->listen_port; - while(listen) { + while (1) { int tmp; - tmp = silc_net_create_server(server->config->listen_port->port, - server->config->listen_port->listener_ip); + tmp = silc_net_create_server(server->config->server_info->port, + server->config->server_info->server_ip); if (tmp < 0) { - SILC_LOG_ERROR(("Could not create server listener: %s on %d", - server->config->listen_port->listener_ip, - server->config->listen_port->port)); + SILC_LOG_ERROR(("Could not create server listener: %s on %hd", + server->config->server_info->server_ip, + server->config->server_info->port)); goto err0; } sock = silc_realloc(sock, sizeof(*sock) * (sock_count + 1)); sock[sock_count] = tmp; sock_count++; - listen = listen->next; + break; } /* Initialize ID caches */ @@ -284,7 +275,7 @@ int silc_server_init(SilcServer server) server->schedule = silc_schedule_init(SILC_SERVER_MAX_CONNECTIONS); if (!server->schedule) goto err0; - + /* Add the first task to the scheduler. This is task that is executed by timeout. It expires as soon as the caller calls silc_server_run. This task performs authentication protocol and key exchange with our @@ -305,10 +296,13 @@ int silc_server_init(SilcServer server) SILC_TASK_PRI_NORMAL); server->listenning = TRUE; + /* Send log file configuration */ + silc_server_config_setlogfiles(server->config, server->schedule); + /* If server connections has been configured then we must be router as normal server cannot have server connections, only router connections. */ if (server->config->servers) { - SilcServerConfigSectionServerConnection *ptr = server->config->servers; + SilcServerConfigSectionServer *ptr = server->config->servers; server->server_type = SILC_ROUTER; while (ptr) { @@ -329,18 +323,20 @@ int silc_server_init(SilcServer server) purge = silc_calloc(1, sizeof(*purge)); purge->cache = server->local_list->clients; purge->schedule = server->schedule; + purge->timeout = 600; silc_schedule_task_add(purge->schedule, 0, silc_idlist_purge, - (void *)purge, 600, 0, + (void *)purge, purge->timeout, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_LOW); /* Clients global list */ purge = silc_calloc(1, sizeof(*purge)); purge->cache = server->global_list->clients; purge->schedule = server->schedule; + purge->timeout = 300; silc_schedule_task_add(purge->schedule, 0, silc_idlist_purge, - (void *)purge, 300, 0, + (void *)purge, purge->timeout, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_LOW); SILC_LOG_DEBUG(("Server initialized")); @@ -355,27 +351,26 @@ int silc_server_init(SilcServer server) return FALSE; } -/* Fork server to background and set gid+uid to non-root */ +/* Fork server to background */ void silc_server_daemonise(SilcServer server) { int i; - i = fork (); + SILC_LOG_DEBUG(("Forking SILC server to background")); - if (i) { - if (i > 0) { - if (geteuid()) - SILC_LOG_DEBUG(("Server started as user")); - else - SILC_LOG_DEBUG(("Server started as root. Dropping privileges.")); + i = fork(); - SILC_LOG_DEBUG(("Forking SILC server to background")); - exit(0); - } else { - SILC_LOG_DEBUG(("fork() failed, cannot proceed")); - exit(1); - } + if (i < 0) { + SILC_LOG_DEBUG(("fork() failed, cannot proceed")); + exit(1); + } + else if (i) { + if (geteuid()) + SILC_LOG_DEBUG(("Server started as user")); + else + SILC_LOG_DEBUG(("Server started as root. Dropping privileges.")); + exit(0); } setsid(); } @@ -386,13 +381,11 @@ void silc_server_drop(SilcServer server) { /* Are we executing silcd as root or a regular user? */ if (!geteuid()) { - struct passwd *pw; struct group *gr; char *user, *group; - if (!server->config->identity || !server->config->identity->user || - !server->config->identity->group) { + if (!server->config->server_info->user || !server->config->server_info->group) { fprintf(stderr, "Error:" "\tSILC server must not be run as root. For the security of your\n" "\tsystem it is strongly suggested that you run SILC under dedicated\n" @@ -402,8 +395,8 @@ void silc_server_drop(SilcServer server) } /* Get the values given for user and group in configuration file */ - user=server->config->identity->user; - group=server->config->identity->group; + user=server->config->server_info->user; + group=server->config->server_info->group; /* Check whether the user/group information is text */ if (atoi(user)!=0 || atoi(group)!=0) { @@ -499,8 +492,11 @@ void silc_server_stop(SilcServer server) { SILC_LOG_DEBUG(("Stopping server")); - silc_schedule_stop(server->schedule); - silc_schedule_uninit(server->schedule); + if (server->schedule) { + silc_schedule_stop(server->schedule); + silc_schedule_uninit(server->schedule); + server->schedule = NULL; + } silc_server_protocols_unregister(); @@ -520,6 +516,10 @@ void silc_server_start_key_exchange(SilcServer server, SilcServerKEInternalContext *proto_ctx; void *context; + /* Cancel any possible retry timeouts */ + silc_schedule_task_del_by_callback(server->schedule, + silc_server_connect_router); + /* Set socket options */ silc_net_set_socket_nonblock(sock); silc_net_set_socket_opt(sock, SOL_SOCKET, SO_REUSEADDR, 1); @@ -629,15 +629,17 @@ SILC_TASK_CALLBACK(silc_server_connect_router) server->router_connect = time(0); /* Connect to remote host */ - sock = silc_net_create_connection(server->config->listen_port->local_ip, + sock = silc_net_create_connection(server->config->server_info->server_ip, sconn->remote_port, sconn->remote_host); if (sock < 0) { - SILC_LOG_ERROR(("Could not connect to router")); - silc_schedule_task_add(server->schedule, fd, - silc_server_connect_to_router_retry, - context, 0, 1, SILC_TASK_TIMEOUT, - SILC_TASK_PRI_NORMAL); + SILC_LOG_ERROR(("Could not connect to router %s:%d", + sconn->remote_host, sconn->remote_port)); + if (!sconn->no_reconnect) + silc_schedule_task_add(server->schedule, fd, + silc_server_connect_to_router_retry, + context, 0, 1, SILC_TASK_TIMEOUT, + SILC_TASK_PRI_NORMAL); return; } @@ -654,7 +656,7 @@ SILC_TASK_CALLBACK(silc_server_connect_to_router) { SilcServer server = (SilcServer)context; SilcServerConnection sconn; - SilcServerConfigSectionServerConnection *ptr; + SilcServerConfigSectionRouter *ptr; SILC_LOG_DEBUG(("Connecting to router(s)")); @@ -687,6 +689,9 @@ SILC_TASK_CALLBACK(silc_server_connect_to_router) sconn->backup_replace_port = ptr->backup_replace_port; } + if (!server->router_conn && !sconn->backup) + server->router_conn = sconn; + silc_schedule_task_add(server->schedule, fd, silc_server_connect_router, (void *)sconn, 0, 1, SILC_TASK_TIMEOUT, @@ -718,7 +723,7 @@ SILC_TASK_CALLBACK(silc_server_connect_to_router_second) SilcServerConnection sconn = (SilcServerConnection)ctx->context; SilcSocketConnection sock = ctx->sock; SilcServerConnAuthInternalContext *proto_ctx; - SilcServerConfigSectionServerConnection *conn = NULL; + SilcServerConfigSectionRouter *conn = NULL; SILC_LOG_DEBUG(("Start")); @@ -938,7 +943,7 @@ SILC_TASK_CALLBACK(silc_server_connect_to_router_final) timeout!! */ hb_context = silc_calloc(1, sizeof(*hb_context)); hb_context->server = server; - silc_socket_set_heartbeat(sock, 600, hb_context, + silc_socket_set_heartbeat(sock, 300, hb_context, silc_server_perform_heartbeat, server->schedule); @@ -986,6 +991,8 @@ SILC_TASK_CALLBACK(silc_server_connect_to_router_final) silc_free(sconn->backup_replace_ip); silc_free(sconn); } + if (sconn == server->router_conn) + server->router_conn = NULL; /* Free the protocol object */ if (sock->protocol == protocol) @@ -1011,7 +1018,7 @@ silc_server_accept_new_connection_lookup(SilcSocketConnection sock, SilcServer server = (SilcServer)context; SilcServerKEInternalContext *proto_ctx; void *cconfig, *sconfig, *rconfig; - SilcServerConfigSectionDenyConnection *deny; + SilcServerConfigSectionDeny *deny; int port; SILC_LOG_DEBUG(("Start")); @@ -1042,16 +1049,16 @@ silc_server_accept_new_connection_lookup(SilcSocketConnection sock, port = server->sockets[server->sock]->port; /* Listenning port */ /* Check whether this connection is denied to connect to us. */ - deny = silc_server_config_denied_conn(server->config, sock->ip, port); + deny = silc_server_config_find_denied(server->config, sock->ip, port); if (!deny) - deny = silc_server_config_denied_conn(server->config, sock->hostname, + deny = silc_server_config_find_denied(server->config, sock->hostname, port); if (deny) { /* The connection is denied */ SILC_LOG_INFO(("Connection %s (%s) is denied", sock->hostname, sock->ip)); - silc_server_disconnect_remote(server, sock, deny->comment ? - deny->comment : + silc_server_disconnect_remote(server, sock, deny->reason ? + deny->reason : "Server closed connection: " "Connection refused"); server->stat.conn_failures++; @@ -1061,9 +1068,9 @@ silc_server_accept_new_connection_lookup(SilcSocketConnection sock, /* Check whether we have configred this sort of connection at all. We have to check all configurations since we don't know what type of connection this is. */ - if (!(cconfig = silc_server_config_find_client_conn(server->config, + if (!(cconfig = silc_server_config_find_client(server->config, sock->ip, port))) - cconfig = silc_server_config_find_client_conn(server->config, + cconfig = silc_server_config_find_client(server->config, sock->hostname, port); if (!(sconfig = silc_server_config_find_server_conn(server->config, @@ -1078,6 +1085,8 @@ silc_server_accept_new_connection_lookup(SilcSocketConnection sock, sock->hostname, port); if (!cconfig && !sconfig && !rconfig) { + SILC_LOG_INFO(("Connection %s (%s) is not allowed", + sock->hostname, sock->ip)); silc_server_disconnect_remote(server, sock, "Server closed connection: " "Connection refused"); @@ -1281,7 +1290,7 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final) SilcSocketConnection sock = ctx->sock; SilcServerHBContext hb_context; SilcUnknownEntry entry = (SilcUnknownEntry)sock->user_data; - void *id_entry = NULL; + void *id_entry; SILC_LOG_DEBUG(("Start")); @@ -1319,7 +1328,7 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final) and other information is created after we have received NEW_CLIENT packet from client. */ client = silc_idlist_add_client(server->local_list, - NULL, NULL, NULL, NULL, NULL, sock); + NULL, NULL, NULL, NULL, NULL, sock, 0); if (!client) { SILC_LOG_ERROR(("Could not add new client to cache")); silc_free(sock->user_data); @@ -1343,7 +1352,8 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final) case SILC_SOCKET_TYPE_ROUTER: { SilcServerEntry new_server; - SilcServerConfigSectionServerConnection *conn = + /* XXX FIXME: Now server and router has different table, so this is probably broken. */ + SilcServerConfigSectionRouter *conn = ctx->conn_type == SILC_SOCKET_TYPE_SERVER ? ctx->sconfig : ctx->rconfig; @@ -1423,15 +1433,15 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final) break; } default: + goto out; break; } sock->type = ctx->conn_type; /* Add the common data structure to the ID entry. */ - if (id_entry) - silc_idlist_add_data(id_entry, (SilcIDListData)sock->user_data); - + silc_idlist_add_data(id_entry, (SilcIDListData)sock->user_data); + /* Add to sockets internal pointer for fast referencing */ silc_free(sock->user_data); sock->user_data = id_entry; @@ -1444,7 +1454,7 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final) timeout!! */ hb_context = silc_calloc(1, sizeof(*hb_context)); hb_context->server = server; - silc_socket_set_heartbeat(sock, 600, hb_context, + silc_socket_set_heartbeat(sock, 400, hb_context, silc_server_perform_heartbeat, server->schedule); @@ -1544,7 +1554,7 @@ SILC_TASK_CALLBACK(silc_server_packet_process) close the connection */ if (SILC_IS_DISCONNECTING(sock)) { if (sock->user_data) - silc_server_free_sock_user_data(server, sock); + silc_server_free_sock_user_data(server, sock, NULL); silc_server_close_connection(server, sock); return; } @@ -1552,8 +1562,20 @@ SILC_TASK_CALLBACK(silc_server_packet_process) SILC_LOG_DEBUG(("Premature EOF from connection %d", sock->sock)); SILC_SET_DISCONNECTING(sock); - if (sock->user_data) - silc_server_free_sock_user_data(server, sock); + if (sock->user_data) { + char tmp[128]; + if (silc_socket_get_error(sock, tmp, sizeof(tmp) - 1)) + silc_server_free_sock_user_data(server, sock, tmp); + else + silc_server_free_sock_user_data(server, sock, NULL); + } else if (server->router_conn && server->router_conn->sock == sock && + !server->router && server->standalone) + silc_schedule_task_add(server->schedule, 0, + silc_server_connect_to_router, + server, 1, 0, + SILC_TASK_TIMEOUT, + SILC_TASK_PRI_NORMAL); + silc_server_close_connection(server, sock); return; } @@ -1577,9 +1599,23 @@ SILC_TASK_CALLBACK(silc_server_packet_process) /* Process the packet. This will call the parser that will then decrypt and parse the packet. */ - silc_packet_receive_process(sock, server->server_type == SILC_ROUTER ? - TRUE : FALSE, cipher, hmac, sequence, - silc_server_packet_parse, server); + ret = silc_packet_receive_process(sock, server->server_type == SILC_ROUTER ? + TRUE : FALSE, cipher, hmac, sequence, + silc_server_packet_parse, server); + + /* If this socket connection is not authenticated yet and the packet + processing failed we will drop the connection since it can be + a malicious flooder. */ + if (sock->type == SILC_SOCKET_TYPE_UNKNOWN && ret == FALSE && + (!sock->protocol || sock->protocol->protocol->type == + SILC_PROTOCOL_SERVER_KEY_EXCHANGE)) { + SILC_LOG_DEBUG(("Bad data sent from unknown connection %d", sock->sock)); + SILC_SET_DISCONNECTING(sock); + + if (sock->user_data) + silc_server_free_sock_user_data(server, sock, NULL); + silc_server_close_connection(server, sock); + } } /* Parses whole packet, received earlier. */ @@ -1631,7 +1667,7 @@ SILC_TASK_CALLBACK(silc_server_packet_parse_real) if (!(packet->flags & SILC_PACKET_FLAG_BROADCAST) && packet->dst_id_type == SILC_ID_SERVER && sock->type != SILC_SOCKET_TYPE_CLIENT && - memcmp(packet->dst_id, server->id_string, packet->dst_id_len)) { + memcmp(packet->dst_id, server->id_string, server->id_string_len)) { /* Route the packet to fastest route for the destination ID */ void *id = silc_id_str2id(packet->dst_id, packet->dst_id_len, @@ -2171,7 +2207,7 @@ void silc_server_packet_parse_type(SilcServer server, /* Creates connection to a remote router. */ void silc_server_create_connection(SilcServer server, - char *remote_host, uint32 port) + const char *remote_host, uint32 port) { SilcServerConnection sconn; @@ -2180,6 +2216,7 @@ void silc_server_create_connection(SilcServer server, sconn->server = server; sconn->remote_host = strdup(remote_host); sconn->remote_port = port; + sconn->no_reconnect = TRUE; silc_schedule_task_add(server->schedule, 0, silc_server_connect_router, @@ -2288,7 +2325,7 @@ void silc_server_free_client_data(SilcServer server, SilcSocketConnection sock, SilcClientEntry client, int notify, - char *signoff) + const char *signoff) { FreeClientInternal i = silc_calloc(1, sizeof(*i)); @@ -2308,11 +2345,19 @@ void silc_server_free_client_data(SilcServer server, /* Remove client from all channels */ if (notify) silc_server_remove_from_channels(server, NULL, client, - TRUE, signoff, TRUE); + TRUE, (char *)signoff, TRUE); else silc_server_remove_from_channels(server, NULL, client, FALSE, NULL, FALSE); + /* Update statistics */ + server->stat.my_clients--; + server->stat.clients--; + if (server->server_type == SILC_ROUTER) + server->stat.cell_clients--; + SILC_OPER_STATS_UPDATE(client, server, SILC_UMODE_SERVER_OPERATOR); + SILC_OPER_STATS_UPDATE(client, router, SILC_UMODE_ROUTER_OPERATOR); + /* We will not delete the client entry right away. We will take it into history (for WHOWAS command) for 5 minutes */ i->server = server; @@ -2324,12 +2369,7 @@ void silc_server_free_client_data(SilcServer server, client->data.status &= ~SILC_IDLIST_STATUS_REGISTERED; client->router = NULL; client->connection = NULL; - - /* Free the client entry and everything in it */ - server->stat.my_clients--; - server->stat.clients--; - if (server->server_type == SILC_ROUTER) - server->stat.cell_clients--; + client->mode = 0; } /* Frees user_data pointer from socket connection object. This also sends @@ -2337,7 +2377,8 @@ void silc_server_free_client_data(SilcServer server, entities. */ void silc_server_free_sock_user_data(SilcServer server, - SilcSocketConnection sock) + SilcSocketConnection sock, + const char *signoff_message) { SILC_LOG_DEBUG(("Start")); @@ -2345,7 +2386,8 @@ void silc_server_free_sock_user_data(SilcServer server, case SILC_SOCKET_TYPE_CLIENT: { SilcClientEntry user_data = (SilcClientEntry)sock->user_data; - silc_server_free_client_data(server, sock, user_data, TRUE, NULL); + silc_server_free_client_data(server, sock, user_data, TRUE, + signoff_message); break; } case SILC_SOCKET_TYPE_SERVER: @@ -2363,7 +2405,7 @@ void silc_server_free_sock_user_data(SilcServer server, /* Check whether we have a backup router connection */ if (!backup_router || backup_router == user_data) { silc_schedule_task_add(server->schedule, 0, - silc_server_connect_to_router, + silc_server_connect_to_router, server, 1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); @@ -2557,6 +2599,7 @@ void silc_server_remove_from_channels(SilcServer server, silc_hash_table_del(channel->user_list, chl2->client); silc_free(chl2); } + silc_hash_table_list_reset(&htl2); continue; } @@ -2581,7 +2624,7 @@ void silc_server_remove_from_channels(SilcServer server, if (keygen && !(channel->mode & SILC_CHANNEL_MODE_PRIVKEY)) { /* Re-generate channel key */ if (!silc_server_create_channel_key(server, channel, 0)) - return; + goto out; /* Send the channel key to the channel. The key of course is not sent to the client who was removed from the channel. */ @@ -2591,6 +2634,8 @@ void silc_server_remove_from_channels(SilcServer server, } } + out: + silc_hash_table_list_reset(&htl); silc_buffer_free(clidp); } @@ -2677,6 +2722,7 @@ int silc_server_remove_from_one_channel(SilcServer server, silc_hash_table_del(channel->user_list, chl2->client); silc_free(chl2); } + silc_hash_table_list_reset(&htl2); return FALSE; } @@ -2715,13 +2761,15 @@ SILC_TASK_CALLBACK(silc_server_timeout_remote) /* If we have protocol active we must assure that we call the protocol's final callback so that all the memory is freed. */ if (sock->protocol) { + silc_protocol_cancel(sock->protocol, server->schedule); sock->protocol->state = SILC_PROTOCOL_STATE_ERROR; silc_protocol_execute_final(sock->protocol, server->schedule); + sock->protocol = NULL; return; } if (sock->user_data) - silc_server_free_sock_user_data(server, sock); + silc_server_free_sock_user_data(server, sock, NULL); silc_server_disconnect_remote(server, sock, "Server closed connection: " "Connection timeout"); @@ -2763,7 +2811,7 @@ SilcChannelEntry silc_server_create_new_channel(SilcServer server, channel_name = strdup(channel_name); - /* Create the channel */ + /* Create the channel ID */ if (!silc_id_create_channel_id(server, router_id, server->rng, &channel_id)) { silc_free(channel_name); @@ -2771,13 +2819,16 @@ SilcChannelEntry silc_server_create_new_channel(SilcServer server, silc_hmac_free(newhmac); return NULL; } + + /* Create the channel */ entry = silc_idlist_add_channel(server->local_list, channel_name, SILC_CHANNEL_MODE_NONE, channel_id, - NULL, key, newhmac); + NULL, key, newhmac, 0); if (!entry) { silc_free(channel_name); silc_cipher_free(key); silc_hmac_free(newhmac); + silc_free(channel_id); return NULL; } @@ -2787,11 +2838,7 @@ SilcChannelEntry silc_server_create_new_channel(SilcServer server, /* Now create the actual key material */ if (!silc_server_create_channel_key(server, entry, silc_cipher_get_key_len(key) / 8)) { - silc_free(channel_name); - silc_cipher_free(key); - silc_hmac_free(newhmac); - silc_free(entry->cipher); - silc_free(entry->hmac_name); + silc_idlist_del_channel(server->local_list, entry); return NULL; } @@ -2844,8 +2891,10 @@ silc_server_create_new_channel_with_id(SilcServer server, /* Create the channel */ entry = silc_idlist_add_channel(server->local_list, channel_name, SILC_CHANNEL_MODE_NONE, channel_id, - NULL, key, newhmac); + NULL, key, newhmac, 0); if (!entry) { + silc_cipher_free(key); + silc_hmac_free(newhmac); silc_free(channel_name); return NULL; } @@ -2853,7 +2902,7 @@ silc_server_create_new_channel_with_id(SilcServer server, /* Now create the actual key material */ if (!silc_server_create_channel_key(server, entry, silc_cipher_get_key_len(key) / 8)) { - silc_free(channel_name); + silc_idlist_del_channel(server->local_list, entry); return NULL; } @@ -2980,10 +3029,10 @@ SilcChannelEntry silc_server_save_channel_key(SilcServer server, SILC_LOG_DEBUG(("Start")); /* Decode channel key payload */ - payload = silc_channel_key_payload_parse(key_payload->data, + payload = silc_channel_key_payload_parse(key_payload->data, key_payload->len); if (!payload) { - SILC_LOG_ERROR(("Bad channel key payload, dropped")); + SILC_LOG_ERROR(("Bad channel key payload received, dropped")); channel = NULL; goto out; } @@ -3003,7 +3052,8 @@ SilcChannelEntry silc_server_save_channel_key(SilcServer server, if (!channel) { channel = silc_idlist_find_channel_by_id(server->global_list, id, NULL); if (!channel) { - SILC_LOG_ERROR(("Received key for non-existent channel")); + SILC_LOG_ERROR(("Received key for non-existent channel %s", + silc_id_render(id, SILC_ID_CHANNEL))); goto out; } } @@ -3088,8 +3138,7 @@ void silc_server_perform_heartbeat(SilcSocketConnection sock, { SilcServerHBContext hb = (SilcServerHBContext)hb_context; - SILC_LOG_DEBUG(("Sending heartbeat to %s (%s)", sock->hostname, - sock->ip)); + SILC_LOG_DEBUG(("Sending heartbeat to %s (%s)", sock->hostname, sock->ip)); /* Send the heartbeat */ silc_server_send_heartbeat(hb->server, sock); @@ -3383,6 +3432,7 @@ void silc_server_announce_get_channel_users(SilcServer server, silc_buffer_free(clidp); } + silc_hash_table_list_reset(&htl); silc_buffer_free(chidp); } @@ -3545,6 +3595,8 @@ void silc_server_announce_channels(SilcServer server, int i; for (i = 0; i < channel_users_modes_c; i++) { + if (!channel_users_modes[i]) + continue; silc_buffer_push(channel_users_modes[i], channel_users_modes[i]->data - channel_users_modes[i]->head); @@ -3624,6 +3676,7 @@ void silc_server_get_users_on_channel(SilcServer server, silc_hash_table_list(channel->user_list, &htl); while (silc_hash_table_get(&htl, NULL, (void *)&chl)) len += (silc_id_get_len(chl->client->id, SILC_ID_CLIENT) + 4); + silc_hash_table_list_reset(&htl); client_id_list = silc_buffer_alloc(len); client_mode_list = @@ -3645,6 +3698,7 @@ void silc_server_get_users_on_channel(SilcServer server, list_count++; } + silc_hash_table_list_reset(&htl); silc_buffer_push(client_id_list, client_id_list->data - client_id_list->head); silc_buffer_push(client_mode_list, @@ -3666,13 +3720,16 @@ void silc_server_save_users_on_channel(SilcServer server, uint32 user_count) { int i; + uint16 idp_len; + uint32 mode; + SilcClientID *client_id; + SilcClientEntry client; + SilcIDCacheEntry cache; + bool global; - for (i = 0; i < user_count; i++) { - uint16 idp_len; - uint32 mode; - SilcClientID *client_id; - SilcClientEntry client; + SILC_LOG_DEBUG(("Start")); + for (i = 0; i < user_count; i++) { /* Client ID */ SILC_GET16_MSB(idp_len, user_list->data + 2); idp_len += 4; @@ -3689,14 +3746,18 @@ void silc_server_save_users_on_channel(SilcServer server, silc_free(client_id); continue; } + + global = FALSE; /* Check if we have this client cached already. */ client = silc_idlist_find_client_by_id(server->local_list, client_id, - server->server_type, NULL); - if (!client) + server->server_type, &cache); + if (!client) { client = silc_idlist_find_client_by_id(server->global_list, client_id, server->server_type, - NULL); + &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. */ @@ -3710,7 +3771,7 @@ void silc_server_save_users_on_channel(SilcServer server, global. */ client = silc_idlist_add_client(server->global_list, NULL, NULL, NULL, silc_id_dup(client_id, SILC_ID_CLIENT), - sock->user_data, NULL); + sock->user_data, NULL, 0); if (!client) { SILC_LOG_ERROR(("Could not add new client to the ID Cache")); silc_free(client_id); @@ -3718,6 +3779,11 @@ void silc_server_save_users_on_channel(SilcServer server, } client->data.status |= SILC_IDLIST_STATUS_REGISTERED; + } else { + /* Found, if it is from global list we'll assure that we won't + expire it now that the entry is on channel. */ + if (global) + cache->expire = 0; } silc_free(client_id); @@ -3857,6 +3923,7 @@ SilcBuffer silc_server_get_client_channel_list(SilcServer server, silc_buffer_pull(buffer, len); silc_free(cid); } + silc_hash_table_list_reset(&htl); if (buffer) silc_buffer_push(buffer, buffer->data - buffer->head); @@ -3868,10 +3935,14 @@ SilcBuffer silc_server_get_client_channel_list(SilcServer server, it using WHOIS command. */ SilcClientEntry silc_server_get_client_resolve(SilcServer server, - SilcClientID *client_id) + SilcClientID *client_id, + bool *resolved) { SilcClientEntry client; + if (resolved) + *resolved = FALSE; + client = silc_idlist_find_client_by_id(server->local_list, client_id, TRUE, NULL); if (!client) { @@ -3901,6 +3972,10 @@ SilcClientEntry silc_server_get_client_resolve(SilcServer server, buffer->data, buffer->len, FALSE); silc_buffer_free(idp); silc_buffer_free(buffer); + + if (resolved) + *resolved = TRUE; + return NULL; }