diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Makefile.in | 16 | ||||
| -rw-r--r-- | src/common/console.c | 21 | ||||
| -rw-r--r-- | src/common/core.c | 42 | ||||
| -rw-r--r-- | src/common/memmgr.h | 5 | ||||
| -rw-r--r-- | src/common/socket.c | 27 | ||||
| -rw-r--r-- | src/config/const.h | 5 |
6 files changed, 22 insertions, 94 deletions
diff --git a/src/common/Makefile.in b/src/common/Makefile.in index f65138521..67fe9c0d4 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -44,8 +44,6 @@ COMMON_C = $(COMMON_SHARED_C) COMMON_SHARED_OBJ = $(patsubst %.c,%.o,$(COMMON_SHARED_C)) COMMON_OBJ = $(addprefix obj_all/, $(COMMON_SHARED_OBJ) \ console.o core.o memmgr.o socket.o) -COMMON_MINI_OBJ = $(addprefix obj_all/, $(COMMON_SHARED_OBJ) \ - miniconsole.o minicore.o minimemmgr.o minisocket.o) COMMON_C += console.c core.c memmgr.c socket.c COMMON_H = atomic.h cbasetypes.h conf.h console.h core.h db.h des.h ers.h \ grfio.h hercules.h HPM.h HPMi.h memmgr.h mapindex.h md5calc.h \ @@ -61,7 +59,7 @@ SYSINFO_INC = sysinfo.inc HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) - SQL_DEPENDS=common common_sql common_mini + SQL_DEPENDS=common common_sql else SQL_DEPENDS=needs_mysql endif @@ -72,7 +70,7 @@ CC = @CC@ export CC ##################################################################### -.PHONY: all sql common common_sql common_mini clean buildclean help +.PHONY: all sql common common_sql clean buildclean help all: sql @@ -119,18 +117,12 @@ obj_all/common.a: $(COMMON_OBJ) Makefile @echo " AR $@" @@AR@ rcs obj_all/common.a $(COMMON_OBJ) -obj_all/common_mini.a: $(COMMON_MINI_OBJ) Makefile - @echo " AR $@" - @@AR@ rcs obj_all/common_mini.a $(COMMON_MINI_OBJ) - obj_sql/common_sql.a: $(COMMON_SQL_OBJ) Makefile @echo " AR $@" @@AR@ rcs obj_sql/common_sql.a $(COMMON_SQL_OBJ) common: $(COMMON_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) obj_all/common.a Makefile -common_mini: $(COMMON_MINI_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) obj_all/common_mini.a Makefile - common_sql: $(COMMON_SQL_OBJ) obj_sql/common_sql.a Makefile # missing object files @@ -150,10 +142,6 @@ obj_all/%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | $(SYSIN @echo " CC $<" @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< -obj_all/mini%.o: %.c $$(filter %.p.h, $(COMMON_PH)) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_all - @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $< - obj_sql/%.o: %.c $$(filter %.p.h, $(COMMON_PH)) $(COMMON_H) $(COMMON_SQL_H) $(CONFIG_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_sql @echo " CC $<" @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< diff --git a/src/common/console.c b/src/common/console.c index 5923775b7..a990d86b3 100644 --- a/src/common/console.c +++ b/src/common/console.c @@ -23,24 +23,21 @@ #include "config/core.h" // CONSOLE_INPUT, MAX_CONSOLE_INPUT #include "console.h" +#include "common/atomic.h" #include "common/cbasetypes.h" #include "common/core.h" +#include "common/ers.h" +#include "common/memmgr.h" #include "common/mmo.h" +#include "common/mutex.h" #include "common/nullpo.h" #include "common/showmsg.h" +#include "common/spinlock.h" +#include "common/sql.h" +#include "common/strlib.h" #include "common/sysinfo.h" - -#ifndef MINICORE -# include "common/atomic.h" -# include "common/ers.h" -# include "common/memmgr.h" -# include "common/mutex.h" -# include "common/spinlock.h" -# include "common/sql.h" -# include "common/strlib.h" -# include "common/thread.h" -# include "common/timer.h" -#endif +#include "common/thread.h" +#include "common/timer.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/common/core.c b/src/common/core.c index 9fd33c4e0..1ecf1df83 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -23,32 +23,29 @@ #include "config/core.h" #include "core.h" +#include "common/HPM.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/console.h" #include "common/db.h" #include "common/des.h" +#include "common/ers.h" #include "common/grfio.h" +#include "common/md5calc.h" #include "common/memmgr.h" #include "common/mmo.h" +#include "common/mutex.h" #include "common/nullpo.h" +#include "common/random.h" #include "common/showmsg.h" +#include "common/socket.h" +#include "common/sql.h" #include "common/strlib.h" #include "common/sysinfo.h" +#include "common/thread.h" #include "common/timer.h" #include "common/utils.h" -#ifndef MINICORE -# include "common/HPM.h" -# include "common/conf.h" -# include "common/ers.h" -# include "common/md5calc.h" -# include "common/mutex.h" -# include "common/random.h" -# include "common/socket.h" -# include "common/sql.h" -# include "common/thread.h" -#endif - #ifndef _WIN32 # include <unistd.h> #else @@ -83,7 +80,6 @@ static struct core_interface core_s; struct core_interface *core = &core_s; -#ifndef MINICORE // minimalist Core // Added by Gabuzomeu // // This is an implementation of signal() using sigaction() for portability. @@ -196,7 +192,6 @@ static void signals_init(void) compat_signal(SIGTRAP, SIG_DFL); #endif } -#endif /** * Warns the user if executed as superuser (root) @@ -250,10 +245,8 @@ static bool usercheck(void) static void core_defaults(void) { nullpo_defaults(); -#ifndef MINICORE hpm_defaults(); HCache_defaults(); -#endif sysinfo_defaults(); console_defaults(); strlib_defaults(); @@ -262,7 +255,6 @@ static void core_defaults(void) cmdline_defaults(); des_defaults(); grfio_defaults(); // Note: grfio is lazily loaded. grfio->init() and grfio->final() are not automatically called. -#ifndef MINICORE mutex_defaults(); libconfig_defaults(); sql_defaults(); @@ -272,7 +264,6 @@ static void core_defaults(void) rnd_defaults(); md5_defaults(); thread_defaults(); -#endif } /** @@ -280,12 +271,8 @@ static void core_defaults(void) */ static const char *cmdline_arg_source(struct CmdlineArgData *arg) { -#ifdef MINICORE - return "core"; -#else // !MINICORE nullpo_retr(NULL, arg); return HPM->pid2name(arg->pluginID); -#endif // MINICORE } /** @@ -446,15 +433,9 @@ static int cmdline_exec(int argc, char **argv, unsigned int options) */ static void cmdline_init(void) { -#ifdef MINICORE - // Minicore has no HPM. This value isn't used, but the arg_add function requires it, so we're (re)defining it here -#define HPM_PID_CORE ((unsigned int)-1) -#endif CMDLINEARG_DEF(help, 'h', "Displays this help screen", CMDLINE_OPT_NORMAL); CMDLINEARG_DEF(version, 'v', "Displays the server's version.", CMDLINE_OPT_NORMAL); -#ifndef MINICORE CMDLINEARG_DEF2(load-plugin, loadplugin, "Loads an additional plugin (can be repeated).", CMDLINE_OPT_PARAM|CMDLINE_OPT_PREINIT); -#endif // !MINICORE cmdline_args_init_local(); } @@ -521,10 +502,6 @@ int main(int argc, char **argv) if (!usercheck()) return EXIT_FAILURE; -#ifdef MINICORE // minimalist Core - do_init(argc,argv); - do_final(); -#else// not MINICORE set_server_type(); Sql_Init(); @@ -567,7 +544,6 @@ int main(int argc, char **argv) thread->final(); ers_final(); rnd->final(); -#endif cmdline->final(); //sysinfo->final(); Called by iMalloc->final() diff --git a/src/common/memmgr.h b/src/common/memmgr.h index 90c35f244..c7147cc5e 100644 --- a/src/common/memmgr.h +++ b/src/common/memmgr.h @@ -42,11 +42,6 @@ // Enable memory manager logging by default #define LOG_MEMMGR -// no logging for minicore -#if defined(MINICORE) && defined(LOG_MEMMGR) - #undef LOG_MEMMGR -#endif - # define aMalloc(n) (iMalloc->malloc((n),ALC_MARK)) # define aCalloc(m,n) (iMalloc->calloc((m),(n),ALC_MARK)) # define aRealloc(p,n) (iMalloc->realloc((p),(n),ALC_MARK)) diff --git a/src/common/socket.c b/src/common/socket.c index 290c7a1b3..fd86414d6 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -301,10 +301,8 @@ static uint32 send_shortlist_set[(FD_SETSIZE+31)/32];// to know if specific fd's static int create_session(int fd, RecvFunc func_recv, SendFunc func_send, ParseFunc func_parse); -#ifndef MINICORE - static int ip_rules = 1; - static int connect_check(uint32 ip); -#endif // MINICORE +static int ip_rules = 1; +static int connect_check(uint32 ip); static const char *error_msg(void) { @@ -556,12 +554,10 @@ static int connect_client(int listen_fd) setsocketopts(fd,NULL); sockt->set_nonblocking(fd, 1); -#ifndef MINICORE if( ip_rules && !connect_check(ntohl(client_address.sin_addr.s_addr)) ) { sockt->close(fd); return -1; } -#endif // MINICORE #ifndef SOCKET_EPOLL // Select Based Event Dispatcher @@ -1065,9 +1061,6 @@ static int do_sockets(int next) return 0; } -////////////////////////////// -#ifndef MINICORE -////////////////////////////// // IP rules and DDoS protection struct connect_history { @@ -1326,11 +1319,6 @@ static bool access_list_add(struct config_setting_t *setting, const char *list_n return true; } -////////////////////////////// -#endif // MINICORE -////////////////////////////// - -#ifndef MINICORE /** * Reads 'socket_configuration/ip_rules' and initializes required variables. * @@ -1387,9 +1375,7 @@ static bool socket_config_read_iprules(const char *filename, struct config_t *co return true; } -#endif // ! MINICORE -#ifndef MINICORE /** * Reads 'socket_configuration/ddos' and initializes required variables. * @@ -1419,7 +1405,6 @@ static bool socket_config_read_ddos(const char *filename, struct config_t *confi return true; } -#endif // ! MINICORE /** * Reads 'socket_configuration' and initializes required variables. @@ -1464,7 +1449,6 @@ static bool socket_config_read(const char *filename, bool imported) } #endif // SOCKET_EPOLL -#ifndef MINICORE { uint32 ui32 = 0; libconfig->setting_lookup_bool(setting, "debug", &access_debug); @@ -1477,7 +1461,6 @@ static bool socket_config_read(const char *filename, bool imported) retval = false; if (!socket_config_read_ddos(filename, &config, imported)) retval = false; -#endif // MINICORE // import should overwrite any previous configuration, so it should be called last if (libconfig->lookup_string(&config, "import", &import) == CONFIG_TRUE) { @@ -1496,12 +1479,10 @@ static bool socket_config_read(const char *filename, bool imported) static void socket_final(void) { int i; -#ifndef MINICORE if( connect_history ) db_destroy(connect_history); VECTOR_CLEAR(access_allow); VECTOR_CLEAR(access_deny); -#endif // MINICORE for( i = 1; i < sockt->fd_max; i++ ) if(sockt->session[i]) @@ -1686,10 +1667,8 @@ static void socket_init(void) } #endif // defined(HAVE_SETRLIMIT) && !defined(CYGWIN) -#ifndef MINICORE VECTOR_INIT(access_allow); VECTOR_INIT(access_deny); -#endif // ! MINICORE // Get initial local ips sockt->naddr_ = sockt->getips(sockt->addr_,16); @@ -1729,12 +1708,10 @@ static void socket_init(void) // should hold enough buffer (it is a vacuum so to speak) as it is never flushed. [Skotlex] create_session(0, null_recv, null_send, null_parse); -#ifndef MINICORE // Delete old connection history every 5 minutes connect_history = uidb_alloc(DB_OPT_RELEASE_DATA); timer->add_func_list(connect_check_clear, "connect_check_clear"); timer->add_interval(timer->gettick()+1000, connect_check_clear, 0, 0, 5*60*1000); -#endif // MINICORE ShowInfo("Server supports up to '"CL_WHITE"%"PRIu64""CL_RESET"' concurrent connections.\n", rlim_cur); } diff --git a/src/config/const.h b/src/config/const.h index 3b35e354e..4767b5721 100644 --- a/src/config/const.h +++ b/src/config/const.h @@ -114,11 +114,6 @@ } while(0) #endif -/* console_input doesn't go well with minicore */ -#ifdef MINICORE - #undef CONSOLE_INPUT -#endif - /** * End of File **/ |