summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/conf.c8
-rw-r--r--src/conf_db.c24
-rw-r--r--src/hostmask.c4
-rw-r--r--src/resv.c6
-rw-r--r--src/s_bsd.c2
-rw-r--r--src/s_serv.c4
6 files changed, 23 insertions, 25 deletions
diff --git a/src/conf.c b/src/conf.c
index 8763885..7d04bd0 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -195,8 +195,6 @@ conf_free(struct MaskItem *conf)
if (conf->rsa_public_key)
RSA_free(conf->rsa_public_key);
-
- MyFree(conf->rsa_public_key_file);
#endif
DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
{
@@ -255,7 +253,7 @@ report_confitem_types(struct Client *source_p, enum maskitem_type type)
sendto_one(source_p, form_str(RPL_STATSXLINE),
me.name, source_p->name,
- conf->hold ? "x": "X", conf->count,
+ conf->until ? "x": "X", conf->count,
conf->name, conf->reason);
}
break;
@@ -1617,7 +1615,7 @@ expire_tklines(dlink_list *tklist)
{
conf = ptr->data;
- if (!conf->hold || conf->hold > CurrentTime)
+ if (!conf->until || conf->until > CurrentTime)
continue;
if (conf->type == CONF_XLINE)
@@ -1843,7 +1841,7 @@ clear_out_old_conf(void)
conf->type == CONF_RXLINE ||
conf->type == CONF_RKLINE)
{
- if (!conf->hold)
+ if (!conf->until)
conf_free(conf);
}
else
diff --git a/src/conf_db.c b/src/conf_db.c
index a37840b..4f19ef7 100644
--- a/src/conf_db.c
+++ b/src/conf_db.c
@@ -646,7 +646,7 @@ save_kline_database(void)
SAFE_WRITE(write_string(arec->conf->host, f), KPATH);
SAFE_WRITE(write_string(arec->conf->reason, f), KPATH);
SAFE_WRITE(write_uint64(arec->conf->setat, f), KPATH);
- SAFE_WRITE(write_uint64(arec->conf->hold, f), KPATH);
+ SAFE_WRITE(write_uint64(arec->conf->until, f), KPATH);
}
}
}
@@ -691,7 +691,7 @@ load_kline_database(void)
conf->host = field_2;
conf->reason = field_3;
conf->setat = field_4;
- conf->hold = field_5;
+ conf->until = field_5;
SetConfDatabase(conf);
add_conf_by_address(CONF_KLINE, conf);
@@ -735,7 +735,7 @@ save_dline_database(void)
SAFE_WRITE(write_string(arec->conf->host, f), DLPATH);
SAFE_WRITE(write_string(arec->conf->reason, f), DLPATH);
SAFE_WRITE(write_uint64(arec->conf->setat, f), DLPATH);
- SAFE_WRITE(write_uint64(arec->conf->hold, f), DLPATH);
+ SAFE_WRITE(write_uint64(arec->conf->until, f), DLPATH);
}
}
}
@@ -777,7 +777,7 @@ load_dline_database(void)
conf->host = field_1;
conf->reason = field_2;
conf->setat = field_3;
- conf->hold = field_4;
+ conf->until = field_4;
SetConfDatabase(conf);
add_conf_by_address(CONF_DLINE, conf);
@@ -822,7 +822,7 @@ save_gline_database(void)
SAFE_WRITE(write_string(arec->conf->host, f), GPATH);
SAFE_WRITE(write_string(arec->conf->reason, f), GPATH);
SAFE_WRITE(write_uint64(arec->conf->setat, f), GPATH);
- SAFE_WRITE(write_uint64(arec->conf->hold, f), GPATH);
+ SAFE_WRITE(write_uint64(arec->conf->until, f), GPATH);
}
}
}
@@ -867,7 +867,7 @@ load_gline_database(void)
conf->host = field_2;
conf->reason = field_3;
conf->setat = field_4;
- conf->hold = field_5;
+ conf->until = field_5;
SetConfDatabase(conf);
add_conf_by_address(CONF_GLINE, conf);
@@ -915,7 +915,7 @@ save_resv_database(void)
SAFE_WRITE(write_string(conf->name, f), RESVPATH);
SAFE_WRITE(write_string(conf->reason, f), RESVPATH);
SAFE_WRITE(write_uint64(conf->setat, f), RESVPATH);
- SAFE_WRITE(write_uint64(conf->hold, f), RESVPATH);
+ SAFE_WRITE(write_uint64(conf->until, f), RESVPATH);
}
DLINK_FOREACH(ptr, nresv_items.head)
@@ -928,7 +928,7 @@ save_resv_database(void)
SAFE_WRITE(write_string(conf->name, f), RESVPATH);
SAFE_WRITE(write_string(conf->reason, f), RESVPATH);
SAFE_WRITE(write_uint64(conf->setat, f), RESVPATH);
- SAFE_WRITE(write_uint64(conf->hold, f), RESVPATH);
+ SAFE_WRITE(write_uint64(conf->until, f), RESVPATH);
}
close_db(f);
@@ -969,7 +969,7 @@ load_resv_database(void)
continue;
conf->setat = tmp64_setat;
- conf->hold = tmp64_hold;
+ conf->until = tmp64_hold;
SetConfDatabase(conf);
}
else
@@ -978,7 +978,7 @@ load_resv_database(void)
continue;
conf->setat = tmp64_setat;
- conf->hold = tmp64_hold;
+ conf->until = tmp64_hold;
SetConfDatabase(conf);
}
@@ -1020,7 +1020,7 @@ save_xline_database(void)
SAFE_WRITE(write_string(conf->name, f), XPATH);
SAFE_WRITE(write_string(conf->reason, f), XPATH);
SAFE_WRITE(write_uint64(conf->setat, f), XPATH);
- SAFE_WRITE(write_uint64(conf->hold, f), XPATH);
+ SAFE_WRITE(write_uint64(conf->until, f), XPATH);
}
close_db(f);
@@ -1062,7 +1062,7 @@ load_xline_database(void)
conf->name = name;
conf->reason = reason;
conf->setat = tmp64_setat;
- conf->hold = tmp64_hold;
+ conf->until = tmp64_hold;
}
close_db(f);
diff --git a/src/hostmask.c b/src/hostmask.c
index e6ec09a..35a9fc3 100644
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -749,7 +749,7 @@ clear_out_address_conf(void)
* We keep the temporary K-lines and destroy the permanent ones,
* just to be confusing :) -A1kmm
*/
- if (arec->conf->hold || IsConfDatabase(arec->conf))
+ if (arec->conf->until || IsConfDatabase(arec->conf))
continue;
dlinkDelete(&arec->node, &atable[i]);
@@ -801,7 +801,7 @@ hostmask_expire_temporary(void)
{
struct AddressRec *arec = ptr->data;
- if (!arec->conf->hold || arec->conf->hold > CurrentTime)
+ if (!arec->conf->until || arec->conf->until > CurrentTime)
continue;
switch (arec->type)
diff --git a/src/resv.c b/src/resv.c
index 5fbcbf9..880444f 100644
--- a/src/resv.c
+++ b/src/resv.c
@@ -174,16 +174,16 @@ report_resv(struct Client *source_p)
conf = ptr->data;
sendto_one(source_p, form_str(RPL_STATSQLINE),
me.name, source_p->name,
- conf->hold ? 'q' : 'Q',
+ conf->until ? 'q' : 'Q',
conf->name, conf->reason);
}
DLINK_FOREACH(ptr, nresv_items.head)
{
- conf = ptr->data;;
+ conf = ptr->data;
sendto_one(source_p, form_str(RPL_STATSQLINE),
me.name, source_p->name,
- conf->hold ? 'q' : 'Q',
+ conf->until ? 'q' : 'Q',
conf->name, conf->reason);
}
}
diff --git a/src/s_bsd.c b/src/s_bsd.c
index b3ea5f1..049c46b 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -217,7 +217,7 @@ close_connection(struct Client *client_p)
* Reset next-connect cycle of all connect{} blocks that match
* this servername.
*/
- conf->hold = CurrentTime + conf->class->con_freq;
+ conf->until = CurrentTime + conf->class->con_freq;
}
}
else
diff --git a/src/s_serv.c b/src/s_serv.c
index 118abc4..b6ccd60 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -297,7 +297,7 @@ try_connections(void *unused)
* made one successfull connection... [this algorithm is
* a bit fuzzy... -- msa >;) ]
*/
- if (conf->hold > CurrentTime)
+ if (conf->until > CurrentTime)
continue;
if (conf->class == NULL)
@@ -309,7 +309,7 @@ try_connections(void *unused)
confrq = MIN_CONN_FREQ;
}
- conf->hold = CurrentTime + confrq;
+ conf->until = CurrentTime + confrq;
/* Found a CONNECT config with port specified, scan clients
* and see if this server is already connected?
generated by cgit (git 2.34.1) at 2025-07-15 19:43:43 +0000