X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-core.c;h=9a61a48b736fe8af8702078611bd078ec6a14133;hb=017dec75a98209fbef49eb496c2269b0c49e736d;hp=f67cf129aff5b99a541e8e22de7c612a4dd81ca5;hpb=28bb558c7ca273dbcff929f3f376c54b00e72a5f;p=silc.git diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c index f67cf129..9a61a48b 100644 --- a/apps/irssi/src/silc/core/silc-core.c +++ b/apps/irssi/src/silc/core/silc-core.c @@ -37,19 +37,17 @@ #include "settings.h" #include "fe-common/core/printtext.h" #include "fe-common/core/fe-channels.h" +#include "fe-common/core/keyboard.h" +#include "fe-common/silc/module-formats.h" /* Command line option variables */ -static char *opt_server = NULL; -static int opt_port = 0; -static char *opt_nickname = NULL; -static char *opt_channel = NULL; -static char *opt_cipher = NULL; -static char *opt_public_key = NULL; -static char *opt_private_key = NULL; -static char *opt_config_file = NULL; -static bool opt_no_silcrc = FALSE; - static bool opt_create_keypair = FALSE; +static bool opt_debug = FALSE; +static bool opt_list_ciphers = FALSE; +static bool opt_list_hash = FALSE; +static bool opt_list_hmac = FALSE; +static bool opt_list_pkcs = FALSE; +static bool opt_version = FALSE; static char *opt_pkcs = NULL; static char *opt_keyfile = NULL; static int opt_bits = 0; @@ -59,903 +57,16 @@ static int idletag; SilcClient silc_client = NULL; SilcClientConfig silc_config = NULL; extern SilcClientOperations ops; +extern int silc_debug; #ifdef SILC_SIM /* SIM (SILC Module) table */ SilcSimContext **sims = NULL; uint32 sims_count = 0; #endif -static void silc_say(SilcClient client, SilcClientConnection conn, - char *msg, ...); -static void -silc_channel_message(SilcClient client, SilcClientConnection conn, - SilcClientEntry sender, SilcChannelEntry channel, - SilcMessageFlags flags, char *msg); -static void -silc_private_message(SilcClient client, SilcClientConnection conn, - SilcClientEntry sender, SilcMessageFlags flags, - char *msg); -static void silc_notify(SilcClient client, SilcClientConnection conn, - SilcNotifyType type, ...); -static void -silc_connect(SilcClient client, SilcClientConnection conn, int success); -static void -silc_disconnect(SilcClient client, SilcClientConnection conn); -static void -silc_command(SilcClient client, SilcClientConnection conn, - SilcClientCommandContext cmd_context, int success, - SilcCommand command); -static void -silc_command_reply(SilcClient client, SilcClientConnection conn, - SilcCommandPayload cmd_payload, int success, - SilcCommand command, SilcCommandStatus status, ...); - -static int silc_verify_public_key(SilcClient client, - SilcClientConnection conn, - SilcSocketType conn_type, - unsigned char *pk, uint32 pk_len, - SilcSKEPKType pk_type); -static unsigned char *silc_ask_passphrase(SilcClient client, - SilcClientConnection conn); -static int -silc_get_auth_method(SilcClient client, SilcClientConnection conn, - char *hostname, uint16 port, - SilcProtocolAuthMeth *auth_meth, - unsigned char **auth_data, - uint32 *auth_data_len); -static void -silc_failure(SilcClient client, SilcClientConnection conn, - SilcProtocol protocol, void *failure); -static int -silc_key_agreement(SilcClient client, SilcClientConnection conn, - SilcClientEntry client_entry, char *hostname, - int port, - SilcKeyAgreementCallback *completion, - void **context); - -static void silc_say(SilcClient client, SilcClientConnection conn, - char *msg, ...) -{ - SILC_SERVER_REC *server; - va_list va; - char *str; - - server = conn == NULL ? NULL : conn->context; - - va_start(va, msg); - str = g_strdup_vprintf(msg, va); - printtext(server, "#silc", MSGLEVEL_CRAP, "%s", str); - g_free(str); - va_end(va); -} - -static void silc_say_error(char *msg, ...) -{ - va_list va; - char *str; - - va_start(va, msg); - str = g_strdup_vprintf(msg, va); - printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "%s", str); - - g_free(str); - va_end(va); -} - -/* Message for a channel. The `sender' is the nickname of the sender - received in the packet. The `channel_name' is the name of the channel. */ - -static void -silc_channel_message(SilcClient client, SilcClientConnection conn, - SilcClientEntry sender, SilcChannelEntry channel, - SilcMessageFlags flags, char *msg) -{ - SILC_SERVER_REC *server; - SILC_NICK_REC *nick; - SILC_CHANNEL_REC *chanrec; - - server = conn == NULL ? NULL : conn->context; - chanrec = silc_channel_find_entry(server, channel); - - nick = silc_nicklist_find(chanrec, sender); - signal_emit("message public", 6, server, msg, - nick == NULL ? "[]" : nick->nick, - nick == NULL ? NULL : nick->host, - chanrec->name, nick); -} - -/* Private message to the client. The `sender' is the nickname of the - sender received in the packet. */ - -static void -silc_private_message(SilcClient client, SilcClientConnection conn, - SilcClientEntry sender, SilcMessageFlags flags, - char *msg) -{ - SILC_SERVER_REC *server; - - server = conn == NULL ? NULL : conn->context; - signal_emit("message private", 4, server, msg, - sender->nickname ? sender->nickname : "[]", - sender->username ? sender->username : NULL); -} - -/* Notify message to the client. The notify arguments are sent in the - same order as servers sends them. The arguments are same as received - from the server except for ID's. If ID is received application receives - the corresponding entry to the ID. For example, if Client ID is received - application receives SilcClientEntry. Also, if the notify type is - for channel the channel entry is sent to application (even if server - does not send it). */ - -typedef struct { - int type; - const char *name; -} NOTIFY_REC; - -#define MAX_NOTIFY (sizeof(notifies)/sizeof(notifies[0])) -static NOTIFY_REC notifies[] = { - { SILC_NOTIFY_TYPE_NONE, NULL }, - { SILC_NOTIFY_TYPE_INVITE, "invite" }, - { SILC_NOTIFY_TYPE_JOIN, "join" }, - { SILC_NOTIFY_TYPE_LEAVE, "leave" }, - { SILC_NOTIFY_TYPE_SIGNOFF, "signoff" }, - { SILC_NOTIFY_TYPE_TOPIC_SET, "topic" }, - { SILC_NOTIFY_TYPE_NICK_CHANGE, "nick" }, - { SILC_NOTIFY_TYPE_CMODE_CHANGE, "cmode" }, - { SILC_NOTIFY_TYPE_CUMODE_CHANGE, "cumode" }, - { SILC_NOTIFY_TYPE_MOTD, "motd" }, - { SILC_NOTIFY_TYPE_CHANNEL_CHANGE, "channel_change" }, - { SILC_NOTIFY_TYPE_SERVER_SIGNOFF, "server_signoff" }, - { SILC_NOTIFY_TYPE_KICKED, "kick" }, - { SILC_NOTIFY_TYPE_KILLED, "kill" }, - { SILC_NOTIFY_TYPE_UMODE_CHANGE, "umode" }, - { SILC_NOTIFY_TYPE_BAN, "ban" }, -}; - -static void silc_notify(SilcClient client, SilcClientConnection conn, - SilcNotifyType type, ...) -{ - SILC_SERVER_REC *server; - va_list va; - - server = conn == NULL ? NULL : conn->context; - va_start(va, type); - - if (type == SILC_NOTIFY_TYPE_NONE) { - /* Some generic notice from server */ - printtext(server, NULL, MSGLEVEL_CRAP, "%s", (char *)va_arg(va, char *)); - } else if (type < MAX_NOTIFY) { - /* Send signal about the notify event */ - char signal[50]; - g_snprintf(signal, sizeof(signal), "silc event %s", notifies[type].name); - signal_emit(signal, 2, server, va); - } else { - /* Unknown notify */ - printtext(server, NULL, MSGLEVEL_CRAP, "Unknown notify type %d", type); - } - - va_end(va); -} - -/* Called to indicate that connection was either successfully established - or connecting failed. This is also the first time application receives - the SilcClientConnection objecet which it should save somewhere. */ - -static void -silc_connect(SilcClient client, SilcClientConnection conn, int success) -{ - SILC_SERVER_REC *server = conn->context; - - if (success) { - server->connected = TRUE; - signal_emit("event connected", 1, server); - } else { - server->connection_lost = TRUE; - server->conn->context = NULL; - server_disconnect(SERVER(server)); - } -} - -/* Called to indicate that connection was disconnected to the server. */ - -static void -silc_disconnect(SilcClient client, SilcClientConnection conn) -{ - SILC_SERVER_REC *server = conn->context; - - server->conn->context = NULL; - server->conn = NULL; - server->connection_lost = TRUE; - server_disconnect(SERVER(server)); -} - -/* Command handler. This function is called always in the command function. - If error occurs it will be called as well. `conn' is the associated - client connection. `cmd_context' is the command context that was - originally sent to the command. `success' is FALSE if error occured - during command. `command' is the command being processed. It must be - noted that this is not reply from server. This is merely called just - after application has called the command. Just to tell application - that the command really was processed. */ - -static void -silc_command(SilcClient client, SilcClientConnection conn, - SilcClientCommandContext cmd_context, int success, - SilcCommand command) -{ -} - -/* Client info resolving callback when JOIN command reply is received. - This will cache all users on the channel. */ - -void silc_client_join_get_users(SilcClient client, - SilcClientConnection conn, - SilcClientEntry *clients, - uint32 clients_count, - void *context) -{ - SilcChannelEntry channel = (SilcChannelEntry)context; - SilcChannelUser chu; - SILC_SERVER_REC *server = conn->context; - SILC_CHANNEL_REC *chanrec; - NICK_REC *ownnick; - - if (!clients) - return; - - chanrec = silc_channel_find_entry(server, channel); - if (chanrec == NULL) - return; - - silc_list_start(channel->clients); - while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) - silc_nicklist_insert(chanrec, chu, FALSE); - - ownnick = NICK(silc_nicklist_find(chanrec, conn->local_entry)); - nicklist_set_own(CHANNEL(chanrec), ownnick); - signal_emit("channel joined", 1, chanrec); - fe_channels_nicklist(CHANNEL(chanrec), CHANNEL_NICKLIST_FLAG_ALL); -} - -/* Command reply handler. This function is called always in the command reply - function. If error occurs it will be called as well. Normal scenario - is that it will be called after the received command data has been parsed - and processed. The function is used to pass the received command data to - the application. - - `conn' is the associated client connection. `cmd_payload' is the command - payload data received from server and it can be ignored. It is provided - if the application would like to re-parse the received command data, - however, it must be noted that the data is parsed already by the library - thus the payload can be ignored. `success' is FALSE if error occured. - In this case arguments are not sent to the application. `command' is the - command reply being processed. The function has variable argument list - and each command defines the number and type of arguments it passes to the - application (on error they are not sent). */ - -static void -silc_command_reply(SilcClient client, SilcClientConnection conn, - SilcCommandPayload cmd_payload, int success, - SilcCommand command, SilcCommandStatus status, ...) - -{ - SILC_SERVER_REC *server = conn->context; - SILC_CHANNEL_REC *chanrec; - va_list vp; - - va_start(vp, status); - - switch(command) { - case SILC_COMMAND_WHOIS: - { - char buf[1024], *nickname, *username, *realname; - int len; - uint32 idle, mode; - SilcBuffer channels; - - /* XXX should use irssi routines */ - - if (status == SILC_STATUS_ERR_NO_SUCH_NICK || - status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { - char *tmp; - tmp = silc_argument_get_arg_type(silc_command_get_args(cmd_payload), - 3, NULL); - if (tmp) - client->ops->say(client, conn, "%s: %s", tmp, - silc_client_command_status_message(status)); - else - client->ops->say(client, conn, "%s", - silc_client_command_status_message(status)); - break; - } - - if (!success) - return; - - (void)va_arg(vp, SilcClientEntry); - nickname = va_arg(vp, char *); - username = va_arg(vp, char *); - realname = va_arg(vp, char *); - channels = va_arg(vp, SilcBuffer); - mode = va_arg(vp, uint32); - idle = va_arg(vp, uint32); - - memset(buf, 0, sizeof(buf)); - - if (nickname) { - len = strlen(nickname); - strncat(buf, nickname, len); - strncat(buf, " is ", 4); - } - - if (username) { - strncat(buf, username, strlen(username)); - } - - if (realname) { - strncat(buf, " (", 2); - strncat(buf, realname, strlen(realname)); - strncat(buf, ")", 1); - } - - client->ops->say(client, conn, "%s", buf); - - if (channels) { - SilcDList list = silc_channel_payload_parse_list(channels); - if (list) { - SilcChannelPayload entry; - - memset(buf, 0, sizeof(buf)); - strcat(buf, "on channels: "); - - silc_dlist_start(list); - while ((entry = silc_dlist_get(list)) != SILC_LIST_END) { - char *m = silc_client_chumode_char(silc_channel_get_mode(entry)); - uint32 name_len; - char *name = silc_channel_get_name(entry, &name_len); - - if (m) - strncat(buf, m, strlen(m)); - strncat(buf, name, name_len); - strncat(buf, " ", 1); - silc_free(m); - } - - client->ops->say(client, conn, "%s", buf); - silc_channel_payload_list_free(list); - } - } - - if (mode) { - if ((mode & SILC_UMODE_SERVER_OPERATOR) || - (mode & SILC_UMODE_ROUTER_OPERATOR)) - client->ops->say(client, conn, "%s is %s", nickname, - (mode & SILC_UMODE_SERVER_OPERATOR) ? - "Server Operator" : - (mode & SILC_UMODE_ROUTER_OPERATOR) ? - "SILC Operator" : "[Unknown mode]"); - - if (mode & SILC_UMODE_GONE) - client->ops->say(client, conn, "%s is gone", nickname); - } - - if (idle && nickname) - client->ops->say(client, conn, "%s has been idle %d %s", - nickname, - idle > 60 ? (idle / 60) : idle, - idle > 60 ? "minutes" : "seconds"); - } - break; - - case SILC_COMMAND_WHOWAS: - { - char buf[1024], *nickname, *username, *realname; - int len; - - /* XXX should use irssi routines */ - - if (status == SILC_STATUS_ERR_NO_SUCH_NICK || - status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { - char *tmp; - tmp = silc_argument_get_arg_type(silc_command_get_args(cmd_payload), - 3, NULL); - if (tmp) - client->ops->say(client, conn, "%s: %s", tmp, - silc_client_command_status_message(status)); - else - client->ops->say(client, conn, "%s", - silc_client_command_status_message(status)); - break; - } - - if (!success) - return; - - (void)va_arg(vp, SilcClientEntry); - nickname = va_arg(vp, char *); - username = va_arg(vp, char *); - realname = va_arg(vp, char *); - - memset(buf, 0, sizeof(buf)); - - if (nickname) { - len = strlen(nickname); - strncat(buf, nickname, len); - strncat(buf, " was ", 5); - } - - if (username) { - strncat(buf, username, strlen(nickname)); - } - - if (realname) { - strncat(buf, " (", 2); - strncat(buf, realname, strlen(realname)); - strncat(buf, ")", 1); - } - - client->ops->say(client, conn, "%s", buf); - } - break; - - case SILC_COMMAND_INVITE: - { - SilcChannelEntry channel; - char *invite_list; - - if (!success) - return; - - /* XXX should use irssi routines */ - - channel = va_arg(vp, SilcChannelEntry); - invite_list = va_arg(vp, char *); - - if (invite_list) - silc_say(client, conn, "%s invite list: %s", channel->channel_name, - invite_list); - else - silc_say(client, conn, "%s invite list not set", - channel->channel_name); - } - break; - - case SILC_COMMAND_JOIN: - { - char *channel, *mode, *topic; - uint32 modei; - SilcChannelEntry channel_entry; - SilcBuffer client_id_list; - uint32 list_count; - - channel = va_arg(vp, char *); - channel_entry = va_arg(vp, SilcChannelEntry); - modei = va_arg(vp, uint32); - (void)va_arg(vp, uint32); - (void)va_arg(vp, unsigned char *); - (void)va_arg(vp, unsigned char *); - (void)va_arg(vp, unsigned char *); - topic = va_arg(vp, char *); - (void)va_arg(vp, unsigned char *); - list_count = va_arg(vp, uint32); - client_id_list = va_arg(vp, SilcBuffer); - - /* XXX what an earth do I do with the topic??? */ - - if (!success) - return; - - chanrec = silc_channel_find(server, channel); - if (chanrec != NULL && !success) - channel_destroy(CHANNEL(chanrec)); - else if (chanrec == NULL && success) - chanrec = silc_channel_create(server, channel, TRUE); - - mode = silc_client_chmode(modei, channel_entry); - g_free_not_null(chanrec->mode); - chanrec->mode = g_strdup(mode == NULL ? "" : mode); - signal_emit("channel mode changed", 1, chanrec); - - /* Resolve the client information */ - silc_client_get_clients_by_list(client, conn, list_count, client_id_list, - silc_client_join_get_users, - channel_entry); - break; - } - - case SILC_COMMAND_NICK: - { - SilcClientEntry client = va_arg(vp, SilcClientEntry); - char *old; - - if (!success) - return; - - old = g_strdup(server->nick); - server_change_nick(SERVER(server), client->nickname); - nicklist_rename_unique(SERVER(server), - server->conn->local_entry, server->nick, - client, client->nickname); - - signal_emit("message own_nick", 4, server, server->nick, old, ""); - g_free(old); - break; - } - - case SILC_COMMAND_LIST: - { - char *topic, *name; - int usercount; - unsigned char buf[256], tmp[16]; - int i, len; - - if (!success) - return; - - /* XXX should use irssi routines */ - - (void)va_arg(vp, SilcChannelEntry); - name = va_arg(vp, char *); - topic = va_arg(vp, char *); - usercount = va_arg(vp, int); - - if (status == SILC_STATUS_LIST_START || - status == SILC_STATUS_OK) - silc_say(client, conn, - " Channel Users Topic"); - - memset(buf, 0, sizeof(buf)); - strncat(buf, " ", 2); - len = strlen(name); - strncat(buf, name, len > 40 ? 40 : len); - if (len < 40) - for (i = 0; i < 40 - len; i++) - strcat(buf, " "); - strcat(buf, " "); - - memset(tmp, 0, sizeof(tmp)); - if (usercount) { - snprintf(tmp, sizeof(tmp), "%d", usercount); - strcat(buf, tmp); - } - len = strlen(tmp); - if (len < 10) - for (i = 0; i < 10 - len; i++) - strcat(buf, " "); - strcat(buf, " "); - - if (topic) { - len = strlen(topic); - strncat(buf, topic, len); - } - - silc_say(client, conn, "%s", buf); - } - break; - - case SILC_COMMAND_UMODE: - { - uint32 mode; - - if (!success) - return; - - mode = va_arg(vp, uint32); - - /* XXX todo */ - } - break; - - case SILC_COMMAND_OPER: -#if 0 - if (status == SILC_STATUS_OK) { - conn->local_entry->mode |= SILC_UMODE_SERVER_OPERATOR; - if (app->screen->bottom_line->umode) - silc_free(app->screen->bottom_line->umode); - app->screen->bottom_line->umode = strdup("Server Operator");; - silc_screen_print_bottom_line(app->screen, 0); - } -#endif - break; - - case SILC_COMMAND_SILCOPER: -#if 0 - if (status == SILC_STATUS_OK) { - conn->local_entry->mode |= SILC_UMODE_ROUTER_OPERATOR; - if (app->screen->bottom_line->umode) - silc_free(app->screen->bottom_line->umode); - app->screen->bottom_line->umode = strdup("SILC Operator");; - silc_screen_print_bottom_line(app->screen, 0); - } -#endif - break; - - case SILC_COMMAND_USERS: - { - SilcChannelEntry channel; - SilcChannelUser chu; - int line_len; - char *line; - - if (!success) - return; - - channel = va_arg(vp, SilcChannelEntry); - - /* There are two ways to do this, either parse the list (that - the command_reply sends (just take it with va_arg()) or just - traverse the channel's client list. I'll do the latter. See - JOIN command reply for example for the list. */ - - silc_say(client, conn, "Users on %s", channel->channel_name); - - line = silc_calloc(1024, sizeof(*line)); - line_len = 1024; - silc_list_start(channel->clients); - while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) { - SilcClientEntry e = chu->client; - int i, len1; - char *m, tmp[80]; - - memset(line, 0, line_len); - - if (strlen(e->nickname) + strlen(e->server) + 100 > line_len) { - silc_free(line); - line_len += strlen(e->nickname) + strlen(e->server) + 100; - line = silc_calloc(line_len, sizeof(*line)); - } - - memset(tmp, 0, sizeof(tmp)); - m = silc_client_chumode_char(chu->mode); - - strncat(line, " ", 1); - strncat(line, e->nickname, strlen(e->nickname)); - strncat(line, e->server ? "@" : "", 1); - - len1 = 0; - if (e->server) - len1 = strlen(e->server); - strncat(line, e->server ? e->server : "", len1 > 30 ? 30 : len1); - - len1 = strlen(line); - if (len1 >= 30) { - memset(&line[29], 0, len1 - 29); - } else { - for (i = 0; i < 30 - len1 - 1; i++) - strcat(line, " "); - } - - if (e->mode & SILC_UMODE_GONE) - strcat(line, " G"); - else - strcat(line, " H"); - strcat(tmp, m ? m : ""); - strncat(line, tmp, strlen(tmp)); - - if (strlen(tmp) < 5) - for (i = 0; i < 5 - strlen(tmp); i++) - strcat(line, " "); - - strcat(line, e->username ? e->username : ""); - - silc_say(client, conn, "%s", line); - - if (m) - silc_free(m); - } - - silc_free(line); - } - break; - - case SILC_COMMAND_BAN: - { - SilcChannelEntry channel; - char *ban_list; - - if (!success) - return; - - /* XXX should use irssi routines */ - - channel = va_arg(vp, SilcChannelEntry); - ban_list = va_arg(vp, char *); - - if (ban_list) - silc_say(client, conn, "%s ban list: %s", channel->channel_name, - ban_list); - else - silc_say(client, conn, "%s ban list not set", channel->channel_name); - } - break; - - case SILC_COMMAND_GETKEY: - { - SilcIdType id_type; - void *entry; - SilcPublicKey public_key; - unsigned char *pk; - uint32 pk_len; - - id_type = va_arg(vp, uint32); - entry = va_arg(vp, void *); - public_key = va_arg(vp, SilcPublicKey); - - pk = silc_pkcs_public_key_encode(public_key, &pk_len); - - if (id_type == SILC_ID_CLIENT) { - silc_verify_public_key(client, conn, SILC_SOCKET_TYPE_CLIENT, - pk, pk_len, SILC_SKE_PK_TYPE_SILC); - } - - silc_free(pk); - } - - case SILC_COMMAND_TOPIC: - { - SilcChannelEntry channel; - char *topic; - - if (!success) - return; - - channel = va_arg(vp, SilcChannelEntry); - topic = va_arg(vp, char *); - - /* XXX should use irssi routines */ - - if (topic) - silc_say(client, conn, - "Topic on channel %s: %s", channel->channel_name, - topic); - } - break; - } - - va_end(vp); -} - -/* Verifies received public key. If user decides to trust the key it is - saved as public server key for later use. If user does not trust the - key this returns FALSE. */ - -static int silc_verify_public_key(SilcClient client, - SilcClientConnection conn, - SilcSocketType conn_type, - unsigned char *pk, uint32 pk_len, - SilcSKEPKType pk_type) -{ - return TRUE; -} - -/* Asks passphrase from user on the input line. */ - -static unsigned char *silc_ask_passphrase(SilcClient client, - SilcClientConnection conn) -{ - return NULL; -} - -/* Find authentication method and authentication data by hostname and - port. The hostname may be IP address as well. The found authentication - method and authentication data is returned to `auth_meth', `auth_data' - and `auth_data_len'. The function returns TRUE if authentication method - is found and FALSE if not. `conn' may be NULL. */ - -static int -silc_get_auth_method(SilcClient client, SilcClientConnection conn, - char *hostname, uint16 port, - SilcProtocolAuthMeth *auth_meth, - unsigned char **auth_data, - uint32 *auth_data_len) -{ - - /* XXX must resolve from configuration whether this connection has - any specific authentication data */ - - *auth_meth = SILC_AUTH_NONE; - *auth_data = NULL; - *auth_data_len = 0; - - return TRUE; -} - -/* Notifies application that failure packet was received. This is called - if there is some protocol active in the client. The `protocol' is the - protocol context. The `failure' is opaque pointer to the failure - indication. Note, that the `failure' is protocol dependant and application - must explicitly cast it to correct type. Usually `failure' is 32 bit - failure type (see protocol specs for all protocol failure types). */ - -static void -silc_failure(SilcClient client, SilcClientConnection conn, - SilcProtocol protocol, void *failure) -{ - if (protocol->protocol->type == SILC_PROTOCOL_CLIENT_KEY_EXCHANGE) { - SilcSKEStatus status = (SilcSKEStatus)failure; - - if (status == SILC_SKE_STATUS_BAD_VERSION) - silc_say_error("You are running incompatible client version (it may be " - "too old or too new)"); - if (status == SILC_SKE_STATUS_UNSUPPORTED_PUBLIC_KEY) - silc_say_error("Server does not support your public key type"); - if (status == SILC_SKE_STATUS_UNKNOWN_GROUP) - silc_say_error("Server does not support one of your proposed KE group"); - if (status == SILC_SKE_STATUS_UNKNOWN_CIPHER) - silc_say_error("Server does not support one of your proposed cipher"); - if (status == SILC_SKE_STATUS_UNKNOWN_PKCS) - silc_say_error("Server does not support one of your proposed PKCS"); - if (status == SILC_SKE_STATUS_UNKNOWN_HASH_FUNCTION) - silc_say_error("Server does not support one of your proposed " - "hash function"); - if (status == SILC_SKE_STATUS_UNKNOWN_HMAC) - silc_say_error("Server does not support one of your proposed HMAC"); - if (status == SILC_SKE_STATUS_INCORRECT_SIGNATURE) - silc_say_error("Incorrect signature"); - } - - if (protocol->protocol->type == SILC_PROTOCOL_CLIENT_CONNECTION_AUTH) { - uint32 err = (uint32)failure; - - if (err == SILC_AUTH_FAILED) - silc_say(client, conn, "Authentication failed"); - } -} - -/* Asks whether the user would like to perform the key agreement protocol. - This is called after we have received an key agreement packet or an - reply to our key agreement packet. This returns TRUE if the user wants - the library to perform the key agreement protocol and FALSE if it is not - desired (application may start it later by calling the function - silc_client_perform_key_agreement). */ - -static int -silc_key_agreement(SilcClient client, SilcClientConnection conn, - SilcClientEntry client_entry, char *hostname, - int port, - SilcKeyAgreementCallback *completion, - void **context) -{ - char host[256]; - - /* We will just display the info on the screen and return FALSE and user - will have to start the key agreement with a command. */ - - if (hostname) { - memset(host, 0, sizeof(host)); - snprintf(host, sizeof(host) - 1, "(%s on port %d)", hostname, port); - } - - silc_say(client, conn, "%s wants to perform key agreement %s", - client_entry->nickname, hostname ? host : ""); - - *completion = NULL; - *context = NULL; - - return FALSE; -} - -/* SILC client operations */ -SilcClientOperations ops = { - silc_say, - silc_channel_message, - silc_private_message, - silc_notify, - silc_command, - silc_command_reply, - silc_connect, - silc_disconnect, - silc_get_auth_method, - silc_verify_public_key, - silc_ask_passphrase, - silc_failure, - silc_key_agreement, -}; - static int my_silc_scheduler(void) { - silc_schedule_one(0); + silc_schedule_one(silc_client->schedule, 0); return 1; } @@ -1044,6 +155,23 @@ static void silc_init_userinfo(void) } } +/* Log callbacks */ + +static void silc_log_info(char *message) +{ + fprintf(stderr, "%s\n", message); +} + +static void silc_log_warning(char *message) +{ + fprintf(stderr, "%s\n", message); +} + +static void silc_log_error(char *message) +{ + fprintf(stderr, "%s\n", message); +} + /* Init SILC. Called from src/fe-text/silc.c */ void silc_core_init(void) @@ -1057,17 +185,36 @@ void silc_core_init(void) "Set the length of the public key pair", "VALUE" }, { "show-key", 'S', POPT_ARG_STRING, &opt_keyfile, 0, "Show the contents of the public key", "FILE" }, + { "list-ciphers", 'C', POPT_ARG_NONE, &opt_list_ciphers, 0, + "List supported ciphers", NULL }, + { "list-hash-funcs", 'H', POPT_ARG_NONE, &opt_list_hash, 0, + "List supported hash functions", NULL }, + { "list-hmacs", 'H', POPT_ARG_NONE, &opt_list_hmac, 0, + "List supported HMACs", NULL }, + { "list-pkcs", 'P', POPT_ARG_NONE, &opt_list_pkcs, 0, + "List supported PKCSs", NULL }, + { "debug", 'd', POPT_ARG_NONE, &opt_debug, 0, + "Enable debugging", NULL }, + { "version", 'V', POPT_ARG_NONE, &opt_version, 0, + "Show version", NULL }, { NULL, '\0', 0, NULL } }; args_register(options); } +static void silc_nickname_format_parse(const char *nickname, + char **ret_nickname) +{ + silc_parse_userfqdn(nickname, ret_nickname, NULL); +} + /* Finalize init. Called from src/fe-text/silc.c */ void silc_core_init_finish(void) { CHAT_PROTOCOL_REC *rec; + SilcClientParams params; if (opt_create_keypair == TRUE) { /* Create new key pair and exit */ @@ -1090,8 +237,53 @@ void silc_core_init_finish(void) exit(0); } + if (opt_list_ciphers) { + silc_cipher_register_default(); + silc_client_list_ciphers(); + exit(0); + } + + if (opt_list_hash) { + silc_hash_register_default(); + silc_client_list_hash_funcs(); + exit(0); + } + + if (opt_list_hmac) { + silc_hmac_register_default(); + silc_client_list_hmacs(); + exit(0); + } + + if (opt_list_pkcs) { + silc_pkcs_register_default(); + silc_client_list_pkcs(); + exit(0); + } + + if (opt_version) { + printf("SILC Secure Internet Live Conferencing, version %s\n", + silc_version); + printf("(c) 1997 - 2001 Pekka Riikonen \n"); + exit(0); + } + + silc_debug = opt_debug; + silc_log_set_callbacks(silc_log_info, silc_log_warning, + silc_log_error, NULL); + + /* Do some irssi initializing */ + settings_add_bool("server", "skip_motd", FALSE); + settings_add_str("server", "alternate_nick", NULL); + silc_init_userinfo(); + + /* Initialize client parameters */ + memset(¶ms, 0, sizeof(params)); + strcat(params.nickname_format, "%n@%h%a"); + params.nickname_parse = silc_nickname_format_parse; + /* Allocate SILC client */ - silc_client = silc_client_alloc(&ops, NULL); + silc_client = silc_client_alloc(&ops, ¶ms, NULL, silc_version_string); /* Load local config file */ silc_config = silc_client_config_alloc(SILC_CLIENT_HOME_CONFIG_FILE); @@ -1157,12 +349,11 @@ void silc_core_init_finish(void) chat_protocol_register(rec); g_free(rec); - silc_init_userinfo(); silc_server_init(); silc_channels_init(); silc_queries_init(); - idletag = g_timeout_add(100, (GSourceFunc) my_silc_scheduler, NULL); + idletag = g_timeout_add(50, (GSourceFunc) my_silc_scheduler, NULL); } /* Deinit SILC. Called from src/fe-text/silc.c */