#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];
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);
}
{
struct ConfItem *aconf;
- aconf = BlockHeapAlloc(confitem_heap);
+ aconf = rb_bh_alloc(confitem_heap);
aconf->status = CONF_ILLEGAL;
return (aconf);
}
rb_free(aconf->user);
rb_free(aconf->host);
- BlockHeapFree(confitem_heap, aconf);
+ rb_bh_free(confitem_heap, aconf);
}
/*
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;
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;
{
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)
{
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]);
}
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]);
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)