From ff0482a9cb989d23082d0a1ed53c5faa463a8c2f Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 7 Jan 2010 18:14:15 -0600 Subject: [PATCH] Fix up more things with bandb. --- modules/m_resv.c | 12 ++++++------ modules/m_stats.c | 8 ++++---- modules/m_xline.c | 24 ++++++++++++------------ src/hash.c | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/m_resv.c b/modules/m_resv.c index 0ddd10c..7ce57c7 100644 --- a/modules/m_resv.c +++ b/modules/m_resv.c @@ -217,9 +217,9 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te aconf = make_conf(); aconf->status = CONF_RESV_CHANNEL; aconf->port = 0; - aconf->name = rb_strdup(name); + aconf->host = rb_strdup(name); aconf->passwd = rb_strdup(reason); - add_to_resv_hash(aconf->name, aconf); + add_to_resv_hash(aconf->host, aconf); 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); } 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)) { @@ -270,7 +270,7 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te aconf = make_conf(); aconf->status = CONF_RESV_NICK; aconf->port = 0; - aconf->name = rb_strdup(name); + aconf->host = rb_strdup(name); aconf->passwd = rb_strdup(reason); 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); } 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 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; - if(irccmp(aconf->name, name)) + if(irccmp(aconf->host, name)) aconf = NULL; else break; diff --git a/modules/m_stats.c b/modules/m_stats.c index 29e7c7e..92b0e43 100644 --- a/modules/m_stats.c +++ b/modules/m_stats.c @@ -772,7 +772,7 @@ stats_resv(struct Client *source_p) if(!aconf->hold) sendto_one_numeric(source_p, 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) @@ -781,7 +781,7 @@ stats_resv(struct Client *source_p) if(!aconf->hold) sendto_one_numeric(source_p, RPL_STATSQLINE, form_str(RPL_STATSQLINE), - 'Q', aconf->port, aconf->name, aconf->passwd); + 'Q', aconf->port, aconf->host, aconf->passwd); } HASH_WALK_END } @@ -1081,7 +1081,7 @@ stats_tgecos(struct Client *source_p) if(aconf->hold) sendto_one_numeric(source_p, RPL_STATSXLINE, form_str(RPL_STATSXLINE), - 'x', aconf->port, aconf->name, + 'x', aconf->port, aconf->host, aconf->passwd); } } @@ -1099,7 +1099,7 @@ stats_gecos(struct Client *source_p) if(!aconf->hold) sendto_one_numeric(source_p, RPL_STATSXLINE, form_str(RPL_STATSXLINE), - 'X', aconf->port, aconf->name, + 'X', aconf->port, aconf->host, aconf->passwd); } } diff --git a/modules/m_xline.c b/modules/m_xline.c index f3d87dc..ab40172 100644 --- a/modules/m_xline.c +++ b/modules/m_xline.c @@ -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) { 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; } @@ -220,7 +220,7 @@ handle_remote_xline(struct Client *source_p, int temp_time, const char *name, co /* already xlined */ 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); return; } @@ -306,13 +306,13 @@ apply_xline(struct Client *source_p, const char *name, const char *reason, int t } *new = '\0'; - aconf->name = rb_strdup(tmp); + aconf->host = rb_strdup(tmp); } else - aconf->name = rb_strdup(name); + aconf->host = rb_strdup(name); aconf->passwd = rb_strdup(reason); - collapse(aconf->name); + collapse(aconf->host); 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, "%s added temporary %d min. X-Line for [%s] [%s]", get_oper_name(source_p), temp_time / 60, - aconf->name, reason); + aconf->host, reason); ilog(L_KLINE, "X %s %d %s %s", get_oper_name(source_p), temp_time / 60, name, reason); sendto_one_notice(source_p, ":Added temporary %d min. X-Line [%s]", - temp_time / 60, aconf->name); + temp_time / 60, aconf->host); } else { 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]", - 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); } @@ -480,7 +480,7 @@ remove_xline(struct Client *source_p, const char *name) { aconf = ptr->data; - if(!irccmp(aconf->name, name)) + if(!irccmp(aconf->host, name)) { 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); } - remove_reject_mask(aconf->name, NULL); + remove_reject_mask(aconf->host, NULL); free_conf(aconf); rb_dlinkDestroy(ptr, &xline_conf_list); return; diff --git a/src/hash.c b/src/hash.c index 10e3506..5386856 100644 --- a/src/hash.c +++ b/src/hash.c @@ -632,7 +632,7 @@ hash_find_resv(const char *name) { aconf = ptr->data; - if(!irccmp(name, aconf->name)) + if(!irccmp(name, aconf->host)) { aconf->port++; return aconf;