Fix up more things with bandb.
This commit is contained in:
parent
80c9ac516e
commit
23959371d0
4 changed files with 23 additions and 23 deletions
|
@ -217,9 +217,9 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
|
||||||
aconf = make_conf();
|
aconf = make_conf();
|
||||||
aconf->status = CONF_RESV_CHANNEL;
|
aconf->status = CONF_RESV_CHANNEL;
|
||||||
aconf->port = 0;
|
aconf->port = 0;
|
||||||
aconf->name = rb_strdup(name);
|
aconf->host = rb_strdup(name);
|
||||||
aconf->passwd = rb_strdup(reason);
|
aconf->passwd = rb_strdup(reason);
|
||||||
add_to_resv_hash(aconf->name, aconf);
|
add_to_resv_hash(aconf->host, aconf);
|
||||||
|
|
||||||
if(temp_time > 0)
|
if(temp_time > 0)
|
||||||
{
|
{
|
||||||
|
@ -235,7 +235,7 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
|
||||||
temp_time / 60, name);
|
temp_time / 60, name);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
bandb_add(BANDB_RESV, source_p, aconf->name, NULL, aconf->passwd, NULL, 0);
|
bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
|
||||||
}
|
}
|
||||||
else if(clean_resv_nick(name))
|
else if(clean_resv_nick(name))
|
||||||
{
|
{
|
||||||
|
@ -270,7 +270,7 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
|
||||||
aconf = make_conf();
|
aconf = make_conf();
|
||||||
aconf->status = CONF_RESV_NICK;
|
aconf->status = CONF_RESV_NICK;
|
||||||
aconf->port = 0;
|
aconf->port = 0;
|
||||||
aconf->name = rb_strdup(name);
|
aconf->host = rb_strdup(name);
|
||||||
aconf->passwd = rb_strdup(reason);
|
aconf->passwd = rb_strdup(reason);
|
||||||
rb_dlinkAddAlloc(aconf, &resv_conf_list);
|
rb_dlinkAddAlloc(aconf, &resv_conf_list);
|
||||||
|
|
||||||
|
@ -288,7 +288,7 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
|
||||||
temp_time / 60, name);
|
temp_time / 60, name);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
bandb_add(BANDB_RESV, source_p, aconf->name, NULL, aconf->passwd, NULL, 0);
|
bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
sendto_one_notice(source_p, ":You have specified an invalid resv: [%s]", name);
|
sendto_one_notice(source_p, ":You have specified an invalid resv: [%s]", name);
|
||||||
|
@ -461,7 +461,7 @@ remove_resv(struct Client *source_p, const char *name)
|
||||||
{
|
{
|
||||||
aconf = ptr->data;
|
aconf = ptr->data;
|
||||||
|
|
||||||
if(irccmp(aconf->name, name))
|
if(irccmp(aconf->host, name))
|
||||||
aconf = NULL;
|
aconf = NULL;
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -772,7 +772,7 @@ stats_resv(struct Client *source_p)
|
||||||
if(!aconf->hold)
|
if(!aconf->hold)
|
||||||
sendto_one_numeric(source_p, RPL_STATSQLINE,
|
sendto_one_numeric(source_p, RPL_STATSQLINE,
|
||||||
form_str(RPL_STATSQLINE),
|
form_str(RPL_STATSQLINE),
|
||||||
'Q', aconf->port, aconf->name, aconf->passwd);
|
'Q', aconf->port, aconf->host, aconf->passwd);
|
||||||
}
|
}
|
||||||
|
|
||||||
HASH_WALK(i, R_MAX, ptr, resvTable)
|
HASH_WALK(i, R_MAX, ptr, resvTable)
|
||||||
|
@ -781,7 +781,7 @@ stats_resv(struct Client *source_p)
|
||||||
if(!aconf->hold)
|
if(!aconf->hold)
|
||||||
sendto_one_numeric(source_p, RPL_STATSQLINE,
|
sendto_one_numeric(source_p, RPL_STATSQLINE,
|
||||||
form_str(RPL_STATSQLINE),
|
form_str(RPL_STATSQLINE),
|
||||||
'Q', aconf->port, aconf->name, aconf->passwd);
|
'Q', aconf->port, aconf->host, aconf->passwd);
|
||||||
}
|
}
|
||||||
HASH_WALK_END
|
HASH_WALK_END
|
||||||
}
|
}
|
||||||
|
@ -1081,7 +1081,7 @@ stats_tgecos(struct Client *source_p)
|
||||||
if(aconf->hold)
|
if(aconf->hold)
|
||||||
sendto_one_numeric(source_p, RPL_STATSXLINE,
|
sendto_one_numeric(source_p, RPL_STATSXLINE,
|
||||||
form_str(RPL_STATSXLINE),
|
form_str(RPL_STATSXLINE),
|
||||||
'x', aconf->port, aconf->name,
|
'x', aconf->port, aconf->host,
|
||||||
aconf->passwd);
|
aconf->passwd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1099,7 +1099,7 @@ stats_gecos(struct Client *source_p)
|
||||||
if(!aconf->hold)
|
if(!aconf->hold)
|
||||||
sendto_one_numeric(source_p, RPL_STATSXLINE,
|
sendto_one_numeric(source_p, RPL_STATSXLINE,
|
||||||
form_str(RPL_STATSXLINE),
|
form_str(RPL_STATSXLINE),
|
||||||
'X', aconf->port, aconf->name,
|
'X', aconf->port, aconf->host,
|
||||||
aconf->passwd);
|
aconf->passwd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -158,7 +158,7 @@ mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char
|
||||||
if((aconf = find_xline_mask(name)) != NULL)
|
if((aconf = find_xline_mask(name)) != NULL)
|
||||||
{
|
{
|
||||||
sendto_one(source_p, ":%s NOTICE %s :[%s] already X-Lined by [%s] - %s",
|
sendto_one(source_p, ":%s NOTICE %s :[%s] already X-Lined by [%s] - %s",
|
||||||
me.name, source_p->name, name, aconf->name, aconf->passwd);
|
me.name, source_p->name, name, aconf->host, aconf->passwd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -220,7 +220,7 @@ handle_remote_xline(struct Client *source_p, int temp_time, const char *name, co
|
||||||
/* already xlined */
|
/* already xlined */
|
||||||
if((aconf = find_xline_mask(name)) != NULL)
|
if((aconf = find_xline_mask(name)) != NULL)
|
||||||
{
|
{
|
||||||
sendto_one_notice(source_p, ":[%s] already X-Lined by [%s] - %s", name, aconf->name,
|
sendto_one_notice(source_p, ":[%s] already X-Lined by [%s] - %s", name, aconf->host,
|
||||||
aconf->passwd);
|
aconf->passwd);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -306,13 +306,13 @@ apply_xline(struct Client *source_p, const char *name, const char *reason, int t
|
||||||
}
|
}
|
||||||
|
|
||||||
*new = '\0';
|
*new = '\0';
|
||||||
aconf->name = rb_strdup(tmp);
|
aconf->host = rb_strdup(tmp);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
aconf->name = rb_strdup(name);
|
aconf->host = rb_strdup(name);
|
||||||
|
|
||||||
aconf->passwd = rb_strdup(reason);
|
aconf->passwd = rb_strdup(reason);
|
||||||
collapse(aconf->name);
|
collapse(aconf->host);
|
||||||
|
|
||||||
if(temp_time > 0)
|
if(temp_time > 0)
|
||||||
{
|
{
|
||||||
|
@ -321,20 +321,20 @@ apply_xline(struct Client *source_p, const char *name, const char *reason, int t
|
||||||
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
||||||
"%s added temporary %d min. X-Line for [%s] [%s]",
|
"%s added temporary %d min. X-Line for [%s] [%s]",
|
||||||
get_oper_name(source_p), temp_time / 60,
|
get_oper_name(source_p), temp_time / 60,
|
||||||
aconf->name, reason);
|
aconf->host, reason);
|
||||||
ilog(L_KLINE, "X %s %d %s %s",
|
ilog(L_KLINE, "X %s %d %s %s",
|
||||||
get_oper_name(source_p), temp_time / 60, name, reason);
|
get_oper_name(source_p), temp_time / 60, name, reason);
|
||||||
sendto_one_notice(source_p, ":Added temporary %d min. X-Line [%s]",
|
sendto_one_notice(source_p, ":Added temporary %d min. X-Line [%s]",
|
||||||
temp_time / 60, aconf->name);
|
temp_time / 60, aconf->host);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s added X-Line for [%s] [%s]",
|
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s added X-Line for [%s] [%s]",
|
||||||
get_oper_name(source_p), aconf->name, aconf->passwd);
|
get_oper_name(source_p), aconf->host, aconf->passwd);
|
||||||
sendto_one_notice(source_p, ":Added X-Line for [%s] [%s]",
|
sendto_one_notice(source_p, ":Added X-Line for [%s] [%s]",
|
||||||
aconf->name, aconf->passwd);
|
aconf->host, aconf->passwd);
|
||||||
|
|
||||||
bandb_add(BANDB_XLINE, source_p, aconf->name, NULL, aconf->passwd, NULL, 0);
|
bandb_add(BANDB_XLINE, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
|
||||||
ilog(L_KLINE, "X %s 0 %s %s", get_oper_name(source_p), name, aconf->passwd);
|
ilog(L_KLINE, "X %s 0 %s %s", get_oper_name(source_p), name, aconf->passwd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -480,7 +480,7 @@ remove_xline(struct Client *source_p, const char *name)
|
||||||
{
|
{
|
||||||
aconf = ptr->data;
|
aconf = ptr->data;
|
||||||
|
|
||||||
if(!irccmp(aconf->name, name))
|
if(!irccmp(aconf->host, name))
|
||||||
{
|
{
|
||||||
if(!aconf->hold)
|
if(!aconf->hold)
|
||||||
{
|
{
|
||||||
|
@ -501,7 +501,7 @@ remove_xline(struct Client *source_p, const char *name)
|
||||||
ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), name);
|
ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), name);
|
||||||
}
|
}
|
||||||
|
|
||||||
remove_reject_mask(aconf->name, NULL);
|
remove_reject_mask(aconf->host, NULL);
|
||||||
free_conf(aconf);
|
free_conf(aconf);
|
||||||
rb_dlinkDestroy(ptr, &xline_conf_list);
|
rb_dlinkDestroy(ptr, &xline_conf_list);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -632,7 +632,7 @@ hash_find_resv(const char *name)
|
||||||
{
|
{
|
||||||
aconf = ptr->data;
|
aconf = ptr->data;
|
||||||
|
|
||||||
if(!irccmp(name, aconf->name))
|
if(!irccmp(name, aconf->host))
|
||||||
{
|
{
|
||||||
aconf->port++;
|
aconf->port++;
|
||||||
return aconf;
|
return aconf;
|
||||||
|
|
Loading…
Reference in a new issue