#define FILTER_EXIT_MSG "Connection closed"
+static const char filter_desc[] = "Filter messages using a precompiled Hyperscan database";
+
static void filter_msg_user(void *data);
static void filter_msg_channel(void *data);
static void on_client_exit(void *data);
static const char *cmdname[MESSAGE_TYPE_COUNT] = {
[MESSAGE_TYPE_PRIVMSG] = "PRIVMSG",
[MESSAGE_TYPE_NOTICE] = "NOTICE",
+ [MESSAGE_TYPE_PART] = "PART",
};
enum filter_state {
{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_setfilter, 2}, {mo_setfilter, 2}}
};
-static void
+static int
modinit(void)
{
filter_umode = user_modes['u'] = find_umode_slot();
construct_umodebuf();
filter_chmode = cflag_add('u', chm_simple);
+ return 0;
}
static void
mapi_clist_av1 filter_clist[] = { &setfilter_msgtab, NULL };
-DECLARE_MODULE_AV1(filter, modinit, moddeinit, filter_clist, NULL, filter_hfnlist, "0.3");
+DECLARE_MODULE_AV2(filter, modinit, moddeinit, filter_clist, NULL, filter_hfnlist, NULL, "0.4", filter_desc);
static int
setfilter(const char *check, const char *data, const char **error)
return 0;
}
+ if (!strcasecmp(data, "drop")) {
+ if (!filter_db) {
+ if (error) *error = "no database to drop";
+ return -1;
+ }
+ hs_free_database(filter_db);
+ filter_db = 0;
+ return 0;
+ }
+
+ if (!strcasecmp(data, "abort")) {
+ if (state != FILTER_FILLING) {
+ if (error) *error = "not filling";
+ return -1;
+ }
+ state = filter_db ? FILTER_LOADED : FILTER_EMPTY;
+ rb_free(filter_data);
+ filter_data = 0;
+ filter_data_len = 0;
+ return 0;
+ }
+
if (strcmp(check, check_str) != 0) {
if (error) *error = "check strings don't match";
return -1;
r = hs_alloc_scratch(db, &filter_scratch);
if (r != HS_SUCCESS) {
if (error) *error = "couldn't allocate scratch";
+ hs_free_database(db);
return -1;
}
if (filter_db) {
return 0;
}
+ if (*data != '+') {
+ if (error) *error = "unknown command or data doesn't start with +";
+ return -1;
+ }
+
+ data += 1;
+
if (state == FILTER_FILLING) {
int dl;
- unsigned char *d = rb_base64_decode(data, strlen(data), &dl);
+ unsigned char *d = rb_base64_decode((unsigned char *)data, strlen(data), &dl);
if (!d) {
if (error) *error = "invalid data";
return -1;
return 0;
if (!filter_db)
return 0;
+ if (!command)
+ return 0;
snprintf(check_buffer, sizeof check_buffer, "%s:%s!%s@%s#%c %s %s :%s",
prefix,
#if FILTER_NICK
"*",
#endif
source->user && source->user->suser[0] != '\0' ? '1' : '0',
- command, target,
- msg);
+ command, target, msg);
hs_error_t r = hs_scan(filter_db, check_buffer, strlen(check_buffer), 0, filter_scratch, match_callback, &state);
if (r != HS_SUCCESS && r != HS_SCAN_TERMINATED)
return 0;
state = filter_db ? FILTER_LOADED : FILTER_EMPTY;
}
}
-