X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Fsilcd%2Fsilcd.c;h=d367328c6578fdb15942f922e108a2fc7525e4de;hp=306f771a5e2332d82f00b5f2934254a604623cc5;hb=b2d306dde2ce3eae11b4729eca5f3242b2109861;hpb=fe527d9262f63309df6a9c06453f426973065995 diff --git a/apps/silcd/silcd.c b/apps/silcd/silcd.c index 306f771a..d367328c 100644 --- a/apps/silcd/silcd.c +++ b/apps/silcd/silcd.c @@ -4,12 +4,11 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2002 Pekka Riikonen + Copyright (C) 1997 - 2007 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -33,12 +32,8 @@ static SilcServer silcd; static void silc_usage(void); -static char *silc_server_create_identifier(void); -static int silc_server_create_key_pair(char *pkcs_name, int bits, char *path, - char *identifier, - SilcPublicKey *ret_pub_key, - SilcPrivateKey *ret_prv_key); +#ifdef HAVE_GETOPT_LONG /* Long command line options */ static struct option long_opts[] = { @@ -59,6 +54,7 @@ static struct option long_opts[] = { NULL, 0, NULL, 0 } }; +#endif /* HAVE_GETOPT_LONG */ /* Command line option variables */ static char *opt_keypath = NULL; @@ -238,12 +234,6 @@ static void silc_server_daemonise(SilcServer server) to stderr are changed to SILC_SERVER_LOG_ERROR() */ } -static void signal_handler(int sig) -{ - /* Mark the signal to be caller after this signal is over. */ - silc_schedule_signal_call(silcd->schedule, sig); -} - SILC_TASK_CALLBACK(got_hup) { /* First, reset all log files (they might have been deleted) */ @@ -255,9 +245,7 @@ SILC_TASK_CALLBACK(got_hup) SILC_TASK_CALLBACK(stop_server) { - /* Stop scheduler, the program will stop eventually after noticing - that the scheduler is down. */ - silc_schedule_stop(silcd->schedule); + silc_server_stop(silcd); } /* Dump server statistics into a file into /tmp directory */ @@ -265,13 +253,21 @@ SILC_TASK_CALLBACK(stop_server) SILC_TASK_CALLBACK(dump_stats) { FILE *fdd; + int fild; char filename[256]; memset(filename, 0, sizeof(filename)); - snprintf(filename, sizeof(filename) - 1, "/tmp/silcd.%d.stats", getpid()); - fdd = fopen(filename, "w+"); - if (!fdd) + snprintf(filename, sizeof(filename) - 1, "/tmp/silcd.%d.stats-XXXXXX", getpid()); + fild = mkstemp(filename); + if (fild == -1) + return; + + fdd = fdopen(fild, "w"); + if (fdd == NULL) { + close(fild); + unlink(filename); return; + } #define STAT_OUTPUT(fmt, stat) fprintf(fdd, fmt "\n", (int)stat); @@ -307,13 +303,152 @@ SILC_TASK_CALLBACK(dump_stats) STAT_OUTPUT(" Authentication failures : %d", silcd->stat.auth_failures); STAT_OUTPUT(" Packets sent : %d", silcd->stat.packets_sent); STAT_OUTPUT(" Packets received : %d", silcd->stat.packets_received); + STAT_OUTPUT(" Commands sent : %d", silcd->stat.commands_sent); + STAT_OUTPUT(" Commands received : %d", silcd->stat.commands_received); + STAT_OUTPUT(" Connections : %d", silcd->stat.conn_num); #undef STAT_OUTPUT +#ifdef SILC_DEBUG + /* Dump internal flags */ + fprintf(fdd, "\nDumping internal flags\n"); + fprintf(fdd, " server_type : %d\n", silcd->server_type); + fprintf(fdd, " standalone : %d\n", silcd->standalone); + fprintf(fdd, " listenning : %d\n", silcd->listenning); + fprintf(fdd, " background : %d\n", silcd->background); + fprintf(fdd, " backup_router : %d\n", silcd->backup_router); + fprintf(fdd, " backup_primary : %d\n", silcd->backup_primary); + fprintf(fdd, " backup_noswitch : %d\n", silcd->backup_noswitch); + fprintf(fdd, " backup_closed : %d\n", silcd->backup_closed); + fprintf(fdd, " wait_backup : %d\n", silcd->wait_backup); + if (silcd->router) + fprintf(fdd, " primary router : %s\n", + silcd->router->server_name ? silcd->router->server_name : ""); + + /* Dump connections */ + { + SilcPacketStream s; + SilcDList conns = silc_packet_engine_get_streams(silcd->packet_engine); + + fprintf(fdd, "\nDumping connections\n"); + silc_dlist_start(conns); + while ((s = silc_dlist_get(conns))) { + const char *hostname, *ip; + SilcUInt16 port; + SilcSocket sock; + SilcIDListData idata = silc_packet_get_context(s); + if (!silc_socket_stream_get_info(silc_packet_stream_get_stream(s), + &sock, &hostname, &ip, &port)) + continue; + fprintf(fdd, " %d: host %s ip %s port %d type %d\n", + sock, hostname ? hostname : "N/A", + ip ? ip : "N/A", port, idata ? idata->conn_type : 0); + } + silc_dlist_uninit(conns); + } + + /* Dump lists */ + { + SilcList list; + SilcIDCacheEntry id_cache = NULL; + SilcServerEntry server_entry; + SilcClientEntry client_entry; + SilcChannelEntry channel_entry; + int c; + + fprintf(fdd, "\nDumping databases\n"); + + if (silc_idcache_get_all(silcd->local_list->servers, &list)) { + c = 1; + fprintf(fdd, "\nServers in local-list:\n"); + while ((id_cache = silc_list_get(list))) { + server_entry = (SilcServerEntry)id_cache->context; + fprintf(fdd, " %d: name %s id %s status 0x%x\n", c, + server_entry->server_name ? server_entry->server_name : + "N/A", server_entry->id ? + silc_id_render(server_entry->id, SILC_ID_SERVER) : "N/A", + server_entry->data.status); + c++; + } + } + if (silc_idcache_get_all(silcd->global_list->servers, &list)) { + fprintf(fdd, "\nServers in global-list:\n"); + c = 1; + while ((id_cache = silc_list_get(list))) { + server_entry = (SilcServerEntry)id_cache->context; + fprintf(fdd, " %d: name %s id %s status 0x%x\n", c, + server_entry->server_name ? server_entry->server_name : + "N/A", server_entry->id ? + silc_id_render(server_entry->id, SILC_ID_SERVER) : "N/A", + server_entry->data.status); + c++; + } + } + if (silc_idcache_get_all(silcd->local_list->clients, &list)) { + fprintf(fdd, "\nClients in local-list:\n"); + c = 1; + while ((id_cache = silc_list_get(list))) { + client_entry = (SilcClientEntry)id_cache->context; + server_entry = client_entry->router; + fprintf(fdd, " %d: name %s id %s status 0x%x from %s\n", c, + client_entry->nickname ? client_entry->nickname : + (unsigned char *)"N/A", client_entry->id ? + silc_id_render(client_entry->id, SILC_ID_CLIENT) : "N/A", + client_entry->data.status, server_entry ? + server_entry->server_name ? server_entry->server_name : + "N/A" : "local"); + c++; + } + } + if (silc_idcache_get_all(silcd->global_list->clients, &list)) { + fprintf(fdd, "\nClients in global-list:\n"); + c = 1; + while ((id_cache = silc_list_get(list))) { + client_entry = (SilcClientEntry)id_cache->context; + server_entry = client_entry->router; + fprintf(fdd, " %d: name %s id %s status 0x%x from %s\n", c, + client_entry->nickname ? client_entry->nickname : + (unsigned char *)"N/A", client_entry->id ? + silc_id_render(client_entry->id, SILC_ID_CLIENT) : "N/A", + client_entry->data.status, server_entry ? + server_entry->server_name ? server_entry->server_name : + "N/A" : "local"); + c++; + } + } + if (silc_idcache_get_all(silcd->local_list->channels, &list)) { + fprintf(fdd, "\nChannels in local-list:\n"); + c = 1; + while ((id_cache = silc_list_get(list))) { + channel_entry = (SilcChannelEntry)id_cache->context; + fprintf(fdd, " %d: name %s id %s\n", c, + channel_entry->channel_name ? channel_entry->channel_name : + "N/A", channel_entry->id ? + silc_id_render(channel_entry->id, SILC_ID_CHANNEL) : "N/A"); + c++; + } + } + if (silc_idcache_get_all(silcd->global_list->channels, &list)) { + fprintf(fdd, "\nChannels in global-list:\n"); + c = 1; + while ((id_cache = silc_list_get(list))) { + channel_entry = (SilcChannelEntry)id_cache->context; + fprintf(fdd, " %d: name %s id %s\n", c, + channel_entry->channel_name ? channel_entry->channel_name : + "N/A", channel_entry->id ? + silc_id_render(channel_entry->id, SILC_ID_CHANNEL) : "N/A"); + c++; + } + } + } +#endif + fflush(fdd); fclose(fdd); } +#ifdef SILC_DEBUG + typedef struct { int level; const char *string; @@ -333,43 +468,43 @@ static DebugLevel debug_levels[] = { { 15, "*silcd*,*serverid*,silc_server_*,*idlist*" }, /* All from silcd/ and basic stuff from libs */ - { 20, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcauth*,*silcske*" }, + { 20, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcconauth*,*silcske*" }, /* All from silcd/ and more stuff from libs */ - { 25, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcauth*," + { 25, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcconauth*," "*silcpacket*,*ske*,*silcrng*" }, /* All from silcd/ and even more stuff from libs */ - { 30, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcauth*," + { 30, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcconauth*," "*silcpacket*,*ske*,*silcrng*,*command*,*channel*,*private*,*notify*" }, /* All from silcd/ and even more stuff from libs + all from silccore */ - { 35, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcauth*," + { 35, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcconauth*," "*silcpacket*,*ske*,*silcrng*,*command*,*channel*,*private*,*notify*" "*silcid*,*argument*" }, /* All from silcd/, all from silccore, silccrypt and silcmath */ - { 40, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcauth*," + { 40, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcconauth*," "*silcpacket*,*ske*,*silcrng*,*command*,*channel*,*private*,*notify*" "*silcid*,*argument*,*pkcs*,*hmac*,*hash*,*cipher*,silc_math*" }, /* All from silcd/, all from silccore, silccrypt and silcmath + stuff from silcutil */ - { 45, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcauth*," + { 45, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcconauth*," "*silcpacket*,*ske*,*silcrng*,*command*,*channel*,*private*,*notify*" "*silcid*,*argument*,*pkcs*,*hmac*,*hash*,*cipher*,silc_math*,*sim*" "*sockconn*" }, /* All from silcd/, all from silccore, silccrypt and silcmath + more stuff from silcutil */ - { 50, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcauth*," + { 50, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcconauth*," "*silcpacket*,*ske*,*silcrng*,*command*,*channel*,*private*,*notify*" "*silcid*,*argument*,*pkcs*,*hmac*,*hash*,*cipher*,silc_math*,*sim*" "*sockconn*,*net*" }, /* All from silcd/, all from silccore, silccrypt and silcmath + more stuff from silcutil */ - { 55, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcauth*," + { 55, "*silcd*,*serverid*,silc_server_*,*idlist*,*silcconauth*," "*silcpacket*,*ske*,*silcrng*,*command*,*channel*,*private*,*notify*" "*silcid*,*argument*,*pkcs*,*hmac*,*hash*,*cipher*,silc_math*,*sim*" "*sockconn*,*net*,*log*,*config*" }, @@ -393,11 +528,12 @@ static void silc_get_debug_level(int level) break; } } +#endif /* SILC_DEBUG */ -/* This function should not be called directly but thru the wrapper - macro SILC_SERVER_LOG_STDERR() */ +/* This function should not be called directly but through the appropriate + wrapper macro defined in server.h */ -void silc_server_stderr(char *message) +void silc_server_stderr(SilcLogType type, char *message) { if (silcd->background) { char *p, *n = message; @@ -412,7 +548,8 @@ void silc_server_stderr(char *message) } *n = 0; - silc_log_output(SILC_LOG_ERROR, message); + /* the message is freed inside the logging function */ + silc_log_output(type, message); } else { fprintf(stderr, "%s\n", message); @@ -423,15 +560,19 @@ void silc_server_stderr(char *message) int main(int argc, char **argv) { int ret, opt, option_index; - bool foreground = FALSE; - bool opt_create_keypair = FALSE; + SilcBool foreground = FALSE; + SilcBool opt_create_keypair = FALSE; char *silcd_config_file = NULL; struct sigaction sa; /* Parse command line arguments */ if (argc > 1) { +#ifdef HAVE_GETOPT_LONG while ((opt = getopt_long(argc, argv, "f:p:d:D:xhFVC:", long_opts, &option_index)) != EOF) { +#else + while ((opt = getopt(argc, argv, "f:p:d:D:xhFVC:")) != EOF) { +#endif /* HAVE_GETOPT_LONG */ switch(opt) { case 'h': silc_usage(); @@ -440,17 +581,17 @@ int main(int argc, char **argv) printf("SILCd Secure Internet Live Conferencing daemon, " "version %s (base: SILC Toolkit %s)\n", silc_dist_version, silc_version); - printf("(c) 1997 - 2002 Pekka Riikonen " + printf("(c) 1997 - 2007 Pekka Riikonen " "\n"); exit(0); break; case 'd': #ifdef SILC_DEBUG - silc_debug = TRUE; + silc_log_debug(TRUE); + silc_log_quick(TRUE); if (optarg) silc_log_set_debug_string(optarg); foreground = TRUE; /* implied */ - silc_log_quick = TRUE; /* implied */ #else fprintf(stderr, "Run-time debugging is not enabled. To enable it recompile\n" @@ -459,11 +600,11 @@ int main(int argc, char **argv) break; case 'D': #ifdef SILC_DEBUG - silc_debug = TRUE; + silc_log_debug(TRUE); + silc_log_quick(TRUE); if (optarg) silc_get_debug_level(atoi(optarg)); foreground = TRUE; /* implied */ - silc_log_quick = TRUE; /* implied */ #else fprintf(stderr, "Run-time debugging is not enabled. To enable it recompile\n" @@ -472,10 +613,10 @@ int main(int argc, char **argv) break; case 'x': #ifdef SILC_DEBUG - silc_debug_hexdump = TRUE; - silc_debug = TRUE; /* implied */ + silc_log_debug(TRUE); + silc_log_debug_hexdump(TRUE); + silc_log_quick(TRUE); foreground = TRUE; /* implied */ - silc_log_quick = TRUE; /* implied */ #else fprintf(stderr, "Run-time debugging is not enabled. To enable it recompile\n" @@ -519,12 +660,20 @@ int main(int argc, char **argv) if (opt_create_keypair == TRUE) { /* Create new key pair and exit */ + char pubfile[256], prvfile[256]; + + memset(pubfile, 0, sizeof(pubfile)); + memset(prvfile, 0, sizeof(prvfile)); + snprintf(pubfile, sizeof(pubfile) - 1, "%s/silcd.pub", opt_keypath); + snprintf(prvfile, sizeof(prvfile) - 1, "%s/silcd.prv", opt_keypath); + silc_cipher_register_default(); silc_pkcs_register_default(); silc_hash_register_default(); silc_hmac_register_default(); - silc_server_create_key_pair(opt_pkcs, opt_bits, opt_keypath, - opt_identifier, NULL, NULL); + if (!silc_create_key_pair(opt_pkcs, opt_bits, pubfile, prvfile, + opt_identifier, "", NULL, NULL, FALSE)) + exit(1); exit(0); } @@ -537,12 +686,26 @@ int main(int argc, char **argv) if (ret == FALSE) goto fail; + /* Register default crypto stuff since we are going to need them + in the configuration file parsing phase */ + silc_cipher_register_default(); + silc_pkcs_register_default(); + silc_hash_register_default(); + silc_hmac_register_default(); + /* Read configuration files */ - silcd->config = silc_server_config_alloc(silcd_config_file); + silcd->config = silc_server_config_alloc(silcd_config_file, silcd); if (silcd->config == NULL) goto fail; silcd->config_file = silcd_config_file; + /* Unregister the default crypto stuff so that configuration takes effect */ + silc_cipher_unregister_all(); + /* silc_pkcs_unregister_all(); MUST NOT do this anymore; SilcPublicKey + parsed from config file references pointers so we cannot unregister */ + silc_hash_unregister_all(); + silc_hmac_unregister_all(); + /* Check for another silcd running */ silc_server_checkpid(silcd); @@ -550,20 +713,25 @@ int main(int argc, char **argv) if (silc_server_init(silcd) == FALSE) goto fail; - /* Ignore SIGPIPE */ + /* Ignore some signals */ sa.sa_handler = SIG_IGN; sa.sa_flags = 0; sigemptyset(&sa.sa_mask); - sigaction(SIGPIPE, &sa, NULL); - sa.sa_handler = signal_handler; - sigaction(SIGHUP, &sa, NULL); - sigaction(SIGTERM, &sa, NULL); - sigaction(SIGINT, &sa, NULL); - sigaction(SIGUSR1, &sa, NULL); - silc_schedule_signal_register(silcd->schedule, SIGHUP, got_hup, NULL); - silc_schedule_signal_register(silcd->schedule, SIGTERM, stop_server, NULL); - silc_schedule_signal_register(silcd->schedule, SIGINT, stop_server, NULL); - silc_schedule_signal_register(silcd->schedule, SIGUSR1, dump_stats, NULL); +#if defined(SIGPIPE) + sigaction(SIGPIPE, &sa, NULL); /* Ignore broken pipes */ +#endif /* SIGPIPE*/ +#if defined(SIGXFSZ) + sigaction(SIGXFSZ, &sa, NULL); /* Ignore file limit exceeds */ +#endif /* SIGXFSZ */ +#if defined(SIGXCPU) + sigaction(SIGXCPU, &sa, NULL); /* Ignore CPU time limit exceeds */ +#endif /* SIGXCPU */ + + /* Handle specificly some other signals. */ + silc_schedule_task_add_signal(silcd->schedule, SIGHUP, got_hup, NULL); + silc_schedule_task_add_signal(silcd->schedule, SIGTERM, stop_server, NULL); + silc_schedule_task_add_signal(silcd->schedule, SIGINT, stop_server, NULL); + silc_schedule_task_add_signal(silcd->schedule, SIGUSR1, dump_stats, NULL); if (!foreground) { /* Before running the server, fork to background. */ @@ -576,19 +744,15 @@ int main(int argc, char **argv) snprintf(buf, sizeof(buf) - 1, "%d\n", getpid()); silc_file_writefile(pidfile, buf, strlen(buf)); } - } - /* Drop root if we are not in debug mode, so you don't need to bother about - file writing permissions and so on */ - if (!silc_debug) - silc_server_drop_privs(silcd); + } + silc_server_drop_privs(silcd); /* Run the server. When this returns the server has been stopped and we will exit. */ silc_server_run(silcd); - /* Stop the server and free it. */ - silc_server_stop(silcd); + /* Free server */ silc_server_config_destroy(silcd->config); silc_server_free(silcd); @@ -606,108 +770,3 @@ int main(int argc, char **argv) silc_free(opt_keypath); exit(1); } - -/* Returns identifier string for public key generation. */ - -static char *silc_server_create_identifier(void) -{ - char *username = NULL, *realname = NULL; - char hostname[256], email[256]; - - /* Get realname */ - realname = silc_get_real_name(); - - /* Get hostname */ - memset(hostname, 0, sizeof(hostname)); - gethostname(hostname, sizeof(hostname)); - - /* Get username (mandatory) */ - username = silc_get_username(); - if (!username) - return NULL; - - /* Create default email address, whether it is right or not */ - snprintf(email, sizeof(email), "%s@%s", username, hostname); - - return silc_pkcs_encode_identifier(username, hostname, realname, email, - NULL, NULL); -} - -/* Creates new public key and private key pair. This is used only - when user wants to create new key pair from command line. */ - -static int -silc_server_create_key_pair(char *pkcs_name, int bits, char *path, - char *identifier, - SilcPublicKey *ret_pub_key, - SilcPrivateKey *ret_prv_key) -{ - SilcPKCS pkcs; - SilcPublicKey pub_key; - SilcPrivateKey prv_key; - SilcRng rng; - unsigned char *key; - SilcUInt32 key_len; - char pkfile[256], prvfile[256]; - - if (!pkcs_name || !path) - return FALSE; - - if (!silc_pkcs_is_supported(pkcs_name)) { - fprintf(stderr, "Unsupported PKCS `%s'", pkcs_name); - return FALSE; - } - - if (!bits) - bits = 2048; - - if (!identifier) - identifier = silc_server_create_identifier(); - - rng = silc_rng_alloc(); - silc_rng_init(rng); - silc_rng_global_init(rng); - - snprintf(pkfile, sizeof(pkfile) - 1, "%s%s", path, - SILC_SERVER_PUBLIC_KEY_NAME); - snprintf(prvfile, sizeof(prvfile) - 1, "%s%s", path, - SILC_SERVER_PRIVATE_KEY_NAME); - - /* Generate keys */ - silc_pkcs_alloc(pkcs_name, &pkcs); - silc_pkcs_generate_key(pkcs, bits, rng); - - /* Save public key into file */ - key = silc_pkcs_get_public_key(pkcs, &key_len); - pub_key = silc_pkcs_public_key_alloc(silc_pkcs_get_name(pkcs), identifier, - key, key_len); - silc_pkcs_save_public_key(pkfile, pub_key, SILC_PKCS_FILE_PEM); - if (ret_pub_key) - *ret_pub_key = pub_key; - else - silc_pkcs_public_key_free(pub_key); - - memset(key, 0, sizeof(key_len)); - silc_free(key); - - /* Save private key into file */ - key = silc_pkcs_get_private_key(pkcs, &key_len); - prv_key = silc_pkcs_private_key_alloc(silc_pkcs_get_name(pkcs), - key, key_len); - silc_pkcs_save_private_key(prvfile, prv_key, NULL, SILC_PKCS_FILE_BIN); - if (ret_prv_key) - *ret_prv_key = prv_key; - else - silc_pkcs_private_key_free(prv_key); - - printf("Public key has been saved into `%s'\n", pkfile); - printf("Private key has been saved into `%s'\n", prvfile); - - memset(key, 0, sizeof(key_len)); - silc_free(key); - - silc_rng_free(rng); - silc_pkcs_free(pkcs); - - return TRUE; -}