]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - src/s_conf.c
projects / irc / rqf / shadowircd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CurrentTime -> rb_currenttime();
[irc/rqf/shadowircd.git] / src / s_conf.c
diff --git a/src/s_conf.c b/src/s_conf.c
index 59cb568bf8e535ae79e01081126fd26859e70723..3951baf909f9925e721a170b4a241574029174cb 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -139,12 +139,12 @@ free_conf(struct ConfItem *aconf)
        if(aconf->spasswd)
                memset(aconf->spasswd, 0, strlen(aconf->spasswd));
 
-       MyFree(aconf->passwd);
-       MyFree(aconf->spasswd);
-       MyFree(aconf->name);
-       MyFree(aconf->className);
-       MyFree(aconf->user);
-       MyFree(aconf->host);
+       rb_free(aconf->passwd);
+       rb_free(aconf->spasswd);
+       rb_free(aconf->name);
+       rb_free(aconf->className);
+       rb_free(aconf->user);
+       rb_free(aconf->host);
 
        BlockHeapFree(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;
@@ -1005,14 +1005,14 @@ static void
 expire_temp_kd(void *list)
 {
        rb_dlink_node *ptr;
-       rb_dlink_node *rb_free(;
+       rb_dlink_node *next_ptr;
        struct ConfItem *aconf;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, ((rb_dlink_list *) list)->head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
        {
                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)
@@ -1031,13 +1031,13 @@ static void
 reorganise_temp_kd(void *list)
 {
        struct ConfItem *aconf;
-       rb_dlink_node *ptr, *rb_free(;
+       rb_dlink_node *ptr, *next_ptr;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, ((rb_dlink_list *) list)->head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
        {
                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]);
@@ -1193,9 +1193,9 @@ free_alias_cb(struct DictionaryElement *ptr, void *unused)
 {
        struct alias_entry *aptr = ptr->data;
 
-       MyFree(aptr->name);
-       MyFree(aptr->target);
-       MyFree(aptr);
+       rb_free(aptr->name);
+       rb_free(aptr->target);
+       rb_free(aptr);
 }
 
 /*
@@ -1210,7 +1210,7 @@ clear_out_old_conf(void)
 {
        struct Class *cltmp;
        rb_dlink_node *ptr;
-       rb_dlink_node *rb_free(;
+       rb_dlink_node *next_ptr;
 
        /*
         * don't delete the class table, rather mark all entries
@@ -1233,19 +1233,19 @@ clear_out_old_conf(void)
 #endif
 
        /* clean out ServerInfo */
-       MyFree(ServerInfo.description);
+       rb_free(ServerInfo.description);
        ServerInfo.description = NULL;
-       MyFree(ServerInfo.network_name);
+       rb_free(ServerInfo.network_name);
        ServerInfo.network_name = NULL;
-       MyFree(ServerInfo.network_desc);
+       rb_free(ServerInfo.network_desc);
        ServerInfo.network_desc = NULL;
 
        /* clean out AdminInfo */
-       MyFree(AdminInfo.name);
+       rb_free(AdminInfo.name);
        AdminInfo.name = NULL;
-       MyFree(AdminInfo.email);
+       rb_free(AdminInfo.email);
        AdminInfo.email = NULL;
-       MyFree(AdminInfo.description);
+       rb_free(AdminInfo.description);
        AdminInfo.description = NULL;
 
        /* operator{} and class{} blocks are freed above */
@@ -1257,12 +1257,12 @@ clear_out_old_conf(void)
         */
 
        /* clean out general */
-       MyFree(ConfigFileEntry.servlink_path);
+       rb_free(ConfigFileEntry.servlink_path);
        ConfigFileEntry.servlink_path = NULL;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, service_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
        {
-               MyFree(ptr->data);
+               rb_free(ptr->data);
                rb_dlinkDestroy(ptr, &service_list);
        }
 
@@ -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;
        }
@@ -1460,16 +1460,16 @@ conf_add_class_to_conf(struct ConfItem *aconf)
                                             aconf->className, aconf->user, aconf->host);
                }
 
-               MyFree(aconf->className);
-               DupString(aconf->className, "default");
+               rb_free(aconf->className);
+               aconf->className = rb_strdup("default");
                return;
        }
 
        if(ConfMaxUsers(aconf) < 0)
        {
                ClassPtr(aconf) = default_class;
-               MyFree(aconf->className);
-               DupString(aconf->className, "default");
+               rb_free(aconf->className);
+               aconf->className = rb_strdup("default");
                return;
        }
 }
Unnamed repository; edit this file 'description' to name the repository.