zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-19 08:32:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added reference counter to SERVER_CONNECT_REC. Since it's being moved around

Browse source 
a lot in reconnects etc. this should make it easier to track when it's
supposed to be destroyed. Hopefully fixes a crash I assume is related to
this but couldn't find..


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1880 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-10-21 13:59:07 +00:00 • committed by cras
commit 1256621041
10 changed files with 79 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/irc/core/irc-core.c
View file

@ -65,6 +65,18 @@ static SERVER_CONNECT_REC *create_server_connect(void)
return g_malloc0(sizeof(IRC_SERVER_CONNECT_REC));
}
static void destroy_server_connect(SERVER_CONNECT_REC *conn)
{
IRC_SERVER_CONNECT_REC *ircconn;
ircconn = IRC_SERVER_CONNECT(conn);
if (ircconn == NULL)
return;
g_free_not_null(ircconn->usermode);
g_free_not_null(ircconn->alternate_nick);
}
void irc_core_init(void)
{
CHAT_PROTOCOL_REC *rec;
@ -80,6 +92,7 @@ void irc_core_init(void)
rec->create_server_setup = create_server_setup;
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 *))
irc_server_connect;

19
src/irc/core/irc-servers.c
View file

@ -55,15 +55,6 @@ void irc_servers_reconnect_deinit(void);
static int cmd_tag;
static void sig_server_connect_free(IRC_SERVER_CONNECT_REC *conn)
{
if (!IS_IRC_SERVER_CONNECT(conn))
return;
g_free_not_null(conn->usermode);
g_free_not_null(conn->alternate_nick);
}
static int isnickflag_func(char flag)
{
return isnickflag(flag);
@ -171,8 +162,12 @@ IRC_SERVER_REC *irc_server_connect(IRC_SERVER_CONNECT_REC *conn)
server = g_new0(IRC_SERVER_REC, 1);
server->chat_type = IRC_PROTOCOL;
server->connrec = conn;
if (server->connrec->port <= 0) server->connrec->port = 6667;
server_connect_ref(SERVER_CONNECT(conn));
if (server->connrec->port <= 0)
server->connrec->port = 6667;
server->cmd_queue_speed = conn->cmd_queue_speed > 0 ?
conn->cmd_queue_speed : settings_get_int("cmd_queue_speed");
@ -191,7 +186,7 @@ IRC_SERVER_REC *irc_server_connect(IRC_SERVER_CONNECT_REC *conn)
conn->max_msgs : DEFAULT_MAX_MSGS;
if (!server_start_connect((SERVER_REC *) server)) {
server_connect_free(SERVER_CONNECT(conn));
server_connect_unref(SERVER_CONNECT(conn));
g_free(server);
return NULL;
}
@ -498,7 +493,6 @@ void irc_servers_init(void)
cmd_tag = g_timeout_add(500, (GSourceFunc) servers_cmd_timeout, NULL);
signal_add("server connect free", (SIGNAL_FUNC) sig_server_connect_free);
signal_add_first("server looking", (SIGNAL_FUNC) sig_server_looking);
signal_add_first("server connected", (SIGNAL_FUNC) sig_connected);
signal_add_last("server disconnected", (SIGNAL_FUNC) sig_disconnected);
@ -520,7 +514,6 @@ void irc_servers_deinit(void)
{
g_source_remove(cmd_tag);
signal_remove("server connect free", (SIGNAL_FUNC) sig_server_connect_free);
signal_remove("server looking", (SIGNAL_FUNC) sig_server_looking);
signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);