From 51d185d9c8adfa87cbc5376beebb6c467a6a1bd2 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Sat, 3 Jan 2009 15:35:45 -0500 Subject: [PATCH] Convert new_user_func_t to return void. This way, a function only has to worry about killing a user or not, rather than doing that and then returning a corresponding value. src/hash.h (new_user_func_t): Return void instead of int. src/global.c (global_process_user): Likewise. src/mod-blacklist.c (blacklist_check_user): Likewise. src/mod-snoop.c (snoop_new_user): Likewise. src/mod-sockcheck.c (sockcheck_new_user): Likewise. src/nickserv.c (check_user_nick): Likewise. (handle_new_user): Delete. (init_nickserv): Register check_user_nick() directly. src/opserv.c (opserv_new_user_check): Likewise. src/proto-bahamut.c (AddUser): Do not check new_user_func return values. src/proto-p10.c (AddUser): Likewise. --- src/global.c | 6 ++---- src/hash.h | 2 +- src/mod-blacklist.c | 9 ++++----- src/mod-snoop.c | 7 +++---- src/mod-sockcheck.c | 3 +-- src/nickserv.c | 17 +++++------------ src/opserv.c | 8 +++----- src/proto-bahamut.c | 5 ++--- src/proto-p10.c | 3 +-- 9 files changed, 22 insertions(+), 38 deletions(-) diff --git a/src/global.c b/src/global.c index cadbf3c..4f263e2 100644 --- a/src/global.c +++ b/src/global.c @@ -543,11 +543,11 @@ static GLOBAL_FUNC(cmd_messages) return 1; } -static int +static void global_process_user(struct userNode *user) { if(IsLocal(user) || self->uplink->burst || user->uplink->burst) - return 0; + return; send_messages(user, MESSAGE_RECIPIENT_LUSERS, 1); /* only alert on new usercount if the record was broken in the last @@ -561,8 +561,6 @@ global_process_user(struct userNode *user) global_message(MESSAGE_RECIPIENT_OPERS, message); last_max_alert = now; } - - return 0; } static void diff --git a/src/hash.h b/src/hash.h index a1a2c91..0611f84 100644 --- a/src/hash.h +++ b/src/hash.h @@ -205,7 +205,7 @@ int userList_contains(struct userList *list, struct userNode *user); typedef void (*server_link_func_t) (struct server *server); void reg_server_link_func(server_link_func_t handler); -typedef int (*new_user_func_t) (struct userNode *user); +typedef void (*new_user_func_t) (struct userNode *user); void reg_new_user_func(new_user_func_t handler); typedef void (*del_user_func_t) (struct userNode *user, struct userNode *killer, const char *why); void reg_del_user_func(del_user_func_t handler); diff --git a/src/mod-blacklist.c b/src/mod-blacklist.c index 0e8efbe..c06ef7d 100644 --- a/src/mod-blacklist.c +++ b/src/mod-blacklist.c @@ -158,7 +158,7 @@ dnsbl_hit(struct sar_request *req, struct dns_header *hdr, struct dns_rr *rr, un free(txt); } -static int +static void blacklist_check_user(struct userNode *user) { static const char *hexdigits = "0123456789abcdef"; @@ -172,11 +172,11 @@ blacklist_check_user(struct userNode *user) /* Users added during burst should not be checked. */ if (user->uplink->burst) - return 0; + return; /* Users with bogus IPs are probably service bots. */ if (!irc_in_addr_is_valid(user->ip)) - return 0; + return; /* Check local file-based blacklist. */ irc_ntop(ip, sizeof(ip), &user->ip); @@ -205,7 +205,7 @@ blacklist_check_user(struct userNode *user) } dnsbl_len = 48; } else { - return 0; + return; } /* Start a lookup for the appropriate hostname in each DNSBL. */ @@ -223,7 +223,6 @@ blacklist_check_user(struct userNode *user) strcpy(data->zone_name, zone); } } - return 0; } static void diff --git a/src/mod-snoop.c b/src/mod-snoop.c index 84ecd66..1ca24c8 100644 --- a/src/mod-snoop.c +++ b/src/mod-snoop.c @@ -98,13 +98,12 @@ snoop_kick(struct userNode *kicker, struct userNode *victim, struct chanNode *ch SNOOP("$bKICK$b %s from %s by %s", victim->nick, chan->name, (kicker ? kicker->nick : "some server")); } -static int +static void snoop_new_user(struct userNode *user) { - if (!snoop_cfg.enabled) return 0; - if (user->uplink->burst && !snoop_cfg.show_bursts) return 0; + if (!snoop_cfg.enabled) return; + if (user->uplink->burst && !snoop_cfg.show_bursts) return; UPDATE_TIMESTAMP(); SNOOP("$bNICK$b %s %s@%s [%s] on %s", user->nick, user->ident, user->hostname, irc_ntoa(&user->ip), user->uplink->name); - return 0; } static void diff --git a/src/mod-sockcheck.c b/src/mod-sockcheck.c index cd78ba8..6652528 100644 --- a/src/mod-sockcheck.c +++ b/src/mod-sockcheck.c @@ -1099,14 +1099,13 @@ static MODCMD_FUNC(cmd_stats_proxycheck) } } -static int +static void sockcheck_new_user(struct userNode *user) { /* If they have a bum IP, or are bursting in, don't proxy-check or G-line them. */ if (irc_in_addr_is_valid(user->ip) && !irc_in_addr_is_loopback(user->ip) && !user->uplink->burst) sockcheck_queue_address(user->ip); - return 0; } static void diff --git a/src/nickserv.c b/src/nickserv.c index 7df54b1..024364f 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -3954,32 +3954,25 @@ nickserv_reclaim_p(void *data) { nickserv_reclaim(user, ni, nickserv_conf.auto_reclaim_action); } -static int +static void check_user_nick(struct userNode *user) { struct nick_info *ni; user->modes &= ~FLAGS_REGNICK; if (!(ni = get_nick_info(user->nick))) - return 0; + return; if (user->handle_info == ni->owner) { user->modes |= FLAGS_REGNICK; irc_regnick(user); - return 0; + return; } if (nickserv_conf.warn_nick_owned) send_message(user, nickserv, "NSMSG_RECLAIM_WARN", ni->nick, ni->owner->handle); if (nickserv_conf.auto_reclaim_action == RECLAIM_NONE) - return 0; + return; if (nickserv_conf.auto_reclaim_delay) timeq_add(now + nickserv_conf.auto_reclaim_delay, nickserv_reclaim_p, user); else nickserv_reclaim(user, ni, nickserv_conf.auto_reclaim_action); - return 0; -} - -int -handle_new_user(struct userNode *user) -{ - return check_user_nick(user); } void @@ -4086,7 +4079,7 @@ init_nickserv(const char *nick) { unsigned int i; NS_LOG = log_register_type("NickServ", "file:nickserv.log"); - reg_new_user_func(handle_new_user); + reg_new_user_func(check_user_nick); reg_nick_change_func(handle_nick_change); reg_del_user_func(nickserv_remove_user); reg_account_func(handle_account); diff --git a/src/opserv.c b/src/opserv.c index a661f23..ebfa775 100644 --- a/src/opserv.c +++ b/src/opserv.c @@ -1815,7 +1815,7 @@ opserv_part_channel(void *data) static int alert_check_user(const char *key, void *data, void *extra); -static int +static void opserv_new_user_check(struct userNode *user) { struct opserv_hostinfo *ohi; @@ -1824,11 +1824,11 @@ opserv_new_user_check(struct userNode *user) /* Check to see if we should ignore them entirely. */ if (IsLocal(user) || IsService(user)) - return 0; + return; /* Check for alerts, and stop if we find one that kills them. */ if (dict_foreach(opserv_user_alerts, alert_check_user, user)) - return 1; + return; /* Gag them if appropriate. */ for (gag = gagList; gag; gag = gag->next) { @@ -1877,8 +1877,6 @@ opserv_new_user_check(struct userNode *user) gline_add(opserv->nick, target, opserv_conf.clone_gline_duration, "AUTO Excessive connections from a single host.", now, now, 1); } } - - return 0; } static void diff --git a/src/proto-bahamut.c b/src/proto-bahamut.c index e7f0b2b..eae05c6 100644 --- a/src/proto-bahamut.c +++ b/src/proto-bahamut.c @@ -168,9 +168,8 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char * if (dummy) uNode->modes |= FLAGS_DUMMY; if (stamp) call_account_func(uNode, NULL, 0, stamp); if (IsLocal(uNode)) irc_user(uNode); - for (nn=0; (nndead; nn++) { - if (nuf_list[nn](uNode)) break; - } + for (nn=0; (nndead; nn++) + nuf_list[nn](uNode); return uNode; } diff --git a/src/proto-p10.c b/src/proto-p10.c index d288524..8174a69 100644 --- a/src/proto-p10.c +++ b/src/proto-p10.c @@ -2139,8 +2139,7 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char * if (IsLocal(uNode)) irc_user(uNode); for (n=0; (ndead; n++) - if (nuf_list[n](uNode)) - break; + nuf_list[n](uNode); return uNode; } -- 2.20.1