* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_user.c 3368 2007-04-03 10:11:06Z nenolod $
+ * $Id: s_user.c 3586 2007-11-20 11:16:43Z nenolod $
*/
#include "stdinc.h"
int
show_lusers(struct Client *source_p)
{
+ if(dlink_list_length(&lclient_list) > (unsigned long)MaxClientCount)
+ MaxClientCount = dlink_list_length(&lclient_list);
+
+ if((dlink_list_length(&lclient_list) + dlink_list_length(&serv_list)) >
+ (unsigned long)MaxConnectionCount)
+ MaxConnectionCount = dlink_list_length(&lclient_list) +
+ dlink_list_length(&serv_list);
+
sendto_one_numeric(source_p, RPL_LUSERCLIENT, form_str(RPL_LUSERCLIENT),
(Count.total - Count.invisi),
Count.invisi, dlink_list_length(&global_serv_list));
MaxConnectionCount, MaxClientCount,
Count.totalrestartcount);
- if(dlink_list_length(&lclient_list) > (unsigned long)MaxClientCount)
- MaxClientCount = dlink_list_length(&lclient_list);
-
- if((dlink_list_length(&lclient_list) + dlink_list_length(&serv_list)) >
- (unsigned long)MaxConnectionCount)
- MaxConnectionCount = dlink_list_length(&lclient_list) +
- dlink_list_length(&serv_list);
-
return 0;
}
int
register_local_user(struct Client *client_p, struct Client *source_p, const char *username)
{
- struct ConfItem *aconf;
+ struct ConfItem *aconf, *xconf;
struct User *user = source_p->user;
char tmpstr2[IRCD_BUFSIZE];
char ipaddr[HOSTIPLEN];
* -Taner
*/
/* Except "F:" clients */
- if(((dlink_list_length(&lclient_list) + 1) >=
- ((unsigned long)GlobalSetOptions.maxclients + MAX_BUFFER) ||
- (dlink_list_length(&lclient_list) + 1) >=
- ((unsigned long)GlobalSetOptions.maxclients - 5)) && !(IsExemptLimits(source_p)))
+ if(dlink_list_length(&lclient_list) >=
+ (unsigned long)GlobalSetOptions.maxclients && !IsExemptLimits(source_p))
{
sendto_realops_snomask(SNO_FULL, L_ALL,
"Too many clients, rejecting %s[%s].", source_p->name, source_p->host);
/* kline exemption extends to xline too */
if(!IsExemptKline(source_p) &&
- find_xline(source_p->info, 1) != NULL)
+ (xconf = find_xline(source_p->info, 1)) != NULL)
{
ServerStats->is_ref++;
- add_reject(source_p);
+ add_reject(source_p, xconf->name, NULL);
exit_client(client_p, source_p, &me, "Bad user info");
return CLIENT_EXITED;
}
sendto_one_notice(source_p, ":*** Your IP address %s is listed in %s",
source_p->sockhost, source_p->preClient->dnsbl_listed->host);
source_p->preClient->dnsbl_listed->hits++;
- add_reject(source_p);
+ add_reject(source_p, NULL, NULL);
exit_client(client_p, source_p, &me, "*** Banned (DNS blacklist)");
return CLIENT_EXITED;
}
"Invalid username: %s (%s@%s)",
source_p->name, source_p->username, source_p->host);
ServerStats->is_ref++;
+ sendto_one_notice(source_p, ":*** Your username is invalid. Please make sure that your username contains "
+ "only alphanumeric characters.");
ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
exit_client(client_p, source_p, &me, tmpstr2);
return (CLIENT_EXITED);
SetDynSpoof(source_p);
}
- if(IsAnyDead(client_p))
+ source_p->umodes |= ConfigFileEntry.default_umodes & ~ConfigFileEntry.oper_only_umodes & ~orphaned_umodes;
+
+ call_hook(h_new_local_user, source_p);
+
+ /* If they have died in send_* or were thrown out by the
+ * new_local_user hook don't do anything. */
+ if(IsAnyDead(source_p))
return CLIENT_EXITED;
+ /* To avoid inconsistencies, do not abort the registration
+ * starting from this point -- jilles
+ */
inetntop_sock((struct sockaddr *)&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
sendto_realops_snomask(SNO_CCONN, L_ALL,
show_ip(NULL, source_p) ? source_p->localClient->fullcaps : "<hidden> <hidden>",
source_p->info);
- /* If they have died in send_* don't do anything. */
- if(IsAnyDead(source_p))
- return CLIENT_EXITED;
-
add_to_hostname_hash(source_p->orighost, source_p);
/* Allocate a UID if it was not previously allocated.
add_to_id_hash(source_p->id, source_p);
}
- source_p->umodes |= ConfigFileEntry.default_umodes & ~ConfigFileEntry.oper_only_umodes & ~orphaned_umodes;
-
if (source_p->umodes & UMODE_INVISIBLE)
Count.invisi++;
s_assert(!IsClient(source_p));
+ del_unknown_ip(source_p);
dlinkMoveNode(&source_p->localClient->tnode, &unknown_list, &lclient_list);
SetClient(source_p);
- /* XXX source_p->servptr is &me, since local client */
- source_p->servptr = find_server(NULL, user->server);
+ source_p->servptr = &me;
dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
+
/* Increment our total user count here */
if(++Count.total > Count.max_tot)
Count.max_tot = Count.total;
+
source_p->localClient->allow_read = MAX_FLOOD_BURST;
Count.totalrestartcount++;
if(find_tgchange(source_p->sockhost))
USED_TARGETS(source_p) = 6;
- call_hook(h_new_local_user, source_p);
-
monitor_signon(source_p);
user_welcome(source_p);
nick, source_p->hopcount + 1,
(long) source_p->tsinfo,
ubuf, source_p->username, source_p->host,
- user->server, source_p->info);
+ source_p->servptr->name, source_p->info);
}
else
sendto_server(client_p, NULL, NOCAPS, NOCAPS,
nick, source_p->hopcount + 1,
(long) source_p->tsinfo,
ubuf, source_p->username, source_p->host,
- user->server, source_p->info);
+ source_p->servptr->name, source_p->info);
if (IsDynSpoof(source_p))
{
*m++ = (char) i;
*m = '\0';
- sendto_one(source_p, form_str(RPL_UMODEIS), me.name, source_p->name, buf);
+ sendto_one_numeric(source_p, RPL_UMODEIS, form_str(RPL_UMODEIS), buf);
if (source_p->snomask != 0)
sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),