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

Merge branch 'master' into 'security'

Browse source 
Sync to master

See merge request !6
This commit is contained in:
Nei 2017-01-02 17:03:31 +00:00 • committed by ailin-nemui
commit 7a112e0217
19 changed files with 349 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/irc/core/irc-queries.c
View file

@ -81,20 +81,6 @@ static void check_query_changes(IRC_SERVER_REC *server, const char *nick,
}
}
static void event_privmsg(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *address)
{
char *params, *target, *msg;
g_return_if_fail(data != NULL);
if (nick == NULL)
return;
params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
check_query_changes(server, nick, address, target);
g_free(params);
}
static void ctcp_action(IRC_SERVER_REC *server, const char *msg,
const char *nick, const char *address,
const char *target)
@ -119,14 +105,12 @@ static void event_nick(SERVER_REC *server, const char *data,
void irc_queries_init(void)
{
signal_add_last("event privmsg", (SIGNAL_FUNC) event_privmsg);
signal_add_last("ctcp action", (SIGNAL_FUNC) ctcp_action);
signal_add("event nick", (SIGNAL_FUNC) event_nick);
}
void irc_queries_deinit(void)
{
signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
signal_remove("ctcp action", (SIGNAL_FUNC) ctcp_action);
signal_remove("event nick", (SIGNAL_FUNC) event_nick);
}

1
src/irc/core/irc-servers.h
View file

@ -68,6 +68,7 @@ struct _IRC_SERVER_REC {
unsigned int motd_got:1; /* We've received MOTD */
unsigned int isupport_sent:1; /* Server has sent us an isupport reply */
unsigned int cap_complete:1; /* We've done the initial CAP negotiation */
unsigned int sasl_success:1; /* Did we authenticate successfully ? */
int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */
int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */

7
src/irc/core/sasl.c
View file

@ -48,6 +48,7 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
cap_finish_negotiation(server);
server->sasl_timeout = 0;
server->sasl_success = FALSE;
signal_emit("server sasl failure", 2, server, "The authentication timed out");
@ -84,6 +85,8 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
params = event_get_params(data, 2, NULL, &error);
server->sasl_success = FALSE;
signal_emit("server sasl failure", 2, server, error);
/* Terminate the negotiation */
@ -99,6 +102,8 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
server->sasl_timeout = 0;
}
server->sasl_success = TRUE;
signal_emit("server sasl success", 1, server);
/* We're already authenticated, do nothing */
@ -112,6 +117,8 @@ static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *f
server->sasl_timeout = 0;
}
server->sasl_success = TRUE;
signal_emit("server sasl success", 1, server);
/* The authentication succeeded, time to finish the CAP negotiation */