* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_user.c 3293 2007-03-28 14:33:50Z jilles $
+ * $Id: s_user.c 3586 2007-11-20 11:16:43Z nenolod $
*/
#include "stdinc.h"
-#include "tools.h"
#include "s_user.h"
#include "channel.h"
#include "class.h"
#include "listener.h"
#include "msg.h"
#include "numeric.h"
-#include "commio.h"
#include "s_conf.h"
#include "s_newconf.h"
#include "s_log.h"
#include "send.h"
#include "supported.h"
#include "whowas.h"
-#include "memory.h"
#include "packet.h"
#include "reject.h"
#include "cache.h"
int
show_lusers(struct Client *source_p)
{
+ if(rb_dlink_list_length(&lclient_list) > (unsigned long)MaxClientCount)
+ MaxClientCount = rb_dlink_list_length(&lclient_list);
+
+ if((rb_dlink_list_length(&lclient_list) + rb_dlink_list_length(&serv_list)) >
+ (unsigned long)MaxConnectionCount)
+ MaxConnectionCount = rb_dlink_list_length(&lclient_list) +
+ rb_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));
+ Count.invisi, rb_dlink_list_length(&global_serv_list));
- if(dlink_list_length(&oper_list) > 0)
+ if(rb_dlink_list_length(&oper_list) > 0)
sendto_one_numeric(source_p, RPL_LUSEROP,
- form_str(RPL_LUSEROP), dlink_list_length(&oper_list));
+ form_str(RPL_LUSEROP), rb_dlink_list_length(&oper_list));
- if(dlink_list_length(&unknown_list) > 0)
+ if(rb_dlink_list_length(&unknown_list) > 0)
sendto_one_numeric(source_p, RPL_LUSERUNKNOWN,
form_str(RPL_LUSERUNKNOWN),
- dlink_list_length(&unknown_list));
+ rb_dlink_list_length(&unknown_list));
- if(dlink_list_length(&global_channel_list) > 0)
+ if(rb_dlink_list_length(&global_channel_list) > 0)
sendto_one_numeric(source_p, RPL_LUSERCHANNELS,
form_str(RPL_LUSERCHANNELS),
- dlink_list_length(&global_channel_list));
+ rb_dlink_list_length(&global_channel_list));
sendto_one_numeric(source_p, RPL_LUSERME, form_str(RPL_LUSERME),
- dlink_list_length(&lclient_list),
- dlink_list_length(&serv_list));
+ rb_dlink_list_length(&lclient_list),
+ rb_dlink_list_length(&serv_list));
sendto_one_numeric(source_p, RPL_LOCALUSERS,
form_str(RPL_LOCALUSERS),
- dlink_list_length(&lclient_list),
+ rb_dlink_list_length(&lclient_list),
Count.max_loc,
- dlink_list_length(&lclient_list),
+ rb_dlink_list_length(&lclient_list),
Count.max_loc);
sendto_one_numeric(source_p, RPL_GLOBALUSERS, form_str(RPL_GLOBALUSERS),
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];
source_p->flags |= FLAGS_PINGSENT;
return -1;
}
- if(!(source_p->flags2 & FLAGS2_PING_COOKIE))
+ if(!(source_p->flags & FLAGS_PING_COOKIE))
{
return -1;
}
}
/* hasnt finished client cap negotiation */
- if(source_p->flags2 & FLAGS2_CLICAP)
+ if(source_p->flags & FLAGS_CLICAP)
return -1;
/* still has DNSbls to validate against */
- if(dlink_list_length(&source_p->preClient->dnsbl_queries) > 0)
+ if(rb_dlink_list_length(&source_p->preClient->dnsbl_queries) > 0)
return -1;
- client_p->localClient->last = CurrentTime;
+ client_p->localClient->last = rb_current_time();
/* Straight up the maximum rate of flooding... */
source_p->localClient->allow_read = MAX_FLOOD_BURST;
/* Apply nick override */
if(*source_p->preClient->spoofnick)
{
+ char note[NICKLEN + 10];
+
del_from_client_hash(source_p->name, source_p);
strlcpy(source_p->name, source_p->preClient->spoofnick, NICKLEN + 1);
add_to_client_hash(source_p->name, source_p);
- comm_note(source_p->localClient->fd, "Nick: %s", source_p->name);
+
+ rb_snprintf(note, NICKLEN + 10, "Nick: %s", source_p->name);
+ rb_note(source_p->localClient->F, note);
}
if(!valid_hostname(source_p->host))
sendto_one_notice(source_p, ":*** Notice -- You have an illegal character in your hostname");
strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
-
-#ifdef IPV6
- if(ConfigFileEntry.dot_in_ip6_addr == 1)
- strlcat(source_p->host, ".", sizeof(source_p->host));
-#endif
}
if(source_p->localClient->passwd)
{
memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
- MyFree(source_p->localClient->passwd);
+ rb_free(source_p->localClient->passwd);
source_p->localClient->passwd = NULL;
}
}
* -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(rb_dlink_list_length(&lclient_list) >=
+ (unsigned long)GlobalSetOptions.maxclients && !IsConfExemptLimits(aconf))
{
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;
}
source_p->sockhost, source_p->preClient->dnsbl_listed->host);
else
{
- dlink_list varlist = { NULL, NULL, 0 };
+ rb_dlink_list varlist = { NULL, NULL, 0 };
substitution_append_var(&varlist, "nick", source_p->name);
substitution_append_var(&varlist, "ip", source_p->sockhost);
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++;
- ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
+ sendto_one_notice(source_p, ":*** Your username is invalid. Please make sure that your username contains "
+ "only alphanumeric characters.");
+ rb_sprintf(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));
- dlinkMoveNode(&source_p->localClient->tnode, &unknown_list, &lclient_list);
+ del_unknown_ip(source_p);
+ rb_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);
- dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
+ source_p->servptr = &me;
+ rb_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++;
s_assert(source_p->localClient != NULL);
- if(dlink_list_length(&lclient_list) > (unsigned long)Count.max_loc)
+ if(rb_dlink_list_length(&lclient_list) > (unsigned long)Count.max_loc)
{
- Count.max_loc = dlink_list_length(&lclient_list);
+ Count.max_loc = rb_dlink_list_length(&lclient_list);
if(!(Count.max_loc % 10))
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"New Max Local Clients: %d", Count.max_loc);
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))
{
source_p->localClient->passwd);
}
memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
- MyFree(source_p->localClient->passwd);
+ rb_free(source_p->localClient->passwd);
source_p->localClient->passwd = NULL;
}
if(IsConfExemptKline(aconf))
{
SetExemptKline(source_p);
- sendto_one_notice(source_p, ":*** You are exempt from K/D/G/X lines. congrats.");
+ sendto_one_notice(source_p, ":*** You are exempt from K/G/X lines. congrats.");
}
if(IsConfExemptGline(aconf))
/* If this user is exempt from user limits set it F lined" */
if(IsConfExemptLimits(aconf))
{
- SetExemptLimits(source_p);
- sendto_one_notice(source_p, "*** You are exempt from user limits. congrats.");
- }
-
- /* If this user is exempt from idle time outs */
- if(IsConfIdlelined(aconf))
- {
- SetIdlelined(source_p);
- sendto_one_notice(source_p, ":*** You are exempt from idle limits. congrats.");
+ sendto_one_notice(source_p, ":*** You are exempt from user limits. congrats.");
}
if(IsConfExemptFlood(aconf))
*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(source_p, form_str(RPL_SNOMASK), me.name, source_p->name,
+ sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
construct_snobuf(source_p->snomask));
+
return 0;
}
{
++Count.oper;
SetOper(source_p);
- dlinkAddAlloc(source_p, &oper_list);
+ rb_dlinkAddAlloc(source_p, &oper_list);
}
}
else
}
source_p->flags2 &= ~OPER_FLAGS;
- MyFree(source_p->localClient->opername);
+ rb_free(source_p->localClient->opername);
source_p->localClient->opername = NULL;
- dlinkFindDestroy(source_p, &local_oper_list);
+ rb_dlinkFindDestroy(source_p, &local_oper_list);
}
- dlinkFindDestroy(source_p, &oper_list);
+ rb_dlinkFindDestroy(source_p, &oper_list);
}
break;
if(MyClient(source_p) && (source_p->snomask & SNO_NCHANGE) && !IsOperN(source_p))
{
- sendto_one_notice(source_p, ":*** You need oper and N flag for +s +n");
+ sendto_one_notice(source_p, ":*** You need oper and nick_changes flag for +s +n");
source_p->snomask &= ~SNO_NCHANGE; /* only tcm's really need this */
}
if(MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
(!IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p)))
{
- sendto_one_notice(source_p, ":*** You need oper and A flag for +a");
+ sendto_one_notice(source_p, ":*** You need oper and admin flag for +a");
source_p->umodes &= ~UMODE_ADMIN;
}
*/
send_umode_out(client_p, source_p, setflags);
if (showsnomask && MyConnect(source_p))
- sendto_one(source_p, form_str(RPL_SNOMASK), me.name, source_p->name,
+ sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
construct_snobuf(source_p->snomask));
return (0);
{
struct Client *target_p;
char buf[BUFSIZE];
- dlink_node *ptr;
+ rb_dlink_node *ptr;
send_umode(NULL, source_p, old, 0, buf);
- DLINK_FOREACH(ptr, serv_list.head)
+ RB_DLINK_FOREACH(ptr, serv_list.head)
{
target_p = ptr->data;
void
user_welcome(struct Client *source_p)
{
- sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
- ServerInfo.network_name, source_p->name);
- sendto_one(source_p, form_str(RPL_YOURHOST), me.name,
- source_p->name,
+ sendto_one_numeric(source_p, RPL_WELCOME, form_str(RPL_WELCOME), ServerInfo.network_name, source_p->name);
+ sendto_one_numeric(source_p, RPL_YOURHOST, form_str(RPL_YOURHOST),
get_listener_name(source_p->localClient->listener), ircd_version);
-
- sendto_one(source_p, form_str(RPL_CREATED), me.name, source_p->name, creation);
- sendto_one(source_p, form_str(RPL_MYINFO), me.name, source_p->name, me.name, ircd_version, umodebuf);
+ sendto_one_numeric(source_p, RPL_CREATED, form_str(RPL_CREATED), creation);
+ sendto_one_numeric(source_p, RPL_MYINFO, form_str(RPL_MYINFO), me.name, ircd_version, umodebuf);
show_isupport(source_p);
SetExemptKline(source_p);
source_p->flags2 |= oper_p->flags;
- DupString(source_p->localClient->opername, oper_p->name);
+ source_p->localClient->opername = rb_strdup(oper_p->name);
- dlinkAddAlloc(source_p, &local_oper_list);
- dlinkAddAlloc(source_p, &oper_list);
+ rb_dlinkAddAlloc(source_p, &local_oper_list);
+ rb_dlinkAddAlloc(source_p, &oper_list);
if(IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
source_p->umodes |= UMODE_ADMIN;
if((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
--Count.invisi;
send_umode_out(source_p, source_p, old);
- sendto_one(source_p, form_str(RPL_SNOMASK), me.name, source_p->name,
+ sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
construct_snobuf(source_p->snomask));
sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
sendto_one_notice(source_p, ":*** Oper privs are %s", get_oper_privs(oper_p->flags));
change_nick_user_host(struct Client *target_p, const char *nick, const char *user,
const char *host, int newts, char *format, ...)
{
- dlink_node *ptr;
+ rb_dlink_node *ptr;
struct Channel *chptr;
struct membership *mscptr;
int changed = irccmp(target_p->name, nick);
target_p->name, target_p->username, target_p->host,
reason);
- DLINK_FOREACH(ptr, target_p->user->channel.head)
+ RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
{
mscptr = ptr->data;
chptr = mscptr->chptr;
projects / irc / rqf / shadowircd.git / blobdiff