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 1307 by michael, Sat Mar 24 09:33:33 2012 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 1618 by michael, Tue Oct 30 21:04:38 2012 UTC

# Line 45 | Line 45
45   #include "rng_mt.h"
46   #include "s_auth.h"
47   #include "s_bsd.h"
48 < #include "s_conf.h"
49 < #include "s_log.h"
48 > #include "conf.h"
49 > #include "log.h"
50   #include "s_misc.h"
51   #include "s_serv.h"      /* try_connections */
52   #include "send.h"
# Line 72 | Line 72 | struct server_info ServerInfo;
72   struct admin_info AdminInfo = { NULL, NULL, NULL };
73   struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
74   struct ServerState_t server_state = { 0 };
75 < struct logging_entry ConfigLoggingEntry = { 1, 1 };
75 > struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
76   struct ServerStatistics ServerStats;
77   struct timeval SystemTime;
78   struct Client me;             /* That's me */
# 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 336 | Line 333 | initialize_server_capabs(void)
333   static void
334   write_pidfile(const char *filename)
335   {
336 <  FBFILE *fb;
336 >  FILE *fb;
337  
338 <  if ((fb = fbopen(filename, "w")))
338 >  if ((fb = fopen(filename, "w")))
339    {
340      char buff[32];
341      unsigned int pid = (unsigned int)getpid();
345 –    size_t nbytes = snprintf(buff, sizeof(buff), "%u\n", pid);
342  
343 <    if ((fbputs(buff, fb, nbytes) == -1))
343 >    snprintf(buff, sizeof(buff), "%u\n", pid);
344 >
345 >    if ((fputs(buff, fb) == -1))
346        ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
347             pid, filename, strerror(errno));
348  
349 <    fbclose(fb);
352 <    return;
349 >    fclose(fb);
350    }
351    else
352    {
# Line 368 | Line 365 | write_pidfile(const char *filename)
365   static void
366   check_pidfile(const char *filename)
367   {
368 <  FBFILE *fb;
368 >  FILE *fb;
369    char buff[32];
370    pid_t pidfromfile;
371  
372    /* Don't do logging here, since we don't have log() initialised */
373 <  if ((fb = fbopen(filename, "r")))
373 >  if ((fb = fopen(filename, "r")))
374    {
375 <    if (fbgets(buff, 20, fb) == NULL)
375 >    if (fgets(buff, 20, fb) == NULL)
376      {
377        /* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
378         * strerror(errno));
# Line 393 | Line 390 | check_pidfile(const char *filename)
390        }
391      }
392  
393 <    fbclose(fb);
393 >    fclose(fb);
394    }
395    else if (errno != ENOENT)
396    {
# Line 445 | Line 442 | init_ssl(void)
442      ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
443    }
444  
445 <  SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
445 >  SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
446    SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
447    SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
448  
# Line 458 | Line 455 | init_ssl(void)
455      ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
456    }
457  
458 <  SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2);
458 >  SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
459    SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
460    SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
461   #endif /* HAVE_LIBCRYPTO */
# 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                */
514 –  ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
509    ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
510    ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
511    myargv = argv;
# 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 */

Diff Legend

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