aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Use formats instead of g_warning

Browse Source 
Add some copyright headers here and there too.
This commit is contained in:
LemonBoy 2015-09-20 23:13:43 +02:00
parent 06040fb30b
commit 203c00938a
9 changed files with 116 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/signals.txt
View File

@ -136,6 +136,10 @@ irc-cap.c
"server cap nak "<cmd>, SERVER_REC
"server cap end", SERVER_REC
sasl.c
"server sasl failure", SERVER_REC, char *reason
"server sasl success", SERVER_REC
irc.c:
"server event", SERVER_REC, char *data, char *sender_nick, char *sender_address

1
src/fe-common/irc/Makefile.am
View File

@ -26,6 +26,7 @@ real_sources = \
fe-netsplit.c \
fe-common-irc.c \
fe-whois.c \
fe-sasl.c \
irc-completion.c \
module-formats.c

5
src/fe-common/irc/fe-common-irc.c
View File

@ -69,6 +69,9 @@ void fe_netjoin_deinit(void);
void fe_whois_init(void);
void fe_whois_deinit(void);
void fe_sasl_init(void);
void fe_sasl_deinit(void);
void irc_completion_init(void);
void irc_completion_deinit(void);
@ -91,6 +94,7 @@ void fe_common_irc_init(void)
fe_netsplit_init();
fe_netjoin_init();
fe_whois_init();
fe_sasl_init();
irc_completion_init();
settings_check();
@ -116,6 +120,7 @@ void fe_common_irc_deinit(void)
fe_netsplit_deinit();
fe_netjoin_deinit();
fe_whois_deinit();
fe_sasl_deinit();
irc_completion_deinit();
theme_unregister();

48
src/fe-common/irc/fe-sasl.c Normal file
View File

@ -0,0 +1,48 @@
/*
fe-sasl.c : irssi
Copyright (C) 2015 The Lemon Man
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "module.h"
#include "module-formats.h"
#include "signals.h"
#include "levels.h"
#include "printtext.h"
static void sig_sasl_success(IRC_SERVER_REC *server)
{
printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_SUCCESS);
}
static void sig_sasl_failure(IRC_SERVER_REC *server, const char *reason)
{
printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_ERROR, reason);
}
void fe_sasl_init(void)
{
signal_add("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
signal_add("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
}
void fe_sasl_deinit(void)
{
signal_remove("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
signal_remove("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
}

2
src/fe-common/irc/module-formats.c
View File

@ -44,6 +44,8 @@ FORMAT_REC fecommon_irc_formats[] = {
{ "setupserver_header", "%#Server Port Network Settings", 0 },
{ "setupserver_line", "%#%|$[!20]0 $[5]1 $[10]2 $3", 4, { 0, 1, 0, 0 } },
{ "setupserver_footer", "", 0 },
{ "sasl_success", "SASL authentication succeeded", 0 },
{ "sasl_error", "Cannot authenticate via SASL ($0)", 1, { 0 } },
/* ---- */
{ NULL, "Channels", 0 },

2
src/fe-common/irc/module-formats.h
View File

@ -22,6 +22,8 @@ enum {
IRCTXT_SETUPSERVER_HEADER,
IRCTXT_SETUPSERVER_LINE,
IRCTXT_SETUPSERVER_FOOTER,
IRCTXT_SASL_SUCCESS,
IRCTXT_SASL_ERROR,
IRCTXT_FILL_2,

2
src/irc/core/irc-servers-setup.c
View File

@ -93,7 +93,7 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
conn->sasl_username = ircnet->sasl_username;
conn->sasl_password = ircnet->sasl_password;
} else
g_warning("The fields sasl_username and sasl_password are either undefined or empty");
g_warning("The fields sasl_username and sasl_password are either missing or empty");
}
else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;

43
src/irc/core/sasl.c
View File

@ -1,3 +1,23 @@
/*
fe-sasl.c : irssi
Copyright (C) 2015 The Lemon Man
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "module.h"
#include "misc.h"
#include "settings.h"
@ -8,20 +28,20 @@
#define SASL_TIMEOUT (20 * 1000) // ms
static gboolean sasl_timeout (IRC_SERVER_REC *server)
static gboolean sasl_timeout(IRC_SERVER_REC *server)
{
/* The authentication timed out, we can't do much beside terminating it */
g_critical("The authentication timed out, try increasing the timeout and check your connection "
"to the network.");
irc_send_cmd_now(server, "AUTHENTICATE *");
cap_finish_negotiation(server);
server->sasl_timeout = -1;
signal_emit("server sasl failure", 2, server, "The authentication timed out");
return FALSE;
}
static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *from)
static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *from)
{
IRC_SERVER_CONNECT_REC *conn;
@ -39,7 +59,7 @@ static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *fr
server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
}
static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *from)
static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from)
{
char *params, *error;
@ -51,7 +71,7 @@ static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *fro
params = event_get_params(data, 2, NULL, &error);
g_critical("Authentication failed with reason \"%s\"", error);
signal_emit("server sasl fail", 2, server, error);
/* Terminate the negotiation */
cap_finish_negotiation(server);
@ -59,30 +79,33 @@ static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *fro
g_free(params);
}
static void sasl_already (IRC_SERVER_REC *server, const char *data, const char *from)
static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from)
{
if (server->sasl_timeout != -1) {
g_source_remove(server->sasl_timeout);
server->sasl_timeout = -1;
}
signal_emit("server sasl success", 1, server);
/* We're already authenticated, do nothing */
cap_finish_negotiation(server);
}
static void sasl_success (IRC_SERVER_REC *server, const char *data, const char *from)
static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from)
{
if (server->sasl_timeout != -1) {
g_source_remove(server->sasl_timeout);
server->sasl_timeout = -1;
}
signal_emit("server sasl success", 1, server);
/* The authentication succeeded, time to finish the CAP negotiation */
g_warning("SASL authentication succeeded");
cap_finish_negotiation(server);
}
static void sasl_step (IRC_SERVER_REC *server, const char *data, const char *from)
static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from)
{
IRC_SERVER_CONNECT_REC *conn;
GString *req;

20
src/irc/core/sasl.h
View File

@ -1,3 +1,23 @@
/*
fe-sasl.c : irssi
Copyright (C) 2015 The Lemon Man
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __SASL_H
#define __SASL_H