summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/core.c4
-rw-r--r--src/core/ignore.c265
-rw-r--r--src/core/ignore.h5
-rw-r--r--src/fe-common/core/fe-ignore-messages.c5
-rw-r--r--src/fe-common/core/fe-ignore.c85
-rw-r--r--src/fe-common/core/fe-messages.c2
-rw-r--r--src/irc/core/irc-nicklist.c2
-rw-r--r--src/perl/perl-common.c2
8 files changed, 206 insertions, 164 deletions
diff --git a/src/core/core.c b/src/core/core.c
index 55307e31..fd6c96b0 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -58,6 +58,7 @@ void core_init(void)
signals_init();
settings_init();
commands_init();
+ nickmatch_cache_init();
chat_protocols_init();
chatnets_init();
@@ -70,7 +71,6 @@ void core_init(void)
channels_init();
queries_init();
nicklist_init();
- nickmatch_cache_init();
chat_commands_init();
settings_check();
@@ -80,7 +80,6 @@ void core_deinit(void)
{
chat_commands_deinit();
- nickmatch_cache_deinit();
nicklist_deinit();
queries_deinit();
channels_deinit();
@@ -93,6 +92,7 @@ void core_deinit(void)
chatnets_deinit();
chat_protocols_deinit();
+ nickmatch_cache_deinit();
commands_deinit();
settings_deinit();
signals_deinit();
diff --git a/src/core/ignore.c b/src/core/ignore.c
index 5d94ad15..05c10e7d 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -29,14 +29,17 @@
#include "servers.h"
#include "channels.h"
#include "nicklist.h"
+#include "nickmatch-cache.h"
#include "ignore.h"
GSList *ignores;
+static NICKMATCH_REC *nickmatch;
+
/* check if `text' contains ignored nick at the start of the line. */
-static int ignore_check_replies(IGNORE_REC *rec, CHANNEL_REC *channel,
- const char *text)
+static int ignore_check_replies_rec(IGNORE_REC *rec, CHANNEL_REC *channel,
+ const char *text)
{
GSList *nicks, *tmp;
@@ -54,101 +57,159 @@ static int ignore_check_replies(IGNORE_REC *rec, CHANNEL_REC *channel,
return FALSE;
}
-int ignore_check(SERVER_REC *server, const char *nick, const char *host,
- const char *channel, const char *text, int level)
+static int ignore_check_replies(CHANNEL_REC *chanrec, const char *text)
{
- CHANNEL_REC *chanrec;
GSList *tmp;
- int ok, mask_len, patt_len;
- int best_mask, best_patt, best_ignore;
-
- g_return_val_if_fail(server != NULL, 0);
- chanrec = (channel != NULL && server != NULL &&
- server->ischannel(channel)) ?
- channel_find(server, channel) : NULL;
+ if (text == NULL || chanrec == NULL)
+ return FALSE;
- best_mask = 0; best_patt = 0; best_ignore = FALSE;
+ /* check reply ignores */
for (tmp = ignores; tmp != NULL; tmp = tmp->next) {
IGNORE_REC *rec = tmp->data;
- if ((level & (rec->level|rec->except_level)) == 0)
- continue;
+ if (rec->mask != NULL && rec->replies &&
+ ignore_check_replies_rec(rec, chanrec, text))
+ return TRUE;
+ }
- /* server */
- if (rec->servertag != NULL && g_strcasecmp(server->tag, rec->servertag) != 0)
- continue;
+ return FALSE;
+}
- /* channel list */
- if (rec->channels != NULL) {
- if (chanrec == NULL ||
- strarray_find(rec->channels, channel) == -1)
- continue;
- }
+static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
+{
+ if (rec->pattern == NULL)
+ return TRUE;
- /* nick mask */
- mask_len = 0;
- if (rec->mask != NULL) {
- if (nick == NULL)
- continue;
+ if (text == NULL)
+ return FALSE;
- mask_len = strlen(rec->mask);
- if (mask_len <= best_mask) continue;
-
- ok = ((host == NULL || *host == '\0')) ?
- match_wildcards(rec->mask, nick) :
- mask_match_address(server, rec->mask, nick, host);
- if (!ok) {
- /* nick didn't match, but maybe this is a reply to nick? */
- if (!rec->replies || chanrec == NULL || text == NULL ||
- !ignore_check_replies(rec, chanrec, text))
- continue;
- }
- }
+ if (rec->regexp) {
+#ifdef HAVE_REGEX_H
+ return rec->regexp_compiled &&
+ regexec(&rec->preg, text, 0, NULL, 0) == 0;
+#else
+ return FALSE;
+#endif
+ }
- /* pattern */
- patt_len = 0;
- if (rec->pattern != NULL) {
- if (text == NULL)
- continue;
+ return rec->fullword ?
+ stristr_full(text, rec->pattern) != NULL :
+ stristr(text, rec->pattern) != NULL;
+}
- if (!mask_len && !best_mask) {
- patt_len = strlen(rec->pattern);
- if (patt_len <= best_patt) continue;
- }
+#define ignore_match_level(rec, level) \
+ ((level & (rec)->level) != 0)
-#ifdef HAVE_REGEX_H
- if (rec->regexp) {
- ok = !rec->regexp_compiled ? FALSE :
- regexec(&rec->preg, text, 0, NULL, 0) == 0;
- } else
-#endif
- {
- ok = rec->fullword ?
- stristr_full(text, rec->pattern) != NULL :
- stristr(text, rec->pattern) != NULL;
+#define ignore_match_nickmask(rec, nickmask) \
+ ((rec)->mask == NULL || match_wildcards((rec)->mask, nickmask))
+
+#define ignore_match_server(rec, server) \
+ ((rec)->servertag == NULL || \
+ g_strcasecmp((server)->tag, (rec)->servertag) == 0)
+
+#define ignore_match_channel(rec, channel) \
+ ((rec)->channels == NULL || ((channel) != NULL && \
+ strarray_find((rec)->channels, (channel)) != -1))
+
+static int ignore_check_without_mask(GSList *list, CHANNEL_REC *channel,
+ int level, const char *text)
+{
+ GSList *tmp;
+ int len, best_mask, best_match, best_patt;
+
+ best_mask = best_patt = 0; best_match = FALSE;
+ for (tmp = list; tmp != NULL; tmp = tmp->next) {
+ IGNORE_REC *rec = tmp->data;
+
+ if (ignore_match_level(rec, level) &&
+ ignore_match_pattern(rec, text)) {
+ len = rec->mask == NULL ? 0 : strlen(rec->mask);
+ if (len > best_mask) {
+ best_mask = len;
+ best_match = !rec->exception;
+ } else if (len == best_mask && rec->pattern != NULL) {
+ len = strlen(rec->pattern);
+ if (len > best_patt) {
+ best_patt = len;
+ best_match = !rec->exception;
+ }
}
- if (!ok) continue;
}
+ }
- if (mask_len || best_mask)
- best_mask = mask_len;
- else if (patt_len)
- best_patt = patt_len;
+ if (best_match || (level & MSGLEVEL_PUBLIC) == 0)
+ return best_match;
- best_ignore = (rec->level & level) != 0;
+ return ignore_check_replies(channel, text);
+}
+
+int ignore_check(SERVER_REC *server, const char *nick, const char *host,
+ const char *channel, const char *text, int level)
+{
+ CHANNEL_REC *chanrec;
+ NICK_REC *nickrec;
+ IGNORE_REC *rec;
+ GSList *tmp, *list;
+ char *nickmask;
+ int len, best_mask, best_match, best_patt;
+
+ g_return_val_if_fail(server != NULL, 0);
+
+ chanrec = (channel != NULL && server != NULL &&
+ server->ischannel(channel)) ?
+ channel_find(server, channel) : NULL;
+ if (chanrec != NULL && nick != NULL &&
+ (nickrec = nicklist_find(chanrec, nick)) != NULL) {
+ /* nick found - check only ignores in nickmatch cache */
+ if (nickrec->host == NULL)
+ nicklist_set_host(chanrec, nickrec, host);
+
+ list = nickmatch_find(nickmatch, nickrec);
+ return ignore_check_without_mask(list, chanrec, level, text);
}
- return best_ignore;
+ nickmask = g_strconcat(nick, "!", host, NULL);
+
+ best_mask = best_patt = 0; best_match = FALSE;
+ for (tmp = ignores; tmp != NULL; tmp = tmp->next) {
+ rec = tmp->data;
+
+ if (ignore_match_level(rec, level) &&
+ ignore_match_server(rec, server) &&
+ ignore_match_channel(rec, channel) &&
+ ignore_match_nickmask(rec, nickmask) &&
+ ignore_match_pattern(rec, text)) {
+ len = rec->mask == NULL ? 0 : strlen(rec->mask);
+ if (len > best_mask) {
+ best_mask = len;
+ best_match = !rec->exception;
+ } else if (len == best_mask && rec->pattern != NULL) {
+ len = strlen(rec->pattern);
+ if (len > best_patt) {
+ best_patt = len;
+ best_match = !rec->exception;
+ }
+ }
+ }
+ }
+ g_free(nickmask);
+
+ if (best_match || (level & MSGLEVEL_PUBLIC) == 0)
+ return best_match;
+
+ return ignore_check_replies(chanrec, text);
}
-IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels)
+IGNORE_REC *ignore_find(const char *servertag, const char *mask,
+ char **channels)
{
GSList *tmp;
char **chan;
int ignore_servertag;
- if (mask != NULL && *mask == '\0') mask = NULL;
+ if (mask != NULL && (*mask == '\0' || strcmp(mask, "*") == 0))
+ mask = NULL;
ignore_servertag = servertag != NULL && strcmp(servertag, "*") == 0;
for (tmp = ignores; tmp != NULL; tmp = tmp->next) {
@@ -199,10 +260,7 @@ static void ignore_set_config(IGNORE_REC *rec)
CONFIG_NODE *node;
char *levelstr;
- if (rec->level == 0 && rec->except_level == 0)
- return;
-
- if (rec->time > 0)
+ if (rec->level == 0 || rec->time > 0)
return;
node = iconfig_node_traverse("(ignores", TRUE);
@@ -214,12 +272,8 @@ static void ignore_set_config(IGNORE_REC *rec)
iconfig_node_set_str(node, "level", levelstr);
g_free(levelstr);
}
- if (rec->except_level) {
- levelstr = bits2level(rec->except_level);
- iconfig_node_set_str(node, "except_level", levelstr);
- g_free(levelstr);
- }
iconfig_node_set_str(node, "pattern", rec->pattern);
+ if (rec->exception) iconfig_node_set_bool(node, "exception", TRUE);
if (rec->regexp) iconfig_node_set_bool(node, "regexp", TRUE);
if (rec->fullword) iconfig_node_set_bool(node, "fullword", TRUE);
if (rec->replies) iconfig_node_set_bool(node, "replies", TRUE);
@@ -285,11 +339,13 @@ static void ignore_destroy(IGNORE_REC *rec)
g_free_not_null(rec->servertag);
g_free_not_null(rec->pattern);
g_free(rec);
+
+ nickmatch_rebuild(nickmatch);
}
void ignore_update_rec(IGNORE_REC *rec)
{
- if (rec->level == 0 && rec->except_level == 0) {
+ if (rec->level == 0) {
/* unignored everything */
ignore_remove_config(rec);
ignore_destroy(rec);
@@ -302,6 +358,7 @@ void ignore_update_rec(IGNORE_REC *rec)
ignore_set_config(rec);
signal_emit("ignore changed", 1, rec);
+ nickmatch_rebuild(nickmatch);
}
}
@@ -315,7 +372,10 @@ static void read_ignores(void)
ignore_destroy(ignores->data);
node = iconfig_node_traverse("ignores", FALSE);
- if (node == NULL) return;
+ if (node == NULL) {
+ nickmatch_rebuild(nickmatch);
+ return;
+ }
for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
node = tmp->data;
@@ -327,9 +387,19 @@ static void read_ignores(void)
ignores = g_slist_append(ignores, rec);
rec->mask = g_strdup(config_node_get_str(node, "mask", NULL));
+ if (strcmp(rec->mask, "*") == 0) {
+ /* FIXME: remove after .98 */
+ g_free(rec->mask);
+ rec->mask = NULL;
+ }
rec->pattern = g_strdup(config_node_get_str(node, "pattern", NULL));
rec->level = level2bits(config_node_get_str(node, "level", ""));
- rec->except_level = level2bits(config_node_get_str(node, "except_level", ""));
+ rec->exception = config_node_get_bool(node, "exception", FALSE);
+ if (*config_node_get_str(node, "except_level", "") != '\0') {
+ /* FIXME: remove after .98 */
+ rec->level = level2bits(config_node_get_str(node, "except_level", ""));
+ rec->exception = TRUE;
+ }
rec->regexp = config_node_get_bool(node, "regexp", FALSE);
rec->fullword = config_node_get_bool(node, "fullword", FALSE);
rec->replies = config_node_get_bool(node, "replies", FALSE);
@@ -337,11 +407,41 @@ static void read_ignores(void)
node = config_node_section(node, "channels", -1);
if (node != NULL) rec->channels = config_node_get_list(node);
}
+
+ nickmatch_rebuild(nickmatch);
+}
+
+static void ignore_nick_cache(GHashTable *list, CHANNEL_REC *channel,
+ NICK_REC *nick)
+{
+ GSList *tmp, *matches;
+ char *nickmask;
+
+ if (nick->host == NULL)
+ return; /* don't check until host is known */
+
+ matches = NULL;
+ nickmask = g_strconcat(nick->nick, "!", nick->host, NULL);
+ for (tmp = ignores; tmp != NULL; tmp = tmp->next) {
+ IGNORE_REC *rec = tmp->data;
+
+ if (ignore_match_nickmask(rec, nickmask) &&
+ ignore_match_server(rec, channel->server) &&
+ ignore_match_channel(rec, channel->name))
+ matches = g_slist_append(matches, rec);
+ }
+ g_free_not_null(nickmask);
+
+ if (matches == NULL)
+ g_hash_table_remove(list, nick);
+ else
+ g_hash_table_insert(list, nick, matches);
}
void ignore_init(void)
{
ignores = NULL;
+ nickmatch = nickmatch_init(ignore_nick_cache);
read_ignores();
signal_add("setup reread", (SIGNAL_FUNC) read_ignores);
@@ -351,6 +451,7 @@ void ignore_deinit(void)
{
while (ignores != NULL)
ignore_destroy(ignores->data);
+ nickmatch_deinit(nickmatch);
signal_remove("setup reread", (SIGNAL_FUNC) read_ignores);
}
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 21433a06..f4aea3aa 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -6,17 +6,16 @@
#endif
typedef struct {
+ int level; /* ignore these levels */
char *mask; /* nick mask */
char *servertag; /* this is for autoignoring */
char **channels; /* ignore only in these channels */
char *pattern; /* text body must match this pattern */
- int level; /* ignore these levels */
- int except_level; /* don't ignore these levels */
-
int time; /* time in sec for temp ignores */
int time_tag;
+ unsigned int exception:1; /* *don't* ignore */
unsigned int regexp:1;
unsigned int fullword:1;
unsigned int replies:1; /* ignore replies to nick in channel */
diff --git a/src/fe-common/core/fe-ignore-messages.c b/src/fe-common/core/fe-ignore-messages.c
index 433c26e5..770f4a4e 100644
--- a/src/fe-common/core/fe-ignore-messages.c
+++ b/src/fe-common/core/fe-ignore-messages.c
@@ -72,7 +72,10 @@ static void sig_message_kick(SERVER_REC *server, const char *channel,
static void sig_message_nick(SERVER_REC *server, const char *newnick,
const char *oldnick, const char *address)
{
- if (ignore_check(server, oldnick, address, NULL, NULL, MSGLEVEL_NICKS))
+ if (ignore_check(server, oldnick, address,
+ NULL, NULL, MSGLEVEL_NICKS) ||
+ ignore_check(server, newnick, address,
+ NULL, NULL, MSGLEVEL_NICKS))
signal_stop();
}
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index e7e970c4..fdbc60d5 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -36,83 +36,27 @@ static char *ignore_get_key(IGNORE_REC *rec)
char *chans, *ret;
if (rec->channels == NULL)
- return rec->mask != NULL ? g_strdup(rec->mask) : NULL;
+ return g_strdup(rec->mask == NULL ? "*" : rec->mask);
chans = g_strjoinv(",", rec->channels);
if (rec->mask == NULL) return chans;
- ret = g_strdup_printf("%s %s", rec->mask, chans);
+ ret = g_strdup_printf("%s %s", rec->mask == NULL ?
+ "*" : rec->mask, chans);
g_free(chans);
return ret;
}
-static char *ignore_get_levels(int level, int xlevel)
-{
- GString *str;
- char *levelstr, *p, *ret;
-
- str = g_string_new(NULL);
- if (level != 0) {
- levelstr = bits2level(level);
- g_string_append(str, levelstr);
- g_free(levelstr);
- }
-
- if (xlevel != 0) {
- if (str->len > 0) g_string_append_c(str, ' ');
-
- levelstr = bits2level(xlevel);
- for (p = levelstr; *p != '\0'; p++) {
- if (!isspace(*p) && (p == levelstr || isspace(p[-1])))
- g_string_append_c(str, '^');
- g_string_append_c(str, *p);
- }
- g_free(levelstr);
- }
-
- ret = str->str;
- g_string_free(str, FALSE);
- return ret;
-}
-
-/* msgs ^notices : level=msgs, xlevel=notices */
-static void ignore_split_levels(const char *levels, int *level, int *xlevel)
-{
- GString *slevel, *sxlevel;
- char **levellist, **tmp;
-
- if (*levels == '\0') return;
-
- slevel = g_string_new(NULL);
- sxlevel = g_string_new(NULL);
-
- levellist = g_strsplit(levels, " ", -1);
- for (tmp = levellist; *tmp != NULL; tmp++) {
- if (**tmp == '^')
- g_string_sprintfa(sxlevel, "%s ", (*tmp)+1);
- else if (**tmp == '-' && (*tmp)[1] == '^')
- g_string_sprintfa(sxlevel, "-%s ", (*tmp)+2);
- else
- g_string_sprintfa(slevel, "%s ", *tmp);
- }
- g_strfreev(levellist);
-
- *level = combine_level(*level, slevel->str);
- *xlevel = combine_level(*xlevel, sxlevel->str);
-
- g_string_free(slevel, TRUE);
- g_string_free(sxlevel, TRUE);
-}
-
static void ignore_print(int index, IGNORE_REC *rec)
{
GString *options;
char *key, *levels;
key = ignore_get_key(rec);
- levels = ignore_get_levels(rec->level, rec->except_level);
+ levels = bits2level(rec->level);
options = g_string_new(NULL);
+ if (rec->exception) g_string_sprintfa(options, "-except ");
if (rec->regexp) g_string_sprintfa(options, "-regexp ");
if (rec->fullword) g_string_sprintfa(options, "-word ");
if (rec->replies) g_string_sprintfa(options, "-replies ");
@@ -189,34 +133,30 @@ static void cmd_ignore(const char *data)
if (rec == NULL) {
rec = g_new0(IGNORE_REC, 1);
- rec->mask = (mask != NULL && *mask != '\0') ?
- g_strdup(mask) : NULL;
+ rec->mask = mask == NULL || *mask == '\0' ||
+ strcmp(mask, "*") == 0 ? NULL : g_strdup(mask);
rec->channels = channels;
} else {
g_free_and_null(rec->pattern);
g_strfreev(channels);
}
- if (g_hash_table_lookup(optlist, "except") != NULL) {
- rec->except_level = combine_level(rec->except_level, levels);
- } else {
- ignore_split_levels(levels, &rec->level, &rec->except_level);
- }
-
+ rec->level = combine_level(rec->level, levels);
rec->pattern = (patternarg == NULL || *patternarg == '\0') ?
NULL : g_strdup(patternarg);
+ rec->exception = g_hash_table_lookup(optlist, "except") != NULL;
rec->regexp = g_hash_table_lookup(optlist, "regexp") != NULL;
rec->fullword = g_hash_table_lookup(optlist, "word") != NULL;
rec->replies = g_hash_table_lookup(optlist, "replies") != NULL;
timestr = g_hash_table_lookup(optlist, "time");
rec->time = timestr == NULL ? 0 : atoi(timestr);
- if (rec->level == 0 && rec->except_level == 0) {
+ if (rec->level == 0) {
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_UNIGNORED,
- rec->mask == NULL ? "" : rec->mask);
+ rec->mask == NULL ? "*" : rec->mask);
} else {
key = ignore_get_key(rec);
- levels = ignore_get_levels(rec->level, rec->except_level);
+ levels = bits2level(rec->level);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_IGNORED, key, levels);
g_free(key);
g_free(levels);
@@ -242,7 +182,6 @@ static void fe_unignore(IGNORE_REC *rec)
g_free(key);
rec->level = 0;
- rec->except_level = 0;
ignore_update_rec(rec);
}
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 6fb6fc1d..93f471f5 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -401,7 +401,7 @@ static void print_nick_change(SERVER_REC *server, const char *newnick,
WINDOW_REC *window =
window_item_window((WI_ITEM_REC *) channel);
- if (nicklist_find(channel, oldnick) == NULL ||
+ if (nicklist_find(channel, newnick) == NULL ||
g_slist_find(windows, window) != NULL)
continue;
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 807934d2..57c4ccc8 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -333,7 +333,7 @@ static void sig_connected(IRC_SERVER_REC *server)
void irc_nicklist_init(void)
{
- signal_add("event nick", (SIGNAL_FUNC) event_nick);
+ signal_add_first("event nick", (SIGNAL_FUNC) event_nick);
signal_add_first("event 352", (SIGNAL_FUNC) event_who);
signal_add("silent event who", (SIGNAL_FUNC) event_who);
signal_add("silent event whois", (SIGNAL_FUNC) event_whois);
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 714bbce5..de5e2453 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -327,8 +327,8 @@ void perl_ignore_fill_hash(HV *hv, IGNORE_REC *ignore)
hv_store(hv, "pattern", 7, new_pv(ignore->pattern), 0);
hv_store(hv, "level", 5, newSViv(ignore->level), 0);
- hv_store(hv, "except_level", 12, newSViv(ignore->except_level), 0);
+ hv_store(hv, "exception", 6, newSViv(ignore->exception), 0);
hv_store(hv, "regexp", 6, newSViv(ignore->regexp), 0);
hv_store(hv, "fullword", 8, newSViv(ignore->fullword), 0);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:41:06 +0000