diff --git a/include/ircd_state.h b/include/ircd_state.h deleted file mode 100644 index 8d488b3..0000000 --- a/include/ircd_state.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * charybdis: An advanced ircd. - * ircd_state.h: Functions for backing up and synchronizing IRCd's state - * - * Copyright (c) 2006 William Pitcock - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * $Id: main.c 867 2006-02-16 14:25:09Z nenolod $ - */ - -#ifndef _IRCD_STATE_H -#define _IRCD_STATE_H - -#include "stdinc.h" -#include "setup.h" -#include "config.h" -#include "ircd_defs.h" -#include "ircd_linker.h" -#include "ircd_state.h" - -#ifdef NOTYET - -/* I haven't designed this structure yet, so this is a placeholder. */ -struct IRCdState { - void *moo; -}; - -#endif - -#endif diff --git a/src/Makefile.in b/src/Makefile.in index 9c62278..c9256cc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -69,7 +69,6 @@ SRCS = \ irc_dictionary.c \ ircd.c \ ircd_signal.c \ - ircd_state.c \ kdparse.c \ listener.c \ logger.c \ diff --git a/src/ircd_state.c b/src/ircd_state.c deleted file mode 100644 index 0776461..0000000 --- a/src/ircd_state.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * charybdis: An advanced ircd. - * ircd_state.c: Functions for backing up and synchronizing IRCd's state - * - * Copyright (c) 2006 William Pitcock - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * $Id: main.c 867 2006-02-16 14:25:09Z nenolod $ - */ - -#include "stdinc.h" -#include "setup.h" -#include "config.h" - -#include "client.h" -#include "ircd.h" -#include "channel.h" -#include "class.h" -#include "client.h" -#include "common.h" -#include "hash.h" -#include "irc_string.h" -#include "ircd_signal.h" -#include "sprintf_irc.h" -#include "s_gline.h" -#include "msg.h" /* msgtab */ -#include "hostmask.h" -#include "numeric.h" -#include "parse.h" -#include "res.h" -#include "restart.h" -#include "s_auth.h" -#include "s_conf.h" -#include "logger.h" -#include "s_serv.h" /* try_connections */ -#include "s_user.h" -#include "s_stats.h" -#include "scache.h" -#include "send.h" -#include "whowas.h" -#include "modules.h" -#include "hook.h" -#include "ircd_getopt.h" -#include "newconf.h" -#include "reject.h" -#include "s_conf.h" -#include "s_newconf.h" -#include "cache.h" -#include "monitor.h" -#include "patchlevel.h" -#include "serno.h" - -rb_dlink_list lclient_list = { NULL, NULL, 0 }; -rb_dlink_list global_client_list = { NULL, NULL, 0 }; -rb_dlink_list global_channel_list = { NULL, NULL, 0 }; - -rb_dlink_list unknown_list; /* unknown clients ON this server only */ -rb_dlink_list serv_list; /* local servers to this server ONLY */ -rb_dlink_list global_serv_list; /* global servers on the network */ -rb_dlink_list local_oper_list; /* our opers, duplicated in lclient_list */ -rb_dlink_list oper_list; /* network opers */ - -struct timeval SystemTime; -int ServerRunning; /* GLOBAL - server execution state */ -struct Client me; /* That's me */ -struct LocalUser meLocalUser; /* That's also part of me */ - -time_t startup_time; - -int default_server_capabs = CAP_MASK; - -int splitmode; -int splitchecking; -int split_users; -int split_servers; -int eob_count; - -unsigned long initialVMTop = 0; /* top of virtual memory at init */ -const char *logFileName = LPATH; -const char *pidFileName = PPATH; - -char **myargv; -int dorehash = 0; -int dorehashbans = 0; -int doremotd = 0; -int kline_queued = 0; -int server_state_foreground = 0; -int opers_see_all_users = 0; - -int testing_conf = 0; - -struct config_channel_entry ConfigChannel; -rb_bh *channel_heap; -rb_bh *ban_heap; -rb_bh *topic_heap; -rb_bh *member_heap; - -rb_bh *client_heap = NULL; -rb_bh *lclient_heap = NULL; -rb_bh *pclient_heap = NULL; - -char current_uid[IDLEN]; - -/* patricia */ -rb_bh *prefix_heap; -rb_bh *node_heap; -rb_bh *patricia_heap; - -rb_bh *linebuf_heap; - -rb_bh *dnode_heap; - -#ifdef NOTYET - -void charybdis_initstate(struct IRCdState *self) -{ - -} - -#endif