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/trunk/src/ircd.c (file contents):
Revision 3140 by michael, Wed Mar 12 19:23:20 2014 UTC vs.
Revision 3274 by michael, Sun Apr 6 12:22:23 2014 UTC

# Line 29 | Line 29
29   #include "list.h"
30   #include "ircd.h"
31   #include "channel.h"
32 – #include "channel_mode.h"
32   #include "client.h"
33   #include "event.h"
34   #include "fdlist.h"
# Line 40 | Line 39
39   #include "motd.h"
40   #include "conf.h"
41   #include "hostmask.h"
43 – #include "numeric.h"
44 – #include "packet.h"
42   #include "parse.h"
43   #include "irc_res.h"
44   #include "restart.h"
# Line 49 | Line 46
46   #include "s_auth.h"
47   #include "s_bsd.h"
48   #include "log.h"
52 – #include "s_misc.h"
49   #include "s_serv.h"      /* try_connections */
50   #include "send.h"
51   #include "whowas.h"
52   #include "modules.h"
53   #include "memory.h"
54   #include "mempool.h"
59 – #include "hook.h"
55   #include "ircd_getopt.h"
56   #include "supported.h"
57   #include "watch.h"
# Line 140 | Line 135 | make_daemon(void)
135  
136   static int printVersion = 0;
137  
138 < static struct lgetopt myopts[] = {
138 > static struct lgetopt myopts[] =
139 > {
140    {"configfile", &ConfigFileEntry.configfile,
141     STRING, "File to use for ircd.conf"},
142    {"glinefile",  &ConfigFileEntry.glinefile,
# Line 177 | Line 173 | set_time(void)
173      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
174                           "Clock Failure (%s), TS can be corrupted",
175                           strerror(errno));
176 <    restart("Clock Failure");
176 >    server_die("Clock Failure", 1);
177    }
178  
179    if (newtime.tv_sec < CurrentTime)
# Line 198 | Line 194 | set_time(void)
194   static void
195   io_loop(void)
196   {
197 <  while (1 == 1)
197 >  while (1)
198    {
199      /*
200       * Maybe we want a flags word?
# Line 241 | Line 237 | io_loop(void)
237        rehash(1);
238        dorehash = 0;
239      }
240 +
241      if (doremotd)
242      {
243        motd_recache();
# Line 302 | Line 299 | initialize_server_capabs(void)
299    add_capability("TS6", CAP_TS6, 0);
300    add_capability("CLUSTER", CAP_CLUSTER, 1);
301    add_capability("SVS", CAP_SVS, 1);
302 +  add_capability("CHW", CAP_CHW, 1);
303   #ifdef HALFOPS
304    add_capability("HOPS", CAP_HOPS, 1);
305   #endif
# Line 480 | Line 478 | main(int argc, char *argv[])
478    dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
479                                                     of Client list */
480    ConfigFileEntry.dpath      = DPATH;
481 +  ConfigFileEntry.spath      = SPATH;
482 +  ConfigFileEntry.mpath      = MPATH;
483    ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
484    ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
485    ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */

Diff Legend

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