dlink -> rb_dlink

[irc/rqf/shadowircd.git] / src / ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index 4b3f170610bc72dda442cb1242f9672ed8013b31..7c57228d435daefeaa7fd6cf111d6c69365c5b92 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd.c 3354 2007-04-03 09:21:31Z nenolod $
+ *  $Id: ircd.c 3380 2007-04-03 22:25:11Z jilles $
  */
 
 #include "stdinc.h"
@@ -73,6 +73,8 @@
 #include "patchlevel.h"
 #include "serno.h"
 
+#include "ratbox_lib.h"
+
 /*
  * Try and find the correct name to use with getrlimit() for setting the max.
  * number of files allowed to be open by this process.
@@ -111,6 +113,12 @@ ircd_log_cb(const char *str)
        ilog(L_MAIN, "%s", str);
 }
 
+static void
+ircd_restart_cb(const char *str)
+{
+       ilog(L_MAIN, "%s", str);
+}
+
 /*
  * Why EXIT_FAILURE here?
  * Because if ircd_die_cb() is called it's because of a fatal
@@ -139,19 +147,19 @@ ircd_die_cb(const char *str)
 static void
 init_sys(void)
 {
-#if defined(RLIMIT_FD_MAX) && defined(HAVE_SYS_RLIMIT_H)
+#if defined(RLIMIT_NOFILE) && defined(HAVE_SYS_RESOURCE_H)
        struct rlimit limit;
 
-       if(!getrlimit(RLIMIT_FD_MAX, &limit))
+       if(!getrlimit(RLIMIT_NOFILE, &limit))
        {
                limit.rlim_cur = limit.rlim_max;        /* make soft limit the max */
-               if(setrlimit(RLIMIT_FD_MAX, &limit) == -1)
+               if(setrlimit(RLIMIT_NOFILE, &limit) == -1)
                {
                        fprintf(stderr, "error setting max fd's to %ld\n", (long) limit.rlim_cur);
                        exit(EXIT_FAILURE);
                }
        }
-#endif /* RLIMIT_FD_MAX */
+#endif /* RLIMIT_NOFILE */
 }
 
 static int
@@ -292,7 +300,7 @@ charybdis_io_loop(void)
                        eventRun();
 
 
-               comm_select(250);
+               rb_select(250);
        }
 }
 
@@ -374,7 +382,7 @@ write_pidfile(const char *filename)
        {
                unsigned int pid = (unsigned int) getpid();
 
-               ircsnprintf(buff, sizeof(buff), "%u\n", pid);
+               rb_snprintf(buff, sizeof(buff), "%u\n", pid);
                if((fputs(buff, fb) == -1))
                {
                        ilog(L_MAIN, "Error writing %u to pid file %s (%s)",
@@ -489,7 +497,7 @@ main(int argc, char *argv[])
        memset(&local_oper_list, 0, sizeof(local_oper_list));
        memset(&oper_list, 0, sizeof(oper_list));
 
-       dlinkAddTail(&me, &me.node, &global_client_list);
+       rb_dlinkAddTail(&me, &me.node, &global_client_list);
 
        memset((void *) &Count, 0, sizeof(Count));
        memset((void *) &ServerInfo, 0, sizeof(ServerInfo));
@@ -552,13 +560,14 @@ main(int argc, char *argv[])
        }
 
        /* Init the event subsystem */
-       libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
        init_sys();
+       libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
+       rb_lib_init(ircd_log_cb, restart, ircd_die_cb);
 
        fdlist_init();
        if(!server_state_foreground)
        {
-               comm_close_all();
+               rb_close_all();
        }
 
        init_main_logfile();
@@ -635,12 +644,12 @@ main(int argc, char *argv[])
        me.servptr = &me;
        SetMe(&me);
        make_server(&me);
-       me.serv->up = me.name;
        startup_time = CurrentTime;
        add_to_client_hash(me.name, &me);
        add_to_id_hash(me.id, &me);
+       me.serv->nameinfo = scache_connect(me.name, me.info, 0);
 
-       dlinkAddAlloc(&me, &global_serv_list);
+       rb_dlinkAddAlloc(&me, &global_serv_list);
 
        construct_umodebuf();
 
@@ -664,16 +673,10 @@ main(int argc, char *argv[])
        eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
 
        /* Setup the timeout check. I'll shift it later :)  -- adrian */
-       eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
+       eventAddIsh("rb_checktimeouts", rb_checktimeouts, NULL, 1);
 
        eventAdd("check_rehash", check_rehash, NULL, 1);
 
-       if(ConfigServerHide.links_delay > 0)
-               eventAdd("cache_links", cache_links, NULL,
-                           ConfigServerHide.links_delay);
-       else
-               ConfigServerHide.links_disabled = 1;
-
        if(splitmode)
                eventAdd("check_splitmode", check_splitmode, NULL, 2);