ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/src/ircd.c
(Generate patch)

Comparing:
ircd-hybrid-8/src/ircd.c (file contents), Revision 1325 by michael, Sat Mar 31 10:29:02 2012 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 1718 by michael, Thu Dec 27 19:03:00 2012 UTC

# Line 36 | Line 36
36   #include "ircd_signal.h"
37   #include "s_gline.h"
38   #include "motd.h"
39 + #include "conf.h"
40   #include "hostmask.h"
41   #include "numeric.h"
42   #include "packet.h"
# Line 45 | Line 46
46   #include "rng_mt.h"
47   #include "s_auth.h"
48   #include "s_bsd.h"
48 – #include "conf.h"
49   #include "log.h"
50   #include "s_misc.h"
51   #include "s_serv.h"      /* try_connections */
# Line 53 | Line 53
53   #include "whowas.h"
54   #include "modules.h"
55   #include "memory.h"
56 + #include "mempool.h"
57   #include "hook.h"
58   #include "ircd_getopt.h"
58 – #include "balloc.h"
59   #include "motd.h"
60   #include "supported.h"
61   #include "watch.h"
62 <
62 > #include "conf_db.h"
63 > #include "conf_class.h"
64  
65   /* /quote set variables */
66   struct SetOptions GlobalSetOptions;
# Line 82 | Line 83 | const char *logFileName = LPATH;
83   const char *pidFileName = PPATH;
84  
85   char **myargv;
85 – char ircd_platform[PLATFORMLEN];
86  
87   int dorehash = 0;
88   int doremotd = 0;
# Line 142 | Line 142 | make_daemon(void)
142  
143   static int printVersion = 0;
144  
145 < struct lgetopt myopts[] = {
146 <  {"dlinefile",  &ConfigFileEntry.dlinefile,
147 <   STRING, "File to use for dline.conf"},
145 > static struct lgetopt myopts[] = {
146    {"configfile", &ConfigFileEntry.configfile,
147     STRING, "File to use for ircd.conf"},
148 +  {"glinefile",  &ConfigFileEntry.glinefile,
149 +   STRING, "File to use for gline database"},
150    {"klinefile",  &ConfigFileEntry.klinefile,
151 <   STRING, "File to use for kline.conf"},
151 >   STRING, "File to use for kline database"},
152 >  {"dlinefile",  &ConfigFileEntry.dlinefile,
153 >   STRING, "File to use for dline database"},
154    {"xlinefile",  &ConfigFileEntry.xlinefile,
155 <   STRING, "File to use for xline.conf"},
155 >   STRING, "File to use for xline database"},
156 >  {"resvfile",  &ConfigFileEntry.resvfile,
157 >   STRING, "File to use for resv database"},
158    {"logfile",    &logFileName,
159     STRING, "File to use for ircd.log"},
160    {"pidfile",    &pidFileName,
# Line 175 | Line 179 | set_time(void)
179    {
180      ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
181           strerror(errno));
182 <    sendto_realops_flags(UMODE_ALL, L_ALL,
182 >    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
183                           "Clock Failure (%s), TS can be corrupted",
184                           strerror(errno));
185      restart("Clock Failure");
# Line 244 | Line 248 | io_loop(void)
248      if (doremotd)
249      {
250        read_message_file(&ConfigFileEntry.motd);
251 <      sendto_realops_flags(UMODE_ALL, L_ALL,
251 >      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
252                             "Got signal SIGUSR1, reloading ircd motd file");
253        doremotd = 0;
254      }
# Line 299 | Line 303 | static void
303   initialize_message_files(void)
304   {
305    init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
302 –  init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
306    init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
307  
308    read_message_file(&ConfigFileEntry.motd);
306 –  read_message_file(&ConfigFileEntry.opermotd);
309    read_message_file(&ConfigFileEntry.linksfile);
310  
311    init_isupport();
# Line 505 | Line 507 | main(int argc, char *argv[])
507    init_chcap_usage_counts();
508  
509    ConfigFileEntry.dpath      = DPATH;
510 <  ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
511 <  ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
512 <  ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
513 <  ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
514 <  ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
515 <  ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
516 <  ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
515 <  ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
516 <  ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
510 >  ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
511 >  ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
512 >  ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
513 >  ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
514 >  ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
515 >  ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
516 >
517    myargv = argv;
518    umask(077);                /* better safe than sorry --SRB */
519  
# Line 543 | Line 543 | main(int argc, char *argv[])
543  
544    setup_signals();
545  
546 –  get_ircd_platform(ircd_platform);
547 –
546    /* Init the event subsystem */
547    eventInit();
548    /* We need this to initialise the fd array before anything else */
# Line 555 | Line 553 | main(int argc, char *argv[])
553    /* Check if there is pidfile and daemon already running */
554    check_pidfile(pidFileName);
555  
556 <  initBlockHeap();
556 >  mp_pool_init();
557    init_dlink_nodes();
558    init_callbacks();
559    initialize_message_files();
# Line 563 | Line 561 | main(int argc, char *argv[])
561    init_hash();
562    init_ip_hash_table();      /* client host ip hash table */
563    init_host_hash();          /* Host-hashtable. */
566 –  clear_tree_parse();
564    init_client();
565 <  init_class();
566 <  init_whowas();
565 >  class_init();
566 >  whowas_init();
567    watch_init();
568    init_auth();          /* Initialise the auth code */
569    init_resolver();      /* Needs to be setup before the io loop */
570 +  modules_init();
571    read_conf_files(1);   /* cold start init conf files */
572    init_uid();
573    initialize_server_capabs();   /* Set up default_server_capabs */
# Line 616 | Line 614 | main(int argc, char *argv[])
614    /* add ourselves to global_serv_list */
615    dlinkAdd(&me, make_dlink_node(), &global_serv_list);
616  
617 +  load_kline_database();
618 +  load_dline_database();
619 +  load_gline_database();
620 +  load_xline_database();
621 +  load_resv_database();
622 +
623    if (chdir(MODPATH))
624    {
625      ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
# Line 653 | Line 657 | main(int argc, char *argv[])
657    /* Setup the timeout check. I'll shift it later :)  -- adrian */
658    eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
659  
660 +  eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
661 +
662    if (ConfigServerHide.links_delay > 0)
663      eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
664    else

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)