ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/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 1625 by michael, Thu Nov 1 13:49:25 2012 UTC

# Line 59 | Line 59
59   #include "motd.h"
60   #include "supported.h"
61   #include "watch.h"
62 <
62 > #include "conf_db.h"
63  
64   /* /quote set variables */
65   struct SetOptions GlobalSetOptions;
# Line 82 | Line 82 | const char *logFileName = LPATH;
82   const char *pidFileName = PPATH;
83  
84   char **myargv;
85 – char ircd_platform[PLATFORMLEN];
85  
86   int dorehash = 0;
87   int doremotd = 0;
# Line 142 | Line 141 | make_daemon(void)
141  
142   static int printVersion = 0;
143  
144 < struct lgetopt myopts[] = {
144 > static struct lgetopt myopts[] = {
145    {"dlinefile",  &ConfigFileEntry.dlinefile,
146     STRING, "File to use for dline.conf"},
147    {"configfile", &ConfigFileEntry.configfile,
# Line 175 | Line 174 | set_time(void)
174    {
175      ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
176           strerror(errno));
177 <    sendto_realops_flags(UMODE_ALL, L_ALL,
177 >    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
178                           "Clock Failure (%s), TS can be corrupted",
179                           strerror(errno));
180      restart("Clock Failure");
# Line 244 | Line 243 | io_loop(void)
243      if (doremotd)
244      {
245        read_message_file(&ConfigFileEntry.motd);
246 <      sendto_realops_flags(UMODE_ALL, L_ALL,
246 >      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
247                             "Got signal SIGUSR1, reloading ircd motd file");
248        doremotd = 0;
249      }
# Line 299 | Line 298 | static void
298   initialize_message_files(void)
299   {
300    init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
302 –  init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
301    init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
302  
303    read_message_file(&ConfigFileEntry.motd);
306 –  read_message_file(&ConfigFileEntry.opermotd);
304    read_message_file(&ConfigFileEntry.linksfile);
305  
306    init_isupport();
# Line 508 | Line 505 | main(int argc, char *argv[])
505    ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
506    ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
507    ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
511 –  ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
512 –  ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
508    ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
509 <  ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
510 <  ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
516 <  ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
509 > //  ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
510 > //  ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
511    myargv = argv;
512    umask(077);                /* better safe than sorry --SRB */
513  
# Line 543 | Line 537 | main(int argc, char *argv[])
537  
538    setup_signals();
539  
546 –  get_ircd_platform(ircd_platform);
547 –
540    /* Init the event subsystem */
541    eventInit();
542    /* We need this to initialise the fd array before anything else */
# Line 563 | Line 555 | main(int argc, char *argv[])
555    init_hash();
556    init_ip_hash_table();      /* client host ip hash table */
557    init_host_hash();          /* Host-hashtable. */
566 –  clear_tree_parse();
558    init_client();
559    init_class();
560 <  init_whowas();
560 >  whowas_init();
561    watch_init();
562    init_auth();          /* Initialise the auth code */
563    init_resolver();      /* Needs to be setup before the io loop */
564 +  modules_init();
565    read_conf_files(1);   /* cold start init conf files */
566    init_uid();
567    initialize_server_capabs();   /* Set up default_server_capabs */
# Line 616 | Line 608 | main(int argc, char *argv[])
608    /* add ourselves to global_serv_list */
609    dlinkAdd(&me, make_dlink_node(), &global_serv_list);
610  
611 +  load_kline_database();
612 +  load_dline_database();
613 +  load_gline_database();
614 +  load_xline_database();
615 +  load_resv_database();
616 +
617    if (chdir(MODPATH))
618    {
619      ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
# Line 653 | Line 651 | main(int argc, char *argv[])
651    /* Setup the timeout check. I'll shift it later :)  -- adrian */
652    eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
653  
654 +  eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
655 +
656    if (ConfigServerHide.links_delay > 0)
657      eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
658    else

Diff Legend

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