#include "fe-common/silc/module-formats.h"
/* Command line option variables */
-static bool opt_create_keypair = FALSE;
static char *opt_pkcs = NULL;
static int opt_bits = 0;
"DEBUG: %s:%d: %s", function, line, message);
return TRUE;
}
+#endif
-static void sig_debug_setup_changed(void)
+static void sig_setup_changed(void)
{
+#ifdef SILC_DEBUG
bool debug = settings_get_bool("debug");
if (debug) {
const char *debug_string = settings_get_str("debug_string");
}
if (i_debug)
silc_debug = FALSE;
-}
#endif
+}
/* Log callbacks */
silc_pkcs_register_default();
silc_hash_register_default();
silc_hmac_register_default();
- silc_client_show_key((char *)arg);
+ silc_show_public_key((char *)arg);
exit(0);
}
silc_pkcs_register_default();
silc_hash_register_default();
silc_hmac_register_default();
- silc_client_create_key_pair(opt_pkcs, opt_bits,
- NULL, NULL, NULL, NULL, NULL);
+ silc_create_key_pair(opt_pkcs, opt_bits, NULL, NULL, NULL,
+ NULL, NULL, NULL, TRUE);
exit(0);
}
}
settings_add_int("server", "key_exchange_timeout_secs", 120);
settings_add_int("server", "key_exchange_rekey_secs", 3600);
settings_add_int("server", "connauth_request_secs", 2);
+ settings_add_int("server", "heartbeat", 300);
+
+ /* Requested Attributes settings */
+ settings_add_bool("silc", "attr_allow", TRUE);
+ settings_add_str("silc", "attr_vcard", "");
+ settings_add_str("silc", "attr_services", "");
+ settings_add_str("silc", "attr_status_mood", "NORMAL");
+ settings_add_str("silc", "attr_status_text", "");
+ settings_add_str("silc", "attr_status_message", NULL);
+ settings_add_str("silc", "attr_preferred_language", "");
+ settings_add_str("silc", "attr_preferred_contact", "CHAT");
+ settings_add_bool("silc", "attr_timezone", TRUE);
+ settings_add_str("silc", "attr_geolocation", "");
+ settings_add_str("silc", "attr_device_info", NULL);
+ settings_add_str("silc", "attr_public_keys", "");
#ifdef SILC_DEBUG
settings_add_bool("debug", "debug", FALSE);
settings_add_str("debug", "debug_string", "");
- signal_add("setup changed", (SIGNAL_FUNC) sig_debug_setup_changed);
#endif
+ signal_add("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+
silc_init_userinfo();
/* Initialize client parameters */
rec->create_channel_setup = create_channel_setup;
rec->create_server_connect = create_server_connect;
rec->destroy_server_connect = destroy_server_connect;
- rec->server_connect = (SERVER_REC *(*) (SERVER_CONNECT_REC *))
- silc_server_connect;
- rec->channel_create = (CHANNEL_REC *(*) (SERVER_REC *, const char *, int))
+ rec->server_init_connect = silc_server_init_connect;
+ rec->server_connect = silc_server_connect;
+ rec->channel_create = (CHANNEL_REC *(*) (SERVER_REC *, const char *,
+ const char *, int))
silc_channel_create;
rec->query_create = (QUERY_REC *(*) (const char *, const char *, int))
silc_query_create;
if (idletag != -1) {
signal_emit("chat protocol deinit", 1,
chat_protocol_find("SILC"));
-#ifdef SILC_DEBUG
- signal_remove("setup changed", (SIGNAL_FUNC) sig_debug_setup_changed);
-#endif
-
+ signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+
silc_server_deinit();
silc_channels_deinit();
silc_queries_deinit();