SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for cap-notify

This commit is contained in:
Patrick Griffis 2016-01-28 16:02:04 -05:00
parent 4e061a43b3
commit 7a85c9160d
5 changed files with 88 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/common/inbound.c
View File

@ -1633,6 +1633,64 @@ inbound_identified (server *serv) /* 'MODE +e MYSELF' on freenode */
}
}
static void
inbound_toggle_caps (server *serv, const char *extensions_str, gboolean enable)
{
char **extensions;
gsize i;
extensions = g_strsplit (extensions_str, " ", 0);
for (i = 0; extensions[i]; i++)
{
const char *extension = extensions[i];
if (!strcmp (extension, "identify-msg"))
serv->have_idmsg = enable;
else if (!strcmp (extension, "multi-prefix"))
serv->have_namesx = enable;
else if (!strcmp (extension, "account-notify"))
serv->have_accnotify = enable;
else if (!strcmp (extension, "extended-join"))
serv->have_extjoin = enable;
else if (!strcmp (extension, "userhost-in-names"))
serv->have_uhnames = enable;
else if (!strcmp (extension, "server-time")
|| !strcmp (extension, "znc.in/server-time")
|| !strcmp (extension, "znc.in/server-time-iso"))
serv->have_server_time = enable;
else if (!strcmp (extension, "away-notify"))
serv->have_awaynotify = enable;
else if (!strcmp (extension, "sasl"))
{
serv->have_sasl = enable;
if (enable)
{
serv->sent_saslauth = FALSE;
#ifdef USE_OPENSSL
if (serv->loginmethod == LOGIN_SASLEXTERNAL)
{
serv->sasl_mech = MECH_EXTERNAL;
tcp_send_len (serv, "AUTHENTICATE EXTERNAL\r\n", 23);
}
else
{
/* default to most secure, it will fallback if not supported */
serv->sasl_mech = MECH_AES;
tcp_send_len (serv, "AUTHENTICATE DH-AES\r\n", 21);
}
#else
serv->sasl_mech = MECH_PLAIN;
tcp_send_len (serv, "AUTHENTICATE PLAIN\r\n", 20);
#endif
}
}
}
g_strfreev (extensions);
}
void
inbound_cap_ack (server *serv, char *nick, char *extensions,
const message_tags_data *tags_data)
@ -1640,63 +1698,17 @@ inbound_cap_ack (server *serv, char *nick, char *extensions,
EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPACK, serv->server_session, nick, extensions,
NULL, NULL, 0, tags_data->timestamp);
if (strstr (extensions, "identify-msg") != NULL)
{
serv->have_idmsg = TRUE;
}
inbound_toggle_caps (serv, extensions, TRUE);
}
if (strstr (extensions, "multi-prefix") != NULL)
{
serv->have_namesx = TRUE;
}
void
inbound_cap_del (server *serv, char *nick, char *extensions,
const message_tags_data *tags_data)
{
EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPDEL, serv->server_session, nick, extensions,
NULL, NULL, 0, tags_data->timestamp);
if (strstr (extensions, "away-notify") != NULL)
{
serv->have_awaynotify = TRUE;
}
if (strstr (extensions, "account-notify") != NULL)
{
serv->have_accnotify = TRUE;
}
if (strstr (extensions, "extended-join") != NULL)
{
serv->have_extjoin = TRUE;
}
if (strstr (extensions, "userhost-in-names") != NULL)
{
serv->have_uhnames = TRUE;
}
if (strstr (extensions, "server-time") != NULL)
{
serv->have_server_time = TRUE;
}
if (strstr (extensions, "sasl") != NULL)
{
serv->have_sasl = TRUE;
serv->sent_saslauth = FALSE;
#ifdef USE_OPENSSL
if (serv->loginmethod == LOGIN_SASLEXTERNAL)
{
serv->sasl_mech = MECH_EXTERNAL;
tcp_send_len (serv, "AUTHENTICATE EXTERNAL\r\n", 23);
}
else
{
/* default to most secure, it will fallback if not supported */
serv->sasl_mech = MECH_AES;
tcp_send_len (serv, "AUTHENTICATE DH-AES\r\n", 21);
}
#else
serv->sasl_mech = MECH_PLAIN;
tcp_send_len (serv, "AUTHENTICATE PLAIN\r\n", 20);
#endif
}
inbound_toggle_caps (serv, extensions, FALSE);
}
static const char * const supported_caps[] = {
@ -1712,6 +1724,7 @@ static const char * const supported_caps[] = {
/* IRCv3.2 */
"server-time"
"userhost-in-names",
"cap-notify",
/* ZNC */
"znc.in/server-time-iso",

2
src/common/inbound.h
View File

@ -95,6 +95,8 @@ void inbound_cap_ls (server *serv, char *nick, char *extensions,
void inbound_cap_nak (server *serv, const message_tags_data *tags_data);
void inbound_cap_list (server *serv, char *nick, char *extensions,
const message_tags_data *tags_data);
void inbound_cap_del (server *serv, char *nick, char *extensions,
const message_tags_data *tags_data);
void inbound_sasl_authenticate (server *serv, char *data);
int inbound_sasl_error (server *serv);
void inbound_sasl_supportedmechs (server *serv, char *list);

8
src/common/proto-irc.c
View File

@ -1280,7 +1280,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5],
tags_data);
}
else if (strncasecmp (word[4], "LS", 2) == 0)
else if (strncasecmp (word[4], "LS", 2) == 0 || strncasecmp (word[4], "NEW", 3) == 0)
{
inbound_cap_ls (serv, word[1],
word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5],
@ -1296,6 +1296,12 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5],
tags_data);
}
else if (strncasecmp (word[4], "DEL", 3) == 0)
{
inbound_cap_del (serv, word[1],
word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5],
tags_data);
}
return;
}

5
src/common/text.c
View File

@ -976,6 +976,11 @@ static char * const pevt_capack_help[] = {
N_("Acknowledged Capabilities")
};
static char * const pevt_capdel_help[] = {
N_("Server Name"),
N_("Removed Capabilities")
};
static char * const pevt_caplist_help[] = {
N_("Server Name"),
N_("Server Capabilities")

6
src/common/textevents.in
View File

@ -28,6 +28,12 @@ pevt_capack_help
%C29*%O$tCapabilities acknowledged: %C29$2%O
2
Capability Deleted
XP_TE_CAPDEL
pevt_capdel_help
%C29*%O$tCapabilities removed: %C29$2%O
2
Capability List
XP_TE_CAPLIST
pevt_caplist_help