listener.c fixes - part 1

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

diff --git a/src/s_conf.c b/src/s_conf.c
index bed827cb43c6be9362e0501101abeeea0b343024..f45601fc7536f8131f6634e7d975cbf70cdf76fa 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -59,7 +59,7 @@ extern char linebuf[];
 #define INADDR_NONE ((unsigned int) 0xffffffff)
 #endif
 
-static BlockHeap *confitem_heap = NULL;
+static rb_bh *confitem_heap = NULL;
 
 rb_dlink_list temp_klines[LAST_TEMP_TYPE];
 rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
@@ -83,22 +83,22 @@ static int attach_iline(struct Client *, struct ConfItem *);
 void
 init_s_conf(void)
 {
-       confitem_heap = BlockHeapCreate(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE);
+       confitem_heap = rb_bh_create(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE);
 
-       eventAddIsh("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
-       eventAddIsh("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
+       rb_event_addish("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
+       rb_event_addish("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
 
-       eventAddIsh("expire_temp_klines_hour", reorganise_temp_kd,
+       rb_event_addish("expire_temp_klines_hour", reorganise_temp_kd,
                        &temp_klines[TEMP_HOUR], 3600);
-       eventAddIsh("expire_temp_dlines_hour", reorganise_temp_kd,
+       rb_event_addish("expire_temp_dlines_hour", reorganise_temp_kd,
                        &temp_dlines[TEMP_HOUR], 3600);
-       eventAddIsh("expire_temp_klines_day", reorganise_temp_kd,
+       rb_event_addish("expire_temp_klines_day", reorganise_temp_kd,
                        &temp_klines[TEMP_DAY], 86400);
-       eventAddIsh("expire_temp_dlines_day", reorganise_temp_kd,
+       rb_event_addish("expire_temp_dlines_day", reorganise_temp_kd,
                        &temp_dlines[TEMP_DAY], 86400);
-       eventAddIsh("expire_temp_klines_week", reorganise_temp_kd,
+       rb_event_addish("expire_temp_klines_week", reorganise_temp_kd,
                        &temp_klines[TEMP_WEEK], 604800);
-       eventAddIsh("expire_temp_dlines_week", reorganise_temp_kd,
+       rb_event_addish("expire_temp_dlines_week", reorganise_temp_kd,
                        &temp_dlines[TEMP_WEEK], 604800);
 }
 
@@ -114,7 +114,7 @@ make_conf()
 {
        struct ConfItem *aconf;
 
-       aconf = BlockHeapAlloc(confitem_heap);
+       aconf = rb_bh_alloc(confitem_heap);
        aconf->status = CONF_ILLEGAL;
        return (aconf);
 }
@@ -146,7 +146,7 @@ free_conf(struct ConfItem *aconf)
        rb_free(aconf->user);
        rb_free(aconf->host);
 
-       BlockHeapFree(confitem_heap, aconf);
+       rb_bh_free(confitem_heap, aconf);
 }
 
 /*
@@ -717,8 +717,8 @@ set_default_conf(void)
        /* ServerInfo.name is not rehashable */
        /* ServerInfo.name = ServerInfo.name; */
        ServerInfo.description = NULL;
-       DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
-       DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
+       ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
+       ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
 
        memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
        ServerInfo.specific_ipv4_vhost = 0;
@@ -733,9 +733,9 @@ set_default_conf(void)
        AdminInfo.email = NULL;
        AdminInfo.description = NULL;
 
-       DupString(ConfigFileEntry.default_operstring, "is an IRC operator");
-       DupString(ConfigFileEntry.default_adminstring, "is a Server Administrator");
-       DupString(ConfigFileEntry.servicestring, "is a Network Service");
+       ConfigFileEntry.default_operstring = rb_strdup("is an IRC operator");
+       ConfigFileEntry.default_adminstring = rb_strdup("is a Server Administrator");
+       ConfigFileEntry.servicestring = rb_strdup("is a Network Service");
 
        ConfigFileEntry.default_umodes = UMODE_INVISIBLE;       
        ConfigFileEntry.failed_oper_notice = YES;
@@ -789,7 +789,7 @@ set_default_conf(void)
        ConfigFileEntry.hide_error_messages = 1;
        ConfigFileEntry.dots_in_ident = 0;
        ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
-       DupString(ConfigFileEntry.servlink_path, SLPATH);
+       ConfigFileEntry.servlink_path = rb_strdup(SLPATH);
        ConfigFileEntry.egdpool_path = NULL;
        ConfigFileEntry.use_whois_actually = YES;
        ConfigFileEntry.burst_away = NO;
@@ -875,13 +875,13 @@ validate_conf(void)
                ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
 
        if(ConfigFileEntry.servlink_path == NULL)
-               DupString(ConfigFileEntry.servlink_path, SLPATH);
+               ConfigFileEntry.servlink_path = rb_strdup(SLPATH);
 
        if(ServerInfo.network_name == NULL)
-               DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
+               ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
 
        if(ServerInfo.network_desc == NULL)
-               DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
+               ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
 
        if((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
           (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
@@ -935,17 +935,17 @@ conf_connect_allowed(struct sockaddr *addr, int aftype)
 void
 add_temp_kline(struct ConfItem *aconf)
 {
-       if(aconf->hold >= CurrentTime + (10080 * 60))
+       if(aconf->hold >= rb_current_time() + (10080 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
                aconf->port = TEMP_WEEK;
        }
-       else if(aconf->hold >= CurrentTime + (1440 * 60))
+       else if(aconf->hold >= rb_current_time() + (1440 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
                aconf->port = TEMP_DAY;
        }
-       else if(aconf->hold >= CurrentTime + (60 * 60))
+       else if(aconf->hold >= rb_current_time() + (60 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
                aconf->port = TEMP_HOUR;
@@ -969,17 +969,17 @@ add_temp_kline(struct ConfItem *aconf)
 void
 add_temp_dline(struct ConfItem *aconf)
 {
-       if(aconf->hold >= CurrentTime + (10080 * 60))
+       if(aconf->hold >= rb_current_time() + (10080 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
                aconf->port = TEMP_WEEK;
        }
-       else if(aconf->hold >= CurrentTime + (1440 * 60))
+       else if(aconf->hold >= rb_current_time() + (1440 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
                aconf->port = TEMP_DAY;
        }
-       else if(aconf->hold >= CurrentTime + (60 * 60))
+       else if(aconf->hold >= rb_current_time() + (60 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
                aconf->port = TEMP_HOUR;
@@ -1012,7 +1012,7 @@ expire_temp_kd(void *list)
        {
                aconf = ptr->data;
 
-               if(aconf->hold <= CurrentTime)
+               if(aconf->hold <= rb_current_time())
                {
                        /* Alert opers that a TKline expired - Hwy */
                        if(ConfigFileEntry.tkline_expire_notices)
@@ -1037,7 +1037,7 @@ reorganise_temp_kd(void *list)
        {
                aconf = ptr->data;
 
-               if(aconf->hold < (CurrentTime + (60 * 60)))
+               if(aconf->hold < (rb_current_time() + (60 * 60)))
                {
                        rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                        &temp_klines[TEMP_MIN] : &temp_dlines[TEMP_MIN]);
@@ -1045,14 +1045,14 @@ reorganise_temp_kd(void *list)
                }
                else if(aconf->port > TEMP_HOUR)
                {
-                       if(aconf->hold < (CurrentTime + (1440 * 60)))
+                       if(aconf->hold < (rb_current_time() + (1440 * 60)))
                        {
                                rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                                &temp_klines[TEMP_HOUR] : &temp_dlines[TEMP_HOUR]);
                                aconf->port = TEMP_HOUR;
                        }
                        else if(aconf->port > TEMP_DAY && 
-                               (aconf->hold < (CurrentTime + (10080 * 60))))
+                               (aconf->hold < (rb_current_time() + (10080 * 60))))
                        {
                                rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                                &temp_klines[TEMP_DAY] : &temp_dlines[TEMP_DAY]);
@@ -1377,18 +1377,18 @@ write_confitem(KlineType type, struct Client *source_p, char *user,
                rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
                           user, host, reason, oper_reason, current_date,
-                          get_oper_name(source_p), CurrentTime);
+                          get_oper_name(source_p), rb_current_time());
        }
        else if(type == DLINE_TYPE)
        {
                rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
-                          reason, oper_reason, current_date, get_oper_name(source_p), CurrentTime);
+                          reason, oper_reason, current_date, get_oper_name(source_p), rb_current_time());
        }
        else if(type == RESV_TYPE)
        {
                rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
-                          host, reason, get_oper_name(source_p), CurrentTime);
+                          host, reason, get_oper_name(source_p), rb_current_time());
        }
 
        if(fputs(buffer, out) == -1)
@@ -1444,7 +1444,7 @@ conf_add_class_to_conf(struct ConfItem *aconf)
 {
        if(aconf->className == NULL)
        {
-               DupString(aconf->className, "default");
+               aconf->className = rb_strdup("default");
                ClassPtr(aconf) = default_class;
                return;
        }
@@ -1461,7 +1461,7 @@ conf_add_class_to_conf(struct ConfItem *aconf)
                }
 
                rb_free(aconf->className);
-               DupString(aconf->className, "default");
+               aconf->className = rb_strdup("default");
                return;
        }
 
@@ -1469,7 +1469,7 @@ conf_add_class_to_conf(struct ConfItem *aconf)
        {
                ClassPtr(aconf) = default_class;
                rb_free(aconf->className);
-               DupString(aconf->className, "default");
+               aconf->className = rb_strdup("default");
                return;
        }
 }