From 4f2be94115fda42a31407e4f5ed12faecdafcbb1 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 3 Mar 2001 20:48:23 +0000 Subject: [PATCH] /BANTYPE -> /SET ban_type. /BAN: -type option added to override default ban type. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1318 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- docs/help/in/ban.in | 18 +++- docs/help/in/bantype.in | 16 ---- docs/help/in/knockout.in | 2 +- src/fe-common/irc/fe-events.c | 46 +++++----- src/irc/core/bans.c | 161 ++++++++++++++++++++-------------- src/irc/core/bans.h | 8 +- src/irc/core/irc-commands.c | 2 +- src/irc/core/irc-masks.c | 12 +-- src/perl/irc/Modes.xs | 3 +- 9 files changed, 147 insertions(+), 121 deletions(-) delete mode 100644 docs/help/in/bantype.in diff --git a/docs/help/in/ban.in b/docs/help/in/ban.in index babd961c..4f8a541d 100644 --- a/docs/help/in/ban.in +++ b/docs/help/in/ban.in @@ -2,13 +2,23 @@ @SYNTAX:ban@ Bans the specified nick or userhost mask. -If nick is given as parameter, the current -BANTYPE affects the ban mask. -Example: +If nick is given as parameter, the ban type is used to generate the ban +mask. /SET ban_type specified the default ban type. Ban type is one of +the following: + + Normal - *!user@*.domain.net + Host - *!*@host.domain.net + Domain - *!*@*.domain.net + Custom [nick] [user] [host] [domain] + +Examples: /BAN looser - This bans the nick 'looser' /BAN *!*@*.org - This bans all the users coming from any .org domain. -See also: BANTYPE, KNOCKOUT + /SET ban_type custom nick domain - nick!*@*.domain.net + /SET ban_type custom user host - *!user@host.domain.net + +See also: KNOCKOUT, KICKBAN diff --git a/docs/help/in/bantype.in b/docs/help/in/bantype.in deleted file mode 100644 index 7657d73d..00000000 --- a/docs/help/in/bantype.in +++ /dev/null @@ -1,16 +0,0 @@ - -@SYNTAX:bantype@ - -This command shows or views the current ban type. -The ban type is used by BAN and KNOCKOUT commands. - -Normal - *!user@*.domain.net -Host - *!*@host.domain.net -Domain - *!*@*.domain.net -Custom [nick] [user] [host] [domain] - -eg. /bantype custom nick domain - nick!*@*.domain.net -eg. /bantype custom user host - *!user@host.domain.net - -See also: BAN, KNOCKOUT - diff --git a/docs/help/in/knockout.in b/docs/help/in/knockout.in index 00034494..1d18b533 100644 --- a/docs/help/in/knockout.in +++ b/docs/help/in/knockout.in @@ -7,5 +7,5 @@ by default. Default alias for /KNOCKOUT is /KN. -See also: BANTYPE, BAN, KICK +See also: BAN, KICK diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c index 97b62491..bece78f8 100644 --- a/src/fe-common/irc/fe-events.c +++ b/src/fe-common/irc/fe-events.c @@ -35,6 +35,7 @@ #include "fe-queries.h" #include "irc-channels.h" #include "irc-nicklist.h" +#include "irc-masks.h" #include "fe-windows.h" #include "printtext.h" @@ -330,36 +331,41 @@ static void event_nickfind_whois(IRC_SERVER_REC *server, const char *data) g_free(params); } -static void event_ban_type_changed(const char *bantype) +static void event_ban_type_changed(void *ban_typep) { GString *str; + int ban_type; - g_return_if_fail(bantype != NULL); + ban_type = GPOINTER_TO_INT(ban_typep); - if (strcmp(bantype, "UD") == 0) - printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_BANTYPE, "Normal"); - else if (strcmp(bantype, "HD") == 0 || strcmp(bantype, "H") == 0) - printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_BANTYPE, "Host"); - else if (strcmp(bantype, "D") == 0) - printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_BANTYPE, "Domain"); - else { + if (ban_type == 0) { + printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, + IRCTXT_BANTYPE, "Error, using Normal"); + return; + } + + if (ban_type == (IRC_MASK_USER|IRC_MASK_DOMAIN)) { + printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, + IRCTXT_BANTYPE, "Normal"); + } else if (ban_type == (IRC_MASK_HOST|IRC_MASK_DOMAIN)) { + printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, + IRCTXT_BANTYPE, "Host"); + } else if (ban_type == IRC_MASK_DOMAIN) { + printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, + IRCTXT_BANTYPE, "Domain"); + } else { str = g_string_new("Custom:"); - if (*bantype == 'N') { + if (ban_type & IRC_MASK_NICK) g_string_append(str, " Nick"); - bantype++; - } - if (*bantype == 'U') { + if (ban_type & IRC_MASK_USER) g_string_append(str, " User"); - bantype++; - } - if (*bantype == 'H') { + if (ban_type & IRC_MASK_HOST) g_string_append(str, " Host"); - bantype++; - } - if (*bantype == 'D') + if (ban_type & IRC_MASK_DOMAIN) g_string_append(str, " Domain"); - printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_BANTYPE, str->str); + printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, + IRCTXT_BANTYPE, str->str); g_string_free(str, TRUE); } } diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c index 5cd6a6e1..0932f640 100644 --- a/src/irc/core/bans.c +++ b/src/irc/core/bans.c @@ -22,6 +22,7 @@ #include "signals.h" #include "commands.h" #include "misc.h" +#include "settings.h" #include "irc-masks.h" #include "modes.h" @@ -29,9 +30,10 @@ #include "irc.h" #include "nicklist.h" -static int bantype; +static char *default_ban_type_str; +static int default_ban_type; -char *ban_get_mask(IRC_CHANNEL_REC *channel, const char *nick) +char *ban_get_mask(IRC_CHANNEL_REC *channel, const char *nick, int ban_type) { NICK_REC *rec; char *str, *user, *host; @@ -42,7 +44,10 @@ char *ban_get_mask(IRC_CHANNEL_REC *channel, const char *nick) rec = nicklist_find(CHANNEL(channel), nick); if (rec == NULL || rec->host == NULL) return NULL; - str = irc_get_mask(nick, rec->host, bantype); + if (ban_type <= 0) + ban_type = default_ban_type; + + str = irc_get_mask(nick, rec->host, ban_type); /* there's a limit of 10 characters in user mask. so, banning someone with user mask of 10 characters gives us "*1234567890", @@ -61,7 +66,7 @@ char *ban_get_mask(IRC_CHANNEL_REC *channel, const char *nick) return str; } -char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks) +char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks, int ban_type) { GString *str; char **ban, **banlist, *realban, *ret; @@ -76,7 +81,7 @@ char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks) } /* ban nick */ - realban = ban_get_mask(channel, *ban); + realban = ban_get_mask(channel, *ban, ban_type); if (realban != NULL) { g_string_sprintfa(str, "%s ", realban); g_free(realban); @@ -92,59 +97,16 @@ char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks) return ret; } -void ban_set_type(const char *type) -{ - char bantypestr[5], **list; - int n, max; - - g_return_if_fail(type != NULL); - - if (toupper(type[0]) == 'N') { - bantype = IRC_MASK_USER | IRC_MASK_DOMAIN; - strcpy(bantypestr, "UD"); - } - else if (toupper(type[0]) == 'H') { - bantype = IRC_MASK_HOST | IRC_MASK_DOMAIN; - strcpy(bantypestr, "HD"); - } - else if (toupper(type[0]) == 'D') { - bantype = IRC_MASK_DOMAIN; - strcpy(bantypestr, "D"); - } - else if (toupper(type[0]) == 'C') { - list = g_strsplit(type, " ", -1); - - max = strarray_length(list); - bantype = 0; - for (n = 1; n < max; n++) { - if (toupper(list[n][0]) == 'N') - bantype |= IRC_MASK_NICK; - else if (toupper(list[n][0]) == 'U') - bantype |= IRC_MASK_USER; - else if (toupper(list[n][0]) == 'H') - bantype |= IRC_MASK_HOST; - else if (toupper(list[n][0]) == 'D') - bantype |= IRC_MASK_DOMAIN; - } - g_strfreev(list); - - bantypestr[0] = '\0'; - if (bantype & IRC_MASK_NICK) strcat(bantypestr, "N"); - if (bantype & IRC_MASK_USER) strcat(bantypestr, "U"); - if (bantype & IRC_MASK_HOST) strcat(bantypestr, "H"); - if (bantype & IRC_MASK_DOMAIN) strcat(bantypestr, "D"); - } - - signal_emit("ban type changed", 1, bantypestr); -} - -void ban_set(IRC_CHANNEL_REC *channel, const char *bans) +void ban_set(IRC_CHANNEL_REC *channel, const char *bans, int ban_type) { char *masks; g_return_if_fail(bans != NULL); - masks = ban_get_masks(channel, bans); + if (ban_type <= 0) + ban_type = default_ban_type; + + masks = ban_get_masks(channel, bans, ban_type); channel_set_singlemode(channel->server, channel->name, masks, "+b"); g_free(masks); @@ -177,7 +139,7 @@ void ban_remove(IRC_CHANNEL_REC *channel, const char *bans) } static void command_set_ban(const char *data, IRC_SERVER_REC *server, - WI_ITEM_REC *item, int set) + WI_ITEM_REC *item, int set, int ban_type) { IRC_CHANNEL_REC *chanrec; char *channel, *nicks; @@ -204,7 +166,7 @@ static void command_set_ban(const char *data, IRC_SERVER_REC *server, cmd_param_error(CMDERR_CHAN_NOT_SYNCED); if (set) - ban_set(chanrec, nicks); + ban_set(chanrec, nicks, ban_type); else { if (is_numeric(nicks, '\0')) { /* unban with ban number */ @@ -220,37 +182,104 @@ static void command_set_ban(const char *data, IRC_SERVER_REC *server, cmd_params_free(free_arg); } -/* SYNTAX: BANTYPE normal|host|domain|custom - BANTYPE custom [nick] [user] [host] [domain] */ -static void cmd_bantype(const char *data) +static int ban_parse_type(const char *type) { - ban_set_type(data); + char **list; + int n, ban_type; + + g_return_val_if_fail(type != NULL, 0); + + ban_type = 0; + if (toupper(type[0]) == 'N') + ban_type = IRC_MASK_USER | IRC_MASK_DOMAIN; + else if (toupper(type[0]) == 'H') + ban_type = IRC_MASK_HOST | IRC_MASK_DOMAIN; + else if (toupper(type[0]) == 'D') + ban_type = IRC_MASK_DOMAIN; + else if (toupper(type[0]) == 'C') { + list = g_strsplit(type, " ", -1); + for (n = 1; list[n] != NULL; n++) { + if (toupper(list[n][0]) == 'N') + ban_type |= IRC_MASK_NICK; + else if (toupper(list[n][0]) == 'U') + ban_type |= IRC_MASK_USER; + else if (toupper(list[n][0]) == 'H') + ban_type |= IRC_MASK_HOST | IRC_MASK_DOMAIN; + else if (toupper(list[n][0]) == 'D') + ban_type |= IRC_MASK_DOMAIN; + } + g_strfreev(list); + } + + return ban_type; } -/* SYNTAX: BAN */ +/* SYNTAX: BAN [-type ] */ static void cmd_ban(const char *data, IRC_SERVER_REC *server, void *item) { - command_set_ban(data, server, item, TRUE); + GHashTable *optlist; + char *ban, *ban_type_str; + int ban_type; + void *free_arg; + + if (!cmd_get_params(data, &free_arg, 1 | + PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST, + "ban", &optlist, &ban)) + return; + + ban_type_str = g_hash_table_lookup(optlist, "type"); + ban_type = ban_type_str == NULL ? default_ban_type : + ban_parse_type(ban_type_str); + + command_set_ban(ban, server, item, TRUE, ban_type); + + cmd_params_free(free_arg); } /* SYNTAX: UNBAN */ static void cmd_unban(const char *data, IRC_SERVER_REC *server, void *item) { - command_set_ban(data, server, item, FALSE); + command_set_ban(data, server, item, FALSE, 0); +} + +static void read_settings(void) +{ + if (default_ban_type_str != NULL && + strcmp(default_ban_type_str, settings_get_str("ban_type")) == 0) + return; + + g_free_not_null(default_ban_type_str); + default_ban_type = ban_parse_type(settings_get_str("ban_type")); + if (default_ban_type <= 0 || default_ban_type_str != NULL) { + signal_emit("ban type changed", 1, + GINT_TO_POINTER(default_ban_type)); + } + + if (default_ban_type <= 0) + default_ban_type = IRC_MASK_USER|IRC_MASK_DOMAIN; + + default_ban_type_str = g_strdup(settings_get_str("ban_type")); } void bans_init(void) { - /* default bantype */ - bantype = IRC_MASK_USER | IRC_MASK_DOMAIN; - command_bind("bantype", NULL, (SIGNAL_FUNC) cmd_bantype); + default_ban_type_str = NULL; + settings_add_str("misc", "ban_type", "normal"); + command_bind("ban", NULL, (SIGNAL_FUNC) cmd_ban); command_bind("unban", NULL, (SIGNAL_FUNC) cmd_unban); + command_set_options("ban", "+type"); + + read_settings(); + signal_add("setup changed", (SIGNAL_FUNC) read_settings); } void bans_deinit(void) { - command_unbind("bantype", (SIGNAL_FUNC) cmd_bantype); + g_free_not_null(default_ban_type_str); + command_unbind("ban", (SIGNAL_FUNC) cmd_ban); command_unbind("unban", (SIGNAL_FUNC) cmd_unban); + + signal_remove("setup changed", (SIGNAL_FUNC) read_settings); } diff --git a/src/irc/core/bans.h b/src/irc/core/bans.h index 271dbb05..6f106f55 100644 --- a/src/irc/core/bans.h +++ b/src/irc/core/bans.h @@ -6,11 +6,11 @@ void bans_init(void); void bans_deinit(void); -char *ban_get_mask(IRC_CHANNEL_REC *channel, const char *nick); -char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks); +/* if ban_type is <= 0, use the default */ +char *ban_get_mask(IRC_CHANNEL_REC *channel, const char *nick, int ban_type); +char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks, int ban_type); -void ban_set_type(const char *type); -void ban_set(IRC_CHANNEL_REC *channel, const char *bans); +void ban_set(IRC_CHANNEL_REC *channel, const char *bans, int ban_type); void ban_remove(IRC_CHANNEL_REC *channel, const char *bans); #endif diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c index b8a3c854..a4f63e46 100644 --- a/src/irc/core/irc-commands.c +++ b/src/irc/core/irc-commands.c @@ -789,7 +789,7 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server, spacenicks = g_strjoinv(" ", nicklist); g_strfreev(nicklist); - banmasks = ban_get_masks(channel, spacenicks); + banmasks = ban_get_masks(channel, spacenicks, 0); g_free(spacenicks); if (*banmasks != '\0') { diff --git a/src/irc/core/irc-masks.c b/src/irc/core/irc-masks.c index 1c895998..f07ae60d 100644 --- a/src/irc/core/irc-masks.c +++ b/src/irc/core/irc-masks.c @@ -73,18 +73,14 @@ char *irc_get_mask(const char *nick, const char *address, int flags) } *host++ = '\0'; - switch (flags & (IRC_MASK_HOST|IRC_MASK_DOMAIN)) { - case IRC_MASK_HOST: - /* we already have the host */ - break; - case IRC_MASK_DOMAIN: + if (flags & IRC_MASK_HOST) { + /* we already have the host */ + } else if (flags & IRC_MASK_DOMAIN) { /* domain - *.blah.org */ host = get_domain_mask(host); - break; - default: + } else { /* no domain/host */ host = "*"; - break; } ret = g_strdup_printf("%s!%s@%s", diff --git a/src/perl/irc/Modes.xs b/src/perl/irc/Modes.xs index 671d6f09..f3c2991f 100644 --- a/src/perl/irc/Modes.xs +++ b/src/perl/irc/Modes.xs @@ -11,9 +11,10 @@ MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Channel PREFIX = channel_ #******************************* char * -ban_get_mask(channel, nick) +ban_get_mask(channel, nick, ban_type) Irssi::Irc::Channel channel char *nick + int ban_type Irssi::Irc::Ban banlist_add(channel, ban, nick, time)