Minor cleanup to command throttling code:

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index b774e901964cb465beefb92755162e7768ae0e10..ccae53f44f7efe0df2d8f4b5433a3aefb1a1461f 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -260,8 +260,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                return -1;
 
        client_p->localClient->last = rb_current_time();
-       /* Straight up the maximum rate of flooding... */
-       source_p->localClient->allow_read = MAX_FLOOD_BURST;
 
        /* XXX - fixme. we shouldnt have to build a users buffer twice.. */
        if(!IsGotId(source_p) && (strchr(username, '[') != NULL))
@@ -336,7 +334,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                }
 
                /* dont replace username if its supposed to be spoofed --fl */
-               if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->name, '@'))
+               if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'))
                {
                        p = username;
 
@@ -545,8 +543,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        if(++Count.total > Count.max_tot)
                Count.max_tot = Count.total;
 
-       source_p->localClient->allow_read = MAX_FLOOD_BURST;
-
        Count.totalrestartcount++;
 
        s_assert(source_p->localClient != NULL);
@@ -561,7 +557,9 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
        /* they get a reduced limit */
        if(find_tgchange(source_p->sockhost))
-               USED_TARGETS(source_p) = 6;
+               source_p->localClient->targets_free = TGCHANGE_INITIAL_LOW;
+       else
+               source_p->localClient->targets_free = TGCHANGE_INITIAL;
 
        monitor_signon(source_p);
        user_welcome(source_p);
@@ -652,8 +650,8 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 
        if(MyConnect(source_p) && source_p->localClient->passwd)
        {
-               if (ConfigFileEntry.identifyservice[0] != '\0' &&
-                               ConfigFileEntry.identifycommand[0] != '\0')
+               if (!EmptyString(ConfigFileEntry.identifyservice) &&
+                               !EmptyString(ConfigFileEntry.identifycommand))
                {
                        /* use user@server */
                        p = strchr(ConfigFileEntry.identifyservice, '@');
@@ -1071,7 +1069,8 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                        }
                        /* FALLTHROUGH */
                default:
-                       if (MyConnect(source_p) && *pm == 'Q' && !ConfigChannel.use_forward) {
+                       if (MyConnect(source_p) && *pm == 'Q' && !ConfigChannel.use_forward)
+                       {
                                badflag = YES;
                                break;
                        }
@@ -1427,7 +1426,7 @@ change_nick_user_host(struct Client *target_p,    const char *nick, const char *use
                vsnprintf(reason, 255, format, ap);
                va_end(ap);
 
-               sendto_common_channels_local_butone(target_p, ":%s!%s@%s QUIT :%s",
+               sendto_common_channels_local_butone(target_p, NOCAPS, ":%s!%s@%s QUIT :%s",
                                target_p->name, target_p->username, target_p->host,
                                reason);
 
@@ -1469,7 +1468,7 @@ change_nick_user_host(struct Client *target_p,    const char *nick, const char *use
        }
        else if(changed_case)
        {
-               sendto_common_channels_local(target_p, ":%s!%s@%s NICK :%s",
+               sendto_common_channels_local(target_p, NOCAPS, ":%s!%s@%s NICK :%s",
                                target_p->name, target_p->username,
                                target_p->host, nick);
        }