/*
silc-server.c : irssi
- Copyright (C) 2000 - 2006 Timo Sirainen
+ Copyright (C) 2000 - 2007 Timo Sirainen
Pekka Riikonen <priikone@silcnet.org>
This program is free software; you can redistribute it and/or modify
silc_free(unescaped_data);
}
-static int isnickflag_func(char flag)
+static int isnickflag_func(SERVER_REC *server, char flag)
{
return flag == '@' || flag == '+';
}
return FALSE;
}
-const char *get_nick_flags(void)
+const char *get_nick_flags(SERVER_REC *server)
{
return "@\0\0";
}
silc_utf8_encode(msg, strlen(msg), SILC_STRING_LOCALE, message, len);
}
- sign = settings_get_bool("sign_channel_messages");
-
- if (target_type == SEND_TARGET_CHANNEL)
+ if (target_type == SEND_TARGET_CHANNEL) {
+ sign = settings_get_bool("sign_channel_messages");
silc_send_channel(server, target, message ? message : msg,
SILC_MESSAGE_FLAG_UTF8 |
(sign ? SILC_MESSAGE_FLAG_SIGNED : 0));
- else {
+ } else {
+ sign = settings_get_bool("sign_private_messages");
if (!silc_term_utf8()) {
len = silc_utf8_encoded_len(target, strlen(target), SILC_STRING_LOCALE);
t = silc_calloc(len + 1, sizeof(*t));
SILC_SERVER_REC *server = context;
char *file;
- if (server->disconnected) {
- silc_client_close_connection(client, conn);
- return;
- }
+ SILC_LOG_DEBUG(("Connection callback %p, status %d, error %d, message %s",
+ conn, status, error, message ? message : "N/A"));
+
+ server->op = NULL;
switch (status) {
case SILC_CLIENT_CONN_SUCCESS:
+ if (server->disconnected) {
+ silc_client_close_connection(client, conn);
+ return;
+ }
+
/* We have successfully connected to server */
/* Enable queueing until we have our requested nick */
break;
case SILC_CLIENT_CONN_SUCCESS_RESUME:
+ if (server->disconnected) {
+ silc_client_close_connection(client, conn);
+ return;
+ }
+
/* We have successfully resumed old detached session */
server->connected = TRUE;
server->conn = conn;
/* Put default attributes */
silc_query_attributes_default(silc_client, conn);
- /* If we resumed old session check whether we need to update
- our nickname */
- if (strcmp(server->nick, conn->local_entry->nickname)) {
- char *old;
- old = g_strdup(server->nick);
- server_change_nick(SERVER(server), conn->local_entry->nickname);
- nicklist_rename_unique(SERVER(server),
- conn->local_entry, server->nick,
- conn->local_entry, conn->local_entry->nickname);
- signal_emit("message own_nick", 4, server, server->nick, old, "");
- g_free(old);
- }
-
/* Remove the detach data now */
file = silc_get_session_filename(server);
unlink(file);
server->conn->context = NULL;
server->conn = NULL;
server->connection_lost = TRUE;
- server_disconnect(SERVER(server));
+ if (!server->disconnected)
+ server_disconnect(SERVER(server));
+ server_unref(SERVER(server));
break;
default:
if (silc_file_size(file) > 0)
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_REATTACH_FAILED, file);
-
silc_free(file);
server->connection_lost = TRUE;
if (server->conn)
server->conn->context = NULL;
- server_disconnect(SERVER(server));
+ if (!server->disconnected)
+ server_disconnect(SERVER(server));
+ server_unref(SERVER(server));
break;
}
}
+/* Called after TCP stream has been created */
+
static void sig_connected_stream_created(SilcSocketStreamStatus status,
SilcStream stream, void *context)
{
SILCTXT_REATTACH, server->tag);
/* Start key exchange */
- silc_client_key_exchange(silc_client, ¶ms, irssi_pubkey, irssi_privkey,
- stream, SILC_CONN_SERVER, silc_connect_cb, server);
+ server->op = silc_client_key_exchange(silc_client, ¶ms,
+ irssi_pubkey, irssi_privkey,
+ stream, SILC_CONN_SERVER,
+ silc_connect_cb, server);
+ if (!server->op) {
+ server->connection_lost = TRUE;
+ server_disconnect(SERVER(server));
+ silc_stream_destroy(stream);
+ return;
+ }
+ server_ref(SERVER(server));
server->ftp_sessions = silc_dlist_init();
server->isnickflag = isnickflag_func;
server->ischannel = ischannel_func;
silc_dlist_uninit(server->ftp_sessions);
if (server->conn) {
+ /* Close connection */
silc_client_close_connection(silc_client, server->conn);
-
- /* SILC closes the handle */
- g_io_channel_unref(net_sendbuffer_handle(server->handle));
- net_sendbuffer_destroy(server->handle, FALSE);
- server->handle = NULL;
+ } else if (server->op) {
+ /* Abort on going connecting (key exchange) */
+ silc_async_abort(server->op, NULL, NULL);
+ server->op = NULL;
}
+
+ /* SILC closes the handle */
+ g_io_channel_unref(net_sendbuffer_handle(server->handle));
+ net_sendbuffer_destroy(server->handle, FALSE);
+ server->handle = NULL;
}
SERVER_REC *silc_server_init_connect(SERVER_CONNECT_REC *conn)
bool silc_term_utf8(void)
{
const char *str;
- str = settings_get_str("term_type");
+ str = settings_get_str("term_charset");
if (str)
if (g_strcasecmp(str, "utf-8") == 0)
return TRUE;