diff options
| -rw-r--r-- | Makefile | 32 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | general_network.c | 62 | ||||
| -rw-r--r-- | general_network.h | 6 | ||||
| -rw-r--r-- | pseudoclients.c (renamed from psuedoclients.c) | 18 | ||||
| -rw-r--r-- | pseudoclients.h (renamed from psuedoclients.h) | 14 | ||||
| -rw-r--r-- | pseudoclients/haxserv.c (renamed from psuedoclients/haxserv.c) | 220 | ||||
| -rw-r--r-- | pseudoclients/haxserv.h (renamed from psuedoclients/haxserv.h) | 40 | ||||
| -rw-r--r-- | real_main.c | 12 |
9 files changed, 203 insertions, 203 deletions
@@ -43,7 +43,7 @@ LDFLAGS = -lpthread printf '%s\n' 'LAST_OPENSSL_SERVER = $(OPENSSL_SERVER)' >> .makeopts printf '%s\n' 'LAST_INSPIRCD2_PROTOCOL = $(INSPIRCD2_PROTOCOL)' >> .makeopts printf '%s\n' 'LAST_INSPIRCD3_PROTOCOL = $(INSPIRCD3_PROTOCOL)' >> .makeopts - printf '%s\n' 'LAST_HAXSERV_PSUEDOCLIENT = $(HAXSERV_PSUEDOCLIENT)' >> .makeopts + printf '%s\n' 'LAST_HAXSERV_PSEUDOCLIENT = $(HAXSERV_PSEUDOCLIENT)' >> .makeopts printf '%s\n' 'LAST_SAFE_STACK = $(SAFE_STACK)' >> .makeopts printf '%s\n' 'LAST_CFLAGS = $(ORIGINAL_CFLAGS)' >> .makeopts printf '%s\n' 'LAST_CC = $(CC)' >> .makeopts @@ -117,12 +117,12 @@ else INSPIRCD3_PROTOCOL = $(LAST_INSPIRCD3_PROTOCOL) endif -ifneq ($(HAXSERV_PSUEDOCLIENT),) -ifneq ($(HAXSERV_PSUEDOCLIENT),$(LAST_HAXSERV_PSUEDOCLIENT)) +ifneq ($(HAXSERV_PSEUDOCLIENT),) +ifneq ($(HAXSERV_PSEUDOCLIENT),$(LAST_HAXSERV_PSEUDOCLIENT)) rebuild = 1 endif else -HAXSERV_PSUEDOCLIENT = $(LAST_HAXSERV_PSUEDOCLIENT) +HAXSERV_PSEUDOCLIENT = $(LAST_HAXSERV_PSEUDOCLIENT) endif ifneq ($(SAFE_STACK),) @@ -214,10 +214,10 @@ endif -ifeq ($(HAXSERV_PSUEDOCLIENT),1) -SOFILES += psuedoclients/haxserv.so -CFLAGS += -DUSE_HAXSERV_PSUEDOCLIENT -USE_PSUEDOCLIENTS = 1 +ifeq ($(HAXSERV_PSEUDOCLIENT),1) +SOFILES += pseudoclients/haxserv.so +CFLAGS += -DUSE_HAXSERV_PSEUDOCLIENT +USE_PSEUDOCLIENTS = 1 endif @@ -263,9 +263,9 @@ endif -ifeq ($(USE_PSUEDOCLIENTS),1) -OFILES += psuedoclients.o -CFLAGS += -DUSE_PSUEDOCLIENTS +ifeq ($(USE_PSEUDOCLIENTS),1) +OFILES += pseudoclients.o +CFLAGS += -DUSE_PSEUDOCLIENTS endif @@ -340,13 +340,13 @@ ifeq ($(INSPIRCD3_PROTOCOL),1) $(call DEPS,protocols/inspircd3,o) endif -ifeq ($(USE_PSUEDOCLIENTS),1) -$(call DEPS,psuedoclients,o) +ifeq ($(USE_PSEUDOCLIENTS),1) +$(call DEPS,pseudoclients,o) endif -ifeq ($(HAXSERV_PSUEDOCLIENT),1) -$(call DEPS,psuedoclients/haxserv,so) +ifeq ($(HAXSERV_PSEUDOCLIENT),1) +$(call DEPS,pseudoclients/haxserv,so) endif clean: - $(RM) HaxIRCd *.o *.so protocols/*.o protocols/*.so psuedoclients/*.o psuedoclients/*.so + $(RM) HaxIRCd *.o *.so protocols/*.o protocols/*.so pseudoclients/*.o pseudoclients/*.so @@ -82,7 +82,7 @@ extern size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS]; // = {16, ...}; extern char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS]; // = {1, ...}; #endif -#ifdef USE_HAXSERV_PSUEDOCLIENT +#ifdef USE_HAXSERV_PSEUDOCLIENT extern struct string HAXSERV_UID; // = STRING("200000000"); extern struct string HAXSERV_NICK; // = STRING("HaxServ"); extern struct string HAXSERV_FULLNAME; // = STRING("Hax Services"); diff --git a/general_network.c b/general_network.c index 34f65ec..34eb4f2 100644 --- a/general_network.c +++ b/general_network.c @@ -54,8 +54,8 @@ #include "protocols.h" #endif -#ifdef USE_PSUEDOCLIENTS -#include "psuedoclients.h" +#ifdef USE_PSEUDOCLIENTS +#include "pseudoclients.h" #endif char casemap[UCHAR_MAX+1] = { @@ -231,7 +231,7 @@ int init_general_network(void) { return 1; } -int add_user(struct string from, struct string attached_to, struct string uid, struct string nick, struct string fullname, struct string ident, struct string vhost, struct string host, struct string address, size_t user_ts, size_t nick_ts, void *handle, size_t protocol, size_t net, char is_psuedoclient, size_t psuedoclient) { +int add_user(struct string from, struct string attached_to, struct string uid, struct string nick, struct string fullname, struct string ident, struct string vhost, struct string host, struct string address, size_t user_ts, size_t nick_ts, void *handle, size_t protocol, size_t net, char is_pseudoclient, size_t pseudoclient) { struct server_info *attached = get_table_index(server_list, attached_to); if (!attached) return 1; @@ -251,8 +251,8 @@ int add_user(struct string from, struct string attached_to, struct string uid, s new_info->net = net; new_info->handle = handle; - new_info->is_psuedoclient = is_psuedoclient; - new_info->psuedoclient = psuedoclient; + new_info->is_pseudoclient = is_pseudoclient; + new_info->pseudoclient = pseudoclient; new_info->server = attached->sid; @@ -398,12 +398,12 @@ void remove_user(struct string from, struct user_info *user, struct string reaso } int kill_user(struct string from, struct string source, struct user_info *user, struct string reason) { -#ifdef USE_PSUEDOCLIENTS - if (user->is_psuedoclient) { - switch (user->psuedoclient) { -#ifdef USE_HAXSERV_PSUEDOCLIENT - case HAXSERV_PSUEDOCLIENT: - if (!psuedoclients[HAXSERV_PSUEDOCLIENT].allow_kill(from, source, user, reason)) +#ifdef USE_PSEUDOCLIENTS + if (user->is_pseudoclient) { + switch (user->pseudoclient) { +#ifdef USE_HAXSERV_PSEUDOCLIENT + case HAXSERV_PSEUDOCLIENT: + if (!pseudoclients[HAXSERV_PSEUDOCLIENT].allow_kill(from, source, user, reason)) return 1; break; #endif @@ -590,12 +590,12 @@ void part_channel(struct string from, struct channel_info *channel, struct user_ } int kick_channel(struct string from, struct string source, struct channel_info *channel, struct user_info *user, struct string reason) { -#ifdef USE_PSUEDOCLIENTS - if (user->is_psuedoclient) { - switch (user->psuedoclient) { -#ifdef USE_HAXSERV_PSUEDOCLIENT - case HAXSERV_PSUEDOCLIENT: - if (!psuedoclients[HAXSERV_PSUEDOCLIENT].allow_kick(from, source, channel, user, reason)) +#ifdef USE_PSEUDOCLIENTS + if (user->is_pseudoclient) { + switch (user->pseudoclient) { +#ifdef USE_HAXSERV_PSEUDOCLIENT + case HAXSERV_PSEUDOCLIENT: + if (!pseudoclients[HAXSERV_PSEUDOCLIENT].allow_kick(from, source, channel, user, reason)) return 1; break; #endif @@ -647,14 +647,14 @@ int privmsg(struct string from, struct string sender, struct string target, stru protocols_propagate_privmsg(from, sender, target, msg); #endif -#ifdef USE_PSUEDOCLIENTS - if ((user && user->is_psuedoclient && user->psuedoclient == HAXSERV_PSUEDOCLIENT) || (!user && !server)) { +#ifdef USE_PSEUDOCLIENTS + if ((user && user->is_pseudoclient && user->pseudoclient == HAXSERV_PSEUDOCLIENT) || (!user && !server)) { char send; if (!user && !server) { send = 0; for (size_t i = 0; i < channel->user_list.len; i++) { struct user_info *user = channel->user_list.array[i].ptr; - if (user->is_psuedoclient && user->psuedoclient == HAXSERV_PSUEDOCLIENT && !STRING_EQ(sender, user->uid)) { + if (user->is_pseudoclient && user->pseudoclient == HAXSERV_PSEUDOCLIENT && !STRING_EQ(sender, user->uid)) { send = 1; break; } @@ -663,7 +663,7 @@ int privmsg(struct string from, struct string sender, struct string target, stru send = 1; } if (send) - psuedoclients[HAXSERV_PSUEDOCLIENT].handle_privmsg(from, sender, target, msg); + pseudoclients[HAXSERV_PSEUDOCLIENT].handle_privmsg(from, sender, target, msg); } #endif @@ -706,24 +706,24 @@ int notice(struct string from, struct string sender, struct string target, struc } int do_trivial_reloads(void) { -#ifdef USE_PSUEDOCLIENTS -#ifdef USE_HAXSERV_PSUEDOCLIENT - if (reload_psuedoclients[HAXSERV_PSUEDOCLIENT]) { - if (psuedoclients[HAXSERV_PSUEDOCLIENT].pre_reload() != 0) +#ifdef USE_PSEUDOCLIENTS +#ifdef USE_HAXSERV_PSEUDOCLIENT + if (reload_pseudoclients[HAXSERV_PSEUDOCLIENT]) { + if (pseudoclients[HAXSERV_PSEUDOCLIENT].pre_reload() != 0) return 1; - dlclose(psuedoclients[HAXSERV_PSUEDOCLIENT].dl_handle); - psuedoclients[HAXSERV_PSUEDOCLIENT].dl_handle = dlopen("psuedoclients/haxserv.so", RTLD_NOW | RTLD_LOCAL); - if (!psuedoclients[HAXSERV_PSUEDOCLIENT].dl_handle) { + dlclose(pseudoclients[HAXSERV_PSEUDOCLIENT].dl_handle); + pseudoclients[HAXSERV_PSEUDOCLIENT].dl_handle = dlopen("pseudoclients/haxserv.so", RTLD_NOW | RTLD_LOCAL); + if (!pseudoclients[HAXSERV_PSEUDOCLIENT].dl_handle) { puts(dlerror()); abort(); // TODO: Ugh... } - psuedoclients[HAXSERV_PSUEDOCLIENT].post_reload = dlsym(psuedoclients[HAXSERV_PSUEDOCLIENT].dl_handle, "haxserv_psuedoclient_post_reload"); - if (psuedoclients[HAXSERV_PSUEDOCLIENT].post_reload() != 0) { + pseudoclients[HAXSERV_PSEUDOCLIENT].post_reload = dlsym(pseudoclients[HAXSERV_PSEUDOCLIENT].dl_handle, "haxserv_pseudoclient_post_reload"); + if (pseudoclients[HAXSERV_PSEUDOCLIENT].post_reload() != 0) { abort(); // TODO: Ugh... } - reload_psuedoclients[HAXSERV_PSUEDOCLIENT] = 0; + reload_pseudoclients[HAXSERV_PSEUDOCLIENT] = 0; } #endif #endif diff --git a/general_network.h b/general_network.h index b8e235c..8bd88f7 100644 --- a/general_network.h +++ b/general_network.h @@ -107,8 +107,8 @@ struct user_info { char awaiting_pong; char latency_ready; - char is_psuedoclient; - size_t psuedoclient; + char is_pseudoclient; + size_t pseudoclient; }; struct channel_info { @@ -126,7 +126,7 @@ int resolve(struct string address, struct string port, struct sockaddr *sockaddr int init_general_network(void); -int add_user(struct string from, struct string attached_to, struct string uid, struct string nick, struct string fullname, struct string ident, struct string vhost, struct string host, struct string address, size_t user_ts, size_t nick_ts, void *handle, size_t protocol, size_t net, char is_psuedoclient, size_t psuedoclient); +int add_user(struct string from, struct string attached_to, struct string uid, struct string nick, struct string fullname, struct string ident, struct string vhost, struct string host, struct string address, size_t user_ts, size_t nick_ts, void *handle, size_t protocol, size_t net, char is_pseudoclient, size_t pseudoclient); int rename_user(struct string from, struct user_info *user, struct string nick, size_t timestamp); void remove_user(struct string from, struct user_info *user, struct string reason, char propagate); int kill_user(struct string from, struct string source, struct user_info *user, struct string reason); diff --git a/psuedoclients.c b/pseudoclients.c index b5d88a0..b65a96d 100644 --- a/psuedoclients.c +++ b/pseudoclients.c @@ -30,25 +30,25 @@ #include <stdio.h> #include "haxstring.h" -#include "psuedoclients.h" +#include "pseudoclients.h" -struct psuedoclient psuedoclients[NUM_PSUEDOCLIENTS] = {0}; +struct pseudoclient pseudoclients[NUM_PSEUDOCLIENTS] = {0}; -char reload_psuedoclients[NUM_PSUEDOCLIENTS] = {0}; +char reload_pseudoclients[NUM_PSEUDOCLIENTS] = {0}; -int init_psuedoclients(void) { -#ifdef USE_HAXSERV_PSUEDOCLIENT +int init_pseudoclients(void) { +#ifdef USE_HAXSERV_PSEUDOCLIENT { - void *dl_handle = dlopen("psuedoclients/haxserv.so", RTLD_NOW | RTLD_LOCAL); + void *dl_handle = dlopen("pseudoclients/haxserv.so", RTLD_NOW | RTLD_LOCAL); if (!dl_handle) { puts(dlerror()); return 1; } - psuedoclients[HAXSERV_PSUEDOCLIENT].dl_handle = dl_handle; - psuedoclients[HAXSERV_PSUEDOCLIENT].init = dlsym(dl_handle, "haxserv_psuedoclient_init"); + pseudoclients[HAXSERV_PSEUDOCLIENT].dl_handle = dl_handle; + pseudoclients[HAXSERV_PSEUDOCLIENT].init = dlsym(dl_handle, "haxserv_pseudoclient_init"); - if (psuedoclients[HAXSERV_PSUEDOCLIENT].init() != 0) + if (pseudoclients[HAXSERV_PSEUDOCLIENT].init() != 0) return 1; } #endif diff --git a/psuedoclients.h b/pseudoclients.h index db720e3..050c1a0 100644 --- a/psuedoclients.h +++ b/pseudoclients.h @@ -29,7 +29,7 @@ #include "haxstring.h" #include "general_network.h" -struct psuedoclient { +struct pseudoclient { void *dl_handle; int (*init)(void); @@ -43,14 +43,14 @@ struct psuedoclient { void (*handle_privmsg)(struct string from, struct string source, struct string target, struct string msg); }; -int init_psuedoclients(void); +int init_pseudoclients(void); -#ifdef USE_HAXSERV_PSUEDOCLIENT -#define HAXSERV_PSUEDOCLIENT 0 +#ifdef USE_HAXSERV_PSEUDOCLIENT +#define HAXSERV_PSEUDOCLIENT 0 #endif -#define NUM_PSUEDOCLIENTS 1 +#define NUM_PSEUDOCLIENTS 1 -extern struct psuedoclient psuedoclients[NUM_PSUEDOCLIENTS]; +extern struct pseudoclient pseudoclients[NUM_PSEUDOCLIENTS]; -extern char reload_psuedoclients[NUM_PSUEDOCLIENTS]; +extern char reload_pseudoclients[NUM_PSEUDOCLIENTS]; diff --git a/psuedoclients/haxserv.c b/pseudoclients/haxserv.c index eb04439..6c97067 100644 --- a/psuedoclients/haxserv.c +++ b/pseudoclients/haxserv.c @@ -35,7 +35,7 @@ #include "../haxstring.h" #include "../haxstring_utils.h" #include "../general_network.h" -#include "../psuedoclients.h" +#include "../pseudoclients.h" #include "haxserv.h" @@ -43,11 +43,11 @@ #include "../protocols.h" #endif -struct table haxserv_psuedoclient_commands = {0}; -struct table haxserv_psuedoclient_prefixes = {0}; +struct table haxserv_pseudoclient_commands = {0}; +struct table haxserv_pseudoclient_prefixes = {0}; // TODO: Potentially leaky on failure -int haxserv_psuedoclient_init(void) { +int haxserv_pseudoclient_init(void) { size_t now; { time_t tmp = time(0); @@ -59,7 +59,7 @@ int haxserv_psuedoclient_init(void) { now = (size_t)tmp; } - if (add_user(SID, SID, HAXSERV_UID, HAXSERV_NICK, HAXSERV_FULLNAME, HAXSERV_IDENT, HAXSERV_VHOST, HAXSERV_HOST, HAXSERV_ADDRESS, now, now, 0, 0, 0, 1, HAXSERV_PSUEDOCLIENT) != 0) + if (add_user(SID, SID, HAXSERV_UID, HAXSERV_NICK, HAXSERV_FULLNAME, HAXSERV_IDENT, HAXSERV_VHOST, HAXSERV_HOST, HAXSERV_ADDRESS, now, now, 0, 0, 0, 1, HAXSERV_PSEUDOCLIENT) != 0) return 1; struct user_info *user = get_table_index(user_list, HAXSERV_UID); @@ -68,86 +68,86 @@ int haxserv_psuedoclient_init(void) { return 1; } - return haxserv_psuedoclient_post_reload(); + return haxserv_pseudoclient_post_reload(); } -int haxserv_psuedoclient_post_reload(void) { - haxserv_psuedoclient_commands.array = malloc(0); - haxserv_psuedoclient_prefixes.array = malloc(0); +int haxserv_pseudoclient_post_reload(void) { + haxserv_pseudoclient_commands.array = malloc(0); + haxserv_pseudoclient_prefixes.array = malloc(0); - if (set_table_index(&haxserv_psuedoclient_commands, STRING("HELP"), &haxserv_psuedoclient_help_command_def) != 0) + if (set_table_index(&haxserv_pseudoclient_commands, STRING("HELP"), &haxserv_pseudoclient_help_command_def) != 0) return 1; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("SUS"), &haxserv_psuedoclient_sus_command_def) != 0) + if (set_table_index(&haxserv_pseudoclient_commands, STRING("SUS"), &haxserv_pseudoclient_sus_command_def) != 0) return 1; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("CR"), &haxserv_psuedoclient_cr_command_def) != 0) + if (set_table_index(&haxserv_pseudoclient_commands, STRING("CR"), &haxserv_pseudoclient_cr_command_def) != 0) return 1; - haxserv_psuedoclient_clear_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("CLEAR"), &haxserv_psuedoclient_clear_command_def) != 0) + haxserv_pseudoclient_clear_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING("CLEAR"), &haxserv_pseudoclient_clear_command_def) != 0) return 1; #ifdef USE_INSPIRCD2_PROTOCOL - haxserv_psuedoclient_raw_inspircd2_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING(":"), &haxserv_psuedoclient_raw_inspircd2_command_def) != 0) + haxserv_pseudoclient_raw_inspircd2_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING(":"), &haxserv_pseudoclient_raw_inspircd2_command_def) != 0) return 1; - if (set_table_index(&haxserv_psuedoclient_prefixes, STRING(":"), &haxserv_psuedoclient_raw_inspircd2_command_def) != 0) + if (set_table_index(&haxserv_pseudoclient_prefixes, STRING(":"), &haxserv_pseudoclient_raw_inspircd2_command_def) != 0) return 1; #endif - haxserv_psuedoclient_kill_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("KILL"), &haxserv_psuedoclient_kill_command_def) != 0) + haxserv_pseudoclient_kill_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING("KILL"), &haxserv_pseudoclient_kill_command_def) != 0) return 1; - haxserv_psuedoclient_spam_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("SPAM"), &haxserv_psuedoclient_spam_command_def) != 0) + haxserv_pseudoclient_spam_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING("SPAM"), &haxserv_pseudoclient_spam_command_def) != 0) return 1; - haxserv_psuedoclient_reload_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("RELOAD"), &haxserv_psuedoclient_reload_command_def) != 0) + haxserv_pseudoclient_reload_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING("RELOAD"), &haxserv_pseudoclient_reload_command_def) != 0) return 1; - haxserv_psuedoclient_allow_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("ALLOW"), &haxserv_psuedoclient_allow_command_def) != 0) + haxserv_pseudoclient_allow_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING("ALLOW"), &haxserv_pseudoclient_allow_command_def) != 0) return 1; - haxserv_psuedoclient_deny_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("DENY"), &haxserv_psuedoclient_deny_command_def) != 0) + haxserv_pseudoclient_deny_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING("DENY"), &haxserv_pseudoclient_deny_command_def) != 0) return 1; - haxserv_psuedoclient_reconnect_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("RECONNECT"), &haxserv_psuedoclient_reconnect_command_def) != 0) + haxserv_pseudoclient_reconnect_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING("RECONNECT"), &haxserv_pseudoclient_reconnect_command_def) != 0) return 1; -// haxserv_psuedoclient_sanick_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; -// if (set_table_index(&haxserv_psuedoclient_commands, STRING("SANICK"), &haxserv_psuedoclient_sanick_command_def) != 0) +// haxserv_pseudoclient_sanick_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; +// if (set_table_index(&haxserv_pseudoclient_commands, STRING("SANICK"), &haxserv_pseudoclient_sanick_command_def) != 0) // return 1; - haxserv_psuedoclient_get_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; - if (set_table_index(&haxserv_psuedoclient_commands, STRING("GET"), &haxserv_psuedoclient_get_command_def) != 0) + haxserv_pseudoclient_get_command_def.privs = HAXSERV_REQUIRED_OPER_TYPE; + if (set_table_index(&haxserv_pseudoclient_commands, STRING("GET"), &haxserv_pseudoclient_get_command_def) != 0) return 1; - psuedoclients[HAXSERV_PSUEDOCLIENT].init = haxserv_psuedoclient_init; + pseudoclients[HAXSERV_PSEUDOCLIENT].init = haxserv_pseudoclient_init; - psuedoclients[HAXSERV_PSUEDOCLIENT].post_reload = haxserv_psuedoclient_post_reload; - psuedoclients[HAXSERV_PSUEDOCLIENT].pre_reload = haxserv_psuedoclient_pre_reload; + pseudoclients[HAXSERV_PSEUDOCLIENT].post_reload = haxserv_pseudoclient_post_reload; + pseudoclients[HAXSERV_PSEUDOCLIENT].pre_reload = haxserv_pseudoclient_pre_reload; - psuedoclients[HAXSERV_PSUEDOCLIENT].allow_kill = haxserv_psuedoclient_allow_kill; - psuedoclients[HAXSERV_PSUEDOCLIENT].allow_kick = haxserv_psuedoclient_allow_kick; + pseudoclients[HAXSERV_PSEUDOCLIENT].allow_kill = haxserv_pseudoclient_allow_kill; + pseudoclients[HAXSERV_PSEUDOCLIENT].allow_kick = haxserv_pseudoclient_allow_kick; - psuedoclients[HAXSERV_PSUEDOCLIENT].handle_privmsg = haxserv_psuedoclient_handle_privmsg; + pseudoclients[HAXSERV_PSEUDOCLIENT].handle_privmsg = haxserv_pseudoclient_handle_privmsg; return 0; } -int haxserv_psuedoclient_pre_reload(void) { - clear_table(&haxserv_psuedoclient_commands); - clear_table(&haxserv_psuedoclient_prefixes); +int haxserv_pseudoclient_pre_reload(void) { + clear_table(&haxserv_pseudoclient_commands); + clear_table(&haxserv_pseudoclient_prefixes); - free(haxserv_psuedoclient_commands.array); - free(haxserv_psuedoclient_prefixes.array); + free(haxserv_pseudoclient_commands.array); + free(haxserv_pseudoclient_prefixes.array); return 0; } -int haxserv_psuedoclient_allow_kill(struct string from, struct string source, struct user_info *user, struct string reason) { +int haxserv_pseudoclient_allow_kill(struct string from, struct string source, struct user_info *user, struct string reason) { return 0; } -int haxserv_psuedoclient_allow_kick(struct string from, struct string source, struct channel_info *channel, struct user_info *user, struct string reason) { +int haxserv_pseudoclient_allow_kick(struct string from, struct string source, struct channel_info *channel, struct user_info *user, struct string reason) { return 0; } -void haxserv_psuedoclient_handle_privmsg(struct string from, struct string source, struct string target, struct string msg) { +void haxserv_pseudoclient_handle_privmsg(struct string from, struct string source, struct string target, struct string msg) { struct string respond_to; struct string prefix; @@ -211,11 +211,11 @@ void haxserv_psuedoclient_handle_privmsg(struct string from, struct string sourc for (size_t i = 0; i < case_str.len; i++) case_str.data[i] = CASEMAP(argv[0].data[i]); - cmd = get_table_index(haxserv_psuedoclient_commands, case_str); + cmd = get_table_index(haxserv_pseudoclient_commands, case_str); free(case_str.data); } else { - cmd = get_table_index(haxserv_psuedoclient_commands, argv[0]); + cmd = get_table_index(haxserv_pseudoclient_commands, argv[0]); } char trim; @@ -229,11 +229,11 @@ void haxserv_psuedoclient_handle_privmsg(struct string from, struct string sourc for (size_t i = 0; i < case_str.len; i++) case_str.data[i] = CASEMAP(msg.data[i]); - cmd = get_table_prefix(haxserv_psuedoclient_prefixes, case_str); + cmd = get_table_prefix(haxserv_pseudoclient_prefixes, case_str); free(case_str.data); } else { - cmd = get_table_prefix(haxserv_psuedoclient_prefixes, msg); + cmd = get_table_prefix(haxserv_pseudoclient_prefixes, msg); } } @@ -298,10 +298,10 @@ void haxserv_psuedoclient_handle_privmsg(struct string from, struct string sourc } } -int haxserv_psuedoclient_help_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_help_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { notice(SID, HAXSERV_UID, respond_to, STRING("Command list:")); - for (size_t i = 0; i < haxserv_psuedoclient_commands.len; i++) { - struct command_def *cmd = haxserv_psuedoclient_commands.array[i].ptr; + for (size_t i = 0; i < haxserv_pseudoclient_commands.len; i++) { + struct command_def *cmd = haxserv_pseudoclient_commands.array[i].ptr; struct string msg_parts[] = { STRING(" "), @@ -321,8 +321,8 @@ int haxserv_psuedoclient_help_command(struct string from, struct string sender, } notice(SID, HAXSERV_UID, respond_to, STRING("Prefix list:")); - for (size_t i = 0; i < haxserv_psuedoclient_prefixes.len; i++) { - struct command_def *cmd = haxserv_psuedoclient_prefixes.array[i].ptr; + for (size_t i = 0; i < haxserv_pseudoclient_prefixes.len; i++) { + struct command_def *cmd = haxserv_pseudoclient_prefixes.array[i].ptr; struct string msg_parts[] = { STRING(" "), @@ -343,8 +343,8 @@ int haxserv_psuedoclient_help_command(struct string from, struct string sender, return 0; } -struct command_def haxserv_psuedoclient_help_command_def = { - .func = haxserv_psuedoclient_help_command, +struct command_def haxserv_pseudoclient_help_command_def = { + .func = haxserv_pseudoclient_help_command, .summary = STRING("Shows a list of commands."), .aligned_name = STRING("help "), .name = STRING("help"), @@ -353,13 +353,13 @@ struct command_def haxserv_psuedoclient_help_command_def = { struct kill_or_msg { char type; struct string msg; -} haxserv_psuedoclient_sus_actions[] = { +} haxserv_pseudoclient_sus_actions[] = { {0, STRING("DuckServ is very sus.")}, {0, STRING("I was the impostor, but you only know because I killed you.")}, {0, STRING("\\x1b(0")}, {1, STRING("Ejected (1 Impostor remains)")}, {1, STRING("Ejected, and the crewmates have won.")}, -}, haxserv_psuedoclient_cr_actions[] = { +}, haxserv_pseudoclient_cr_actions[] = { {0, STRING("You are now a cruxian toxicpod, kill the sharded crewmates.")}, {0, STRING("You are now a cruxian omura, kill the sharded crewmates.")}, {0, STRING("You are now a cruxian oct, but you can out of reactors.")}, @@ -367,51 +367,51 @@ struct kill_or_msg { {0, STRING("You attempted to change into a cruxian navanax, but were caught in the act.")}, }; -int haxserv_psuedoclient_sus_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { - size_t index = (size_t)random() % (sizeof(haxserv_psuedoclient_sus_actions) / sizeof(*haxserv_psuedoclient_sus_actions)); +int haxserv_pseudoclient_sus_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { + size_t index = (size_t)random() % (sizeof(haxserv_pseudoclient_sus_actions) / sizeof(*haxserv_pseudoclient_sus_actions)); - if (haxserv_psuedoclient_sus_actions[index].type) { + if (haxserv_pseudoclient_sus_actions[index].type) { struct user_info *user = get_table_index(user_list, sender); if (!user) return 0; - kill_user(SID, HAXSERV_UID, user, haxserv_psuedoclient_sus_actions[index].msg); + kill_user(SID, HAXSERV_UID, user, haxserv_pseudoclient_sus_actions[index].msg); } else { - privmsg(SID, HAXSERV_UID, respond_to, haxserv_psuedoclient_sus_actions[index].msg); + privmsg(SID, HAXSERV_UID, respond_to, haxserv_pseudoclient_sus_actions[index].msg); } return 0; } -struct command_def haxserv_psuedoclient_sus_command_def = { - .func = haxserv_psuedoclient_sus_command, +struct command_def haxserv_pseudoclient_sus_command_def = { + .func = haxserv_pseudoclient_sus_command, .summary = STRING("You seem a bit sus today."), .aligned_name = STRING("sus "), .name = STRING("sus"), }; -int haxserv_psuedoclient_cr_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { - size_t index = (size_t)random() % (sizeof(haxserv_psuedoclient_cr_actions) / sizeof(*haxserv_psuedoclient_cr_actions)); +int haxserv_pseudoclient_cr_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { + size_t index = (size_t)random() % (sizeof(haxserv_pseudoclient_cr_actions) / sizeof(*haxserv_pseudoclient_cr_actions)); - if (haxserv_psuedoclient_cr_actions[index].type) { + if (haxserv_pseudoclient_cr_actions[index].type) { struct user_info *user = get_table_index(user_list, sender); if (!user) return 0; - kill_user(SID, HAXSERV_UID, user, haxserv_psuedoclient_cr_actions[index].msg); + kill_user(SID, HAXSERV_UID, user, haxserv_pseudoclient_cr_actions[index].msg); } else { - privmsg(SID, HAXSERV_UID, respond_to, haxserv_psuedoclient_cr_actions[index].msg); + privmsg(SID, HAXSERV_UID, respond_to, haxserv_pseudoclient_cr_actions[index].msg); } return 0; } -struct command_def haxserv_psuedoclient_cr_command_def = { - .func = haxserv_psuedoclient_cr_command, +struct command_def haxserv_pseudoclient_cr_command_def = { + .func = haxserv_pseudoclient_cr_command, .summary = STRING("Join the crux side."), .aligned_name = STRING("cr "), .name = STRING("cr"), }; -int haxserv_psuedoclient_clear_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_clear_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { if (argc < 1) { notice(SID, HAXSERV_UID, respond_to, STRING("Missing args!")); return 0; @@ -432,22 +432,22 @@ int haxserv_psuedoclient_clear_command(struct string from, struct string sender, return 0; } -struct command_def haxserv_psuedoclient_clear_command_def = { - .func = haxserv_psuedoclient_clear_command, +struct command_def haxserv_pseudoclient_clear_command_def = { + .func = haxserv_pseudoclient_clear_command, .summary = STRING("Clears a channel."), .aligned_name = STRING("clear "), .name = STRING("clear"), }; #ifdef USE_INSPIRCD2_PROTOCOL -int haxserv_psuedoclient_raw_inspircd2_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_raw_inspircd2_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { protocols[INSPIRCD2_PROTOCOL].propagate(SID, original_message); protocols[INSPIRCD2_PROTOCOL].propagate(SID, STRING("\n")); return 0; } -struct command_def haxserv_psuedoclient_raw_inspircd2_command_def = { - .func = haxserv_psuedoclient_raw_inspircd2_command, +struct command_def haxserv_pseudoclient_raw_inspircd2_command_def = { + .func = haxserv_pseudoclient_raw_inspircd2_command, .summary = STRING("Sends a raw message to all InspIRCd v2 links."), .aligned_name = STRING(": "), .name = STRING(":"), @@ -455,7 +455,7 @@ struct command_def haxserv_psuedoclient_raw_inspircd2_command_def = { #endif // TODO: Kill reason as an argument -int haxserv_psuedoclient_kill_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_kill_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { if (argc < 1) { notice(SID, HAXSERV_UID, respond_to, STRING("Insufficient parameters.")); return 0; @@ -477,14 +477,14 @@ int haxserv_psuedoclient_kill_command(struct string from, struct string sender, return 0; } -struct command_def haxserv_psuedoclient_kill_command_def = { - .func = haxserv_psuedoclient_kill_command, +struct command_def haxserv_pseudoclient_kill_command_def = { + .func = haxserv_pseudoclient_kill_command, .summary = STRING("Kills a user."), .aligned_name = STRING("kill "), .name = STRING("kill"), }; -int haxserv_psuedoclient_spam_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_spam_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { if (argc < 2) { notice(SID, HAXSERV_UID, respond_to, STRING("Insufficient parameters.")); return 0; @@ -510,11 +510,11 @@ int haxserv_psuedoclient_spam_command(struct string from, struct string sender, for (size_t i = 0; i < case_str.len; i++) case_str.data[i] = CASEMAP(argv[1].data[i]); - cmd = get_table_index(haxserv_psuedoclient_commands, case_str); + cmd = get_table_index(haxserv_pseudoclient_commands, case_str); free(case_str.data); } else { - cmd = get_table_index(haxserv_psuedoclient_commands, argv[1]); + cmd = get_table_index(haxserv_pseudoclient_commands, argv[1]); } if (cmd) { @@ -531,11 +531,11 @@ int haxserv_psuedoclient_spam_command(struct string from, struct string sender, for (size_t i = 0; i < case_str.len; i++) case_str.data[i] = CASEMAP(original_message.data[i]); - cmd = get_table_prefix(haxserv_psuedoclient_prefixes, case_str); + cmd = get_table_prefix(haxserv_pseudoclient_prefixes, case_str); free(case_str.data); } else { - cmd = get_table_prefix(haxserv_psuedoclient_prefixes, original_message); + cmd = get_table_prefix(haxserv_pseudoclient_prefixes, original_message); } } @@ -549,7 +549,7 @@ int haxserv_psuedoclient_spam_command(struct string from, struct string sender, } } - if (cmd->func == haxserv_psuedoclient_spam_command) { + if (cmd->func == haxserv_pseudoclient_spam_command) { notice(SID, HAXSERV_UID, respond_to, STRING("Spam recursion is not allowed. The limit is for your own sake, please do not violate it.")); return 0; } @@ -573,26 +573,26 @@ int haxserv_psuedoclient_spam_command(struct string from, struct string sender, return 0; } -struct command_def haxserv_psuedoclient_spam_command_def = { - .func = haxserv_psuedoclient_spam_command, +struct command_def haxserv_pseudoclient_spam_command_def = { + .func = haxserv_pseudoclient_spam_command, .summary = STRING("Repeats a command a specified amount of times."), .aligned_name = STRING("spam "), .name = STRING("spam"), }; -int haxserv_psuedoclient_reload_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { - reload_psuedoclients[HAXSERV_PSUEDOCLIENT] = 1; +int haxserv_pseudoclient_reload_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { + reload_pseudoclients[HAXSERV_PSEUDOCLIENT] = 1; return 0; } -struct command_def haxserv_psuedoclient_reload_command_def = { - .func = haxserv_psuedoclient_reload_command, +struct command_def haxserv_pseudoclient_reload_command_def = { + .func = haxserv_pseudoclient_reload_command, .summary = STRING("Reloads a module."), .aligned_name = STRING("reload "), .name = STRING("reload"), }; -int haxserv_psuedoclient_allow_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_allow_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { if (argc < 1) { notice(SID, HAXSERV_UID, respond_to, STRING("Insufficient parameters.")); return 0; @@ -616,14 +616,14 @@ int haxserv_psuedoclient_allow_command(struct string from, struct string sender, return 0; } -struct command_def haxserv_psuedoclient_allow_command_def = { - .func = haxserv_psuedoclient_allow_command, +struct command_def haxserv_pseudoclient_allow_command_def = { + .func = haxserv_pseudoclient_allow_command, .summary = STRING("Grants a user access to the extended command set."), .aligned_name = STRING("allow "), .name = STRING("allow"), }; -int haxserv_psuedoclient_deny_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_deny_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { if (argc < 1) { notice(SID, HAXSERV_UID, respond_to, STRING("Insufficient parameters.")); return 0; @@ -647,14 +647,14 @@ int haxserv_psuedoclient_deny_command(struct string from, struct string sender, return 0; } -struct command_def haxserv_psuedoclient_deny_command_def = { - .func = haxserv_psuedoclient_deny_command, +struct command_def haxserv_pseudoclient_deny_command_def = { + .func = haxserv_pseudoclient_deny_command, .summary = STRING("Denys a user access to the extended command set."), .aligned_name = STRING("deny "), .name = STRING("deny"), }; -int haxserv_psuedoclient_reconnect_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_reconnect_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { for (size_t i = 0; i < self->connected_to.len; i++) { struct server_info *adjacent = self->connected_to.array[i].ptr; networks[adjacent->net].shutdown(adjacent->handle); @@ -662,26 +662,26 @@ int haxserv_psuedoclient_reconnect_command(struct string from, struct string sen return 0; } -struct command_def haxserv_psuedoclient_reconnect_command_def = { - .func = haxserv_psuedoclient_reconnect_command, +struct command_def haxserv_pseudoclient_reconnect_command_def = { + .func = haxserv_pseudoclient_reconnect_command, .summary = STRING("Resets all connections."), .aligned_name = STRING("reconnect "), .name = STRING("reconnect"), }; -int haxserv_psuedoclient_sanick_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_sanick_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { // TODO: Implement this later return 0; } -struct command_def haxserv_psuedoclient_sanick_command_def = { - .func = haxserv_psuedoclient_sanick_command, +struct command_def haxserv_pseudoclient_sanick_command_def = { + .func = haxserv_pseudoclient_sanick_command, .summary = STRING("Changes a user's nick, without violating protocols."), .aligned_name = STRING("sanick "), .name = STRING("sanick"), }; -int haxserv_psuedoclient_get_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { +int haxserv_pseudoclient_get_command(struct string from, struct string sender, struct string original_message, struct string respond_to, size_t argc, struct string *argv) { if (argc < 1) { notice(SID, HAXSERV_UID, respond_to, STRING("Missing argument.")); return 0; @@ -906,8 +906,8 @@ int haxserv_psuedoclient_get_command(struct string from, struct string sender, s return 0; } -struct command_def haxserv_psuedoclient_get_command_def = { - .func = haxserv_psuedoclient_get_command, +struct command_def haxserv_pseudoclient_get_command_def = { + .func = haxserv_pseudoclient_get_command, .summary = STRING("Resets all connections."), .aligned_name = STRING("get "), .name = STRING("get"), diff --git a/psuedoclients/haxserv.h b/pseudoclients/haxserv.h index 0831018..89a955e 100644 --- a/psuedoclients/haxserv.h +++ b/pseudoclients/haxserv.h @@ -37,30 +37,30 @@ struct command_def { struct string name; }; -int haxserv_psuedoclient_init(void); +int haxserv_pseudoclient_init(void); -int haxserv_psuedoclient_post_reload(void); -int haxserv_psuedoclient_pre_reload(void); +int haxserv_pseudoclient_post_reload(void); +int haxserv_pseudoclient_pre_reload(void); -int haxserv_psuedoclient_allow_kill(struct string from, struct string source, struct user_info *user, struct string reason); -int haxserv_psuedoclient_allow_kick(struct string from, struct string source, struct channel_info *channel, struct user_info *user, struct string reason); +int haxserv_pseudoclient_allow_kill(struct string from, struct string source, struct user_info *user, struct string reason); +int haxserv_pseudoclient_allow_kick(struct string from, struct string source, struct channel_info *channel, struct user_info *user, struct string reason); -void haxserv_psuedoclient_handle_privmsg(struct string from, struct string source, struct string target, struct string msg); +void haxserv_pseudoclient_handle_privmsg(struct string from, struct string source, struct string target, struct string msg); -extern struct table haxserv_psuedoclient_commands; +extern struct table haxserv_pseudoclient_commands; -extern struct command_def haxserv_psuedoclient_help_command_def; -extern struct command_def haxserv_psuedoclient_sus_command_def; -extern struct command_def haxserv_psuedoclient_cr_command_def; -extern struct command_def haxserv_psuedoclient_clear_command_def; +extern struct command_def haxserv_pseudoclient_help_command_def; +extern struct command_def haxserv_pseudoclient_sus_command_def; +extern struct command_def haxserv_pseudoclient_cr_command_def; +extern struct command_def haxserv_pseudoclient_clear_command_def; #ifdef USE_INSPIRCD2_PROTOCOL -extern struct command_def haxserv_psuedoclient_raw_inspircd2_command_def; +extern struct command_def haxserv_pseudoclient_raw_inspircd2_command_def; #endif -extern struct command_def haxserv_psuedoclient_kill_command_def; -extern struct command_def haxserv_psuedoclient_spam_command_def; -extern struct command_def haxserv_psuedoclient_reload_command_def; -extern struct command_def haxserv_psuedoclient_allow_command_def; -extern struct command_def haxserv_psuedoclient_deny_command_def; -extern struct command_def haxserv_psuedoclient_reconnect_command_def; -extern struct command_def haxserv_psuedoclient_sanick_command_def; -extern struct command_def haxserv_psuedoclient_get_command_def; +extern struct command_def haxserv_pseudoclient_kill_command_def; +extern struct command_def haxserv_pseudoclient_spam_command_def; +extern struct command_def haxserv_pseudoclient_reload_command_def; +extern struct command_def haxserv_pseudoclient_allow_command_def; +extern struct command_def haxserv_pseudoclient_deny_command_def; +extern struct command_def haxserv_pseudoclient_reconnect_command_def; +extern struct command_def haxserv_pseudoclient_sanick_command_def; +extern struct command_def haxserv_pseudoclient_get_command_def; diff --git a/real_main.c b/real_main.c index ec88938..f12ee6b 100644 --- a/real_main.c +++ b/real_main.c @@ -50,12 +50,12 @@ #include "client_network.h" #endif -#ifdef USE_PSUEDOCLIENTS -#include "psuedoclients.h" +#ifdef USE_PSEUDOCLIENTS +#include "pseudoclients.h" #endif -#ifdef USE_HAXSERV_PSUEDOCLIENT -#include "psuedoclients/haxserv.h" +#ifdef USE_HAXSERV_PSEUDOCLIENT +#include "pseudoclients/haxserv.h" #endif pthread_attr_t pthread_attr; @@ -92,8 +92,8 @@ int real_main(void) { return 1; #endif -#ifdef USE_PSUEDOCLIENTS - if (init_psuedoclients() != 0) +#ifdef USE_PSEUDOCLIENTS + if (init_pseudoclients() != 0) return 1; #endif |