/*
- * ircd-ratbox: A slightly useful ircd.
+ * charybdis: an advanced ircd.
* client.c: Controls clients.
*
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2005 ircd-ratbox development team
+ * Copyright (C) 2007 William Pitcock
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "stdinc.h"
#include "config.h"
-#include "tools.h"
#include "client.h"
#include "class.h"
#include "common.h"
-#include "event.h"
#include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
-#include "s_gline.h"
#include "numeric.h"
#include "packet.h"
#include "s_auth.h"
-#include "commio.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
#include "s_serv.h"
#include "s_stats.h"
#include "send.h"
#include "whowas.h"
#include "s_user.h"
-#include "linebuf.h"
#include "hash.h"
-#include "memory.h"
#include "hostmask.h"
-#include "balloc.h"
#include "listener.h"
#include "hook.h"
#include "msg.h"
#include "monitor.h"
#include "blacklist.h"
#include "reject.h"
+#include "scache.h"
+#include "irc_dictionary.h"
+#include "sslproc.h"
#define DEBUG_EXITED_CLIENTS
-static void check_pings_list(dlink_list * list);
-static void check_unknowns_list(dlink_list * list);
+static void check_pings_list(rb_dlink_list * list);
+static void check_unknowns_list(rb_dlink_list * list);
static void free_exited_clients(void *unused);
static void exit_aborted_clients(void *unused);
static EVH check_pings;
-extern BlockHeap *client_heap;
-extern BlockHeap *lclient_heap;
-extern BlockHeap *pclient_heap;
+static rb_bh *client_heap = NULL;
+static rb_bh *lclient_heap = NULL;
+static rb_bh *pclient_heap = NULL;
+static rb_bh *user_heap = NULL;
+static rb_bh *away_heap = NULL;
+static char current_uid[IDLEN];
-extern char current_uid[IDLEN];
+struct Dictionary *nd_dict = NULL;
enum
{
D_LINED,
- K_LINED,
- G_LINED
+ K_LINED
};
-dlink_list dead_list;
+rb_dlink_list dead_list;
#ifdef DEBUG_EXITED_CLIENTS
-static dlink_list dead_remote_list;
+static rb_dlink_list dead_remote_list;
#endif
struct abort_client
{
- dlink_node node;
+ rb_dlink_node node;
struct Client *client;
char notice[REASONLEN];
};
-static dlink_list abort_list;
+static rb_dlink_list abort_list;
/*
* start off the check ping event .. -- adrian
* Every 30 seconds is plenty -- db
*/
- client_heap = BlockHeapCreate(sizeof(struct Client), CLIENT_HEAP_SIZE);
- lclient_heap = BlockHeapCreate(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
- pclient_heap = BlockHeapCreate(sizeof(struct PreClient), PCLIENT_HEAP_SIZE);
- eventAddIsh("check_pings", check_pings, NULL, 30);
- eventAddIsh("free_exited_clients", &free_exited_clients, NULL, 4);
- eventAddIsh("exit_aborted_clients", exit_aborted_clients, NULL, 1);
+ client_heap = rb_bh_create(sizeof(struct Client), CLIENT_HEAP_SIZE, "client_heap");
+ lclient_heap = rb_bh_create(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE, "lclient_heap");
+ pclient_heap = rb_bh_create(sizeof(struct PreClient), PCLIENT_HEAP_SIZE, "pclient_heap");
+ user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
+ away_heap = rb_bh_create(AWAYLEN, AWAY_HEAP_SIZE, "away_heap");
+
+ rb_event_addish("check_pings", check_pings, NULL, 30);
+ rb_event_addish("free_exited_clients", &free_exited_clients, NULL, 4);
+ rb_event_addish("exit_aborted_clients", exit_aborted_clients, NULL, 1);
+ rb_event_add("flood_recalc", flood_recalc, NULL, 1);
+
+ nd_dict = irc_dictionary_create(irccmp);
}
struct Client *client_p = NULL;
struct LocalUser *localClient;
- client_p = BlockHeapAlloc(client_heap);
+ client_p = rb_bh_alloc(client_heap);
if(from == NULL)
{
client_p->from = client_p; /* 'from' of local client is self! */
- localClient = (struct LocalUser *) BlockHeapAlloc(lclient_heap);
+ localClient = rb_bh_alloc(lclient_heap);
SetMyConnect(client_p);
client_p->localClient = localClient;
- client_p->localClient->lasttime = client_p->localClient->firsttime = CurrentTime;
+ client_p->localClient->lasttime = client_p->localClient->firsttime = rb_current_time();
- client_p->localClient->fd = -1;
- client_p->localClient->ctrlfd = -1;
+ client_p->localClient->F = NULL;
- client_p->preClient = (struct PreClient *) BlockHeapAlloc(pclient_heap);
+ client_p->preClient = rb_bh_alloc(pclient_heap);;
/* as good a place as any... */
- dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
+ rb_dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
}
else
{ /* from is not NULL */
if (blptr != NULL)
unref_blacklist(blptr);
abort_blacklist_queries(client_p);
- BlockHeapFree(pclient_heap, client_p->preClient);
+ rb_bh_free(pclient_heap, client_p->preClient);
client_p->preClient = NULL;
}
client_p->localClient->listener = 0;
}
- if(client_p->localClient->fd >= 0)
- comm_close(client_p->localClient->fd);
+ if(client_p->localClient->F != NULL)
+ {
+ del_from_cli_fd_hash(client_p);
+ rb_close(client_p->localClient->F);
+ }
if(client_p->localClient->passwd)
{
memset(client_p->localClient->passwd, 0,
strlen(client_p->localClient->passwd));
- MyFree(client_p->localClient->passwd);
+ rb_free(client_p->localClient->passwd);
}
- MyFree(client_p->localClient->challenge);
- MyFree(client_p->localClient->fullcaps);
- MyFree(client_p->localClient->opername);
- MyFree(client_p->localClient->mangledhost);
+ rb_free(client_p->localClient->challenge);
+ rb_free(client_p->localClient->fullcaps);
+ rb_free(client_p->localClient->opername);
+ rb_free(client_p->localClient->mangledhost);
+ if (client_p->localClient->privset)
+ privilegeset_unref(client_p->localClient->privset);
+
+ if(IsSSL(client_p))
+ ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+
+ if(IsCapable(client_p, CAP_ZIP))
+ ssld_decrement_clicount(client_p->localClient->z_ctl);
- BlockHeapFree(lclient_heap, client_p->localClient);
+ rb_bh_free(lclient_heap, client_p->localClient);
client_p->localClient = NULL;
}
s_assert(&me != client_p);
free_local_client(client_p);
free_pre_client(client_p);
- BlockHeapFree(client_heap, client_p);
+ rb_bh_free(client_heap, client_p);
}
/*
* side effects -
*/
static void
-check_pings_list(dlink_list * list)
+check_pings_list(rb_dlink_list * list)
{
char scratch[32]; /* way too generous but... */
struct Client *client_p; /* current local client_p being examined */
int ping = 0; /* ping time value from client */
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
{
client_p = ptr->data;
- /*
- ** Note: No need to notify opers here. It's
- ** already done when "FLAGS_DEADSOCKET" is set.
- */
if(!MyConnect(client_p) || IsDead(client_p))
continue;
- if(IsPerson(client_p))
- {
- if(!IsExemptKline(client_p) &&
- GlobalSetOptions.idletime &&
- !IsOper(client_p) &&
- !IsIdlelined(client_p) &&
- ((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
- {
- struct ConfItem *aconf;
-
- aconf = make_conf();
- aconf->status = CONF_KILL;
-
- DupString(aconf->host, client_p->host);
- DupString(aconf->passwd, "idle exceeder");
- DupString(aconf->user, client_p->username);
- aconf->port = 0;
- aconf->hold = CurrentTime + 60;
- add_temp_kline(aconf);
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Idle time limit exceeded for %s - temp k-lining",
- get_client_name(client_p, HIDE_IP));
-
- exit_client(client_p, client_p, &me, aconf->passwd);
- continue;
- }
- }
-
- if(!IsRegistered(client_p))
- ping = ConfigFileEntry.connect_timeout;
- else
- ping = get_client_ping(client_p);
+ ping = get_client_ping(client_p);
- if(ping < (CurrentTime - client_p->localClient->lasttime))
+ if(ping < (rb_current_time() - client_p->localClient->lasttime))
{
/*
* If the client/server hasnt talked to us in 2*ping seconds
* and it has a ping time, then close its connection.
*/
- if(((CurrentTime - client_p->localClient->lasttime) >= (2 * ping)
+ if(((rb_current_time() - client_p->localClient->lasttime) >= (2 * ping)
&& (client_p->flags & FLAGS_PINGSENT)))
{
- if(IsAnyServer(client_p))
+ if(IsServer(client_p))
{
- sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
"No response from %s, closing link",
- get_server_name(client_p, HIDE_IP));
+ client_p->name);
ilog(L_SERVER,
"No response from %s, closing link",
log_client_name(client_p, HIDE_IP));
}
- (void) ircsnprintf(scratch, sizeof(scratch),
+ (void) rb_snprintf(scratch, sizeof(scratch),
"Ping timeout: %d seconds",
- (int) (CurrentTime - client_p->localClient->lasttime));
+ (int) (rb_current_time() - client_p->localClient->lasttime));
exit_client(client_p, client_p, &me, scratch);
continue;
*/
client_p->flags |= FLAGS_PINGSENT;
/* not nice but does the job */
- client_p->localClient->lasttime = CurrentTime - ping;
+ client_p->localClient->lasttime = rb_current_time() - ping;
sendto_one(client_p, "PING :%s", me.name);
}
}
* side effects - unknown clients get marked for termination after n seconds
*/
static void
-check_unknowns_list(dlink_list * list)
+check_unknowns_list(rb_dlink_list * list)
{
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
struct Client *client_p;
+ int timeout;
- DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
{
client_p = ptr->data;
if(IsDead(client_p) || IsClosing(client_p))
continue;
+ /* still has DNSbls to validate against */
+ if(client_p->preClient != NULL &&
+ rb_dlink_list_length(&client_p->preClient->dnsbl_queries) > 0)
+ continue;
+
/*
* Check UNKNOWN connections - if they have been in this state
* for > 30s, close them.
*/
- if((CurrentTime - client_p->localClient->firsttime) > 30)
+ timeout = IsAnyServer(client_p) ? ConfigFileEntry.connect_timeout : 30;
+ if((rb_current_time() - client_p->localClient->firsttime) > timeout)
+ {
+ if(IsAnyServer(client_p))
+ {
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+ "No response from %s, closing link",
+ client_p->name);
+ ilog(L_SERVER,
+ "No response from %s, closing link",
+ log_client_name(client_p, HIDE_IP));
+ }
exit_client(client_p, client_p, &me, "Connection timed out");
+ }
}
}
static const char conn_closed[] = "Connection closed";
static const char d_lined[] = "D-lined";
static const char k_lined[] = "K-lined";
- static const char g_lined[] = "G-lined";
const char *reason = NULL;
const char *exit_reason = conn_closed;
}
else
{
- switch (aconf->status)
- {
- case D_LINED:
- reason = d_lined;
- break;
- case G_LINED:
- reason = g_lined;
- break;
- default:
- reason = k_lined;
- break;
- }
+ reason = aconf->status == D_LINED ? d_lined : k_lined;
}
if(ban == D_LINED && !IsPerson(client_p))
* check_banned_lines
* inputs - NONE
* output - NONE
- * side effects - Check all connections for a pending k/d/gline against the
+ * side effects - Check all connections for a pending k/dline against the
* client, exit the client if found.
*/
void
{
struct Client *client_p; /* current local client_p being examined */
struct ConfItem *aconf = NULL;
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
{
client_p = ptr->data;
notify_banned_client(client_p, aconf, K_LINED);
continue;
}
- else if((aconf = find_gline(client_p)) != NULL)
- {
- if(IsExemptKline(client_p))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "GLINE over-ruled for %s, client is kline_exempt [%s@%s]",
- get_client_name(client_p, HIDE_IP),
- aconf->user, aconf->host);
- continue;
- }
-
- if(IsExemptGline(client_p))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "GLINE over-ruled for %s, client is gline_exempt [%s@%s]",
- get_client_name(client_p, HIDE_IP),
- aconf->user, aconf->host);
- continue;
- }
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "GLINE active for %s",
- get_client_name(client_p, HIDE_IP));
-
- notify_banned_client(client_p, aconf, G_LINED);
- continue;
- }
else if((aconf = find_xline(client_p->info, 1)) != NULL)
{
if(IsExemptKline(client_p))
}
/* also check the unknowns list for new dlines */
- DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
{
client_p = ptr->data;
{
struct Client *client_p;
struct ConfItem *aconf;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
{
client_p = ptr->data;
}
}
-/* check_glines()
- *
- * inputs -
- * outputs -
- * side effects - all clients will be checked for glines
- */
-void
-check_glines(void)
-{
- struct Client *client_p;
- struct ConfItem *aconf;
- dlink_node *ptr;
- dlink_node *next_ptr;
-
- DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
- {
- client_p = ptr->data;
-
- if(IsMe(client_p) || !IsPerson(client_p))
- continue;
-
- if((aconf = find_gline(client_p)) != NULL)
- {
- if(IsExemptKline(client_p))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "GLINE over-ruled for %s, client is kline_exempt",
- get_client_name(client_p, HIDE_IP));
- continue;
- }
-
- if(IsExemptGline(client_p))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "GLINE over-ruled for %s, client is gline_exempt",
- get_client_name(client_p, HIDE_IP));
- continue;
- }
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "GLINE active for %s",
- get_client_name(client_p, HIDE_IP));
-
- notify_banned_client(client_p, aconf, K_LINED);
- continue;
- }
- }
-}
-
/* check_dlines()
*
* inputs -
{
struct Client *client_p;
struct ConfItem *aconf;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
{
client_p = ptr->data;
}
/* dlines need to be checked against unknowns too */
- DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
{
client_p = ptr->data;
{
struct Client *client_p;
struct ConfItem *aconf;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
{
client_p = ptr->data;
if(client_p->serv->user != NULL)
free_user(client_p->serv->user, client_p);
if(client_p->serv->fullcaps)
- MyFree(client_p->serv->fullcaps);
- MyFree(client_p->serv);
+ rb_free(client_p->serv->fullcaps);
+ rb_free(client_p->serv);
}
}
if(client_p->node.prev == NULL && client_p->node.next == NULL)
return;
- dlinkDelete(&client_p->node, &global_client_list);
+ rb_dlinkDelete(&client_p->node, &global_client_list);
update_client_exit_stats(client_p);
}
if(ConfigFileEntry.hide_spoof_ips &&
showip == SHOW_IP && IsIPSpoof(client))
showip = MASK_IP;
-#ifdef HIDE_SERVERS_IPS
if(IsAnyServer(client))
showip = MASK_IP;
-#endif
/* And finally, let's get the host information, ip or name */
switch (showip)
{
case SHOW_IP:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
+ rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
client->name, client->username,
client->sockhost);
break;
case MASK_IP:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
+ rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
client->name, client->username);
break;
default:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
+ rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
client->name, client->username, client->host);
}
return nbuf;
*/
return client->name;
}
-
-const char *
-get_server_name(struct Client *target_p, int showip)
-{
- static char nbuf[HOSTLEN * 2 + USERLEN + 5];
-
- if(target_p == NULL)
- return NULL;
-
- if(!MyConnect(target_p) || !irccmp(target_p->name, target_p->host))
- return target_p->name;
-
-#ifdef HIDE_SERVERS_IPS
- if(EmptyString(target_p->name))
- {
- ircsnprintf(nbuf, sizeof(nbuf), "[%s@255.255.255.255]",
- target_p->username);
- return nbuf;
- }
- else
- return target_p->name;
-#endif
-
- switch (showip)
- {
- case SHOW_IP:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
- target_p->name, target_p->username,
- target_p->sockhost);
- break;
-
- case MASK_IP:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
- target_p->name, target_p->username);
-
- default:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
- target_p->name, target_p->username,
- target_p->host);
- }
-
- return nbuf;
-}
/* log_client_name()
*
switch (showip)
{
case SHOW_IP:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
+ rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
target_p->username, target_p->sockhost);
break;
case MASK_IP:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
+ rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
target_p->name, target_p->username);
default:
- ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
+ rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
target_p->username, target_p->host);
}
static void
free_exited_clients(void *unused)
{
- dlink_node *ptr, *next;
+ rb_dlink_node *ptr, *next;
struct Client *target_p;
- DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
{
target_p = ptr->data;
#ifdef DEBUG_EXITED_CLIENTS
{
struct abort_client *abt;
- dlink_node *aptr;
+ rb_dlink_node *aptr;
int found = 0;
- DLINK_FOREACH(aptr, abort_list.head)
+ RB_DLINK_FOREACH(aptr, abort_list.head)
{
abt = aptr->data;
if(abt->client == target_p)
if(found)
{
- dlinkDestroy(ptr, &dead_list);
+ rb_dlinkDestroy(ptr, &dead_list);
continue;
}
}
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Warning: null client on dead_list!");
- dlinkDestroy(ptr, &dead_list);
+ rb_dlinkDestroy(ptr, &dead_list);
continue;
}
release_client_state(target_p);
free_client(target_p);
- dlinkDestroy(ptr, &dead_list);
+ rb_dlinkDestroy(ptr, &dead_list);
}
#ifdef DEBUG_EXITED_CLIENTS
- DLINK_FOREACH_SAFE(ptr, next, dead_remote_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next, dead_remote_list.head)
{
target_p = ptr->data;
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Warning: null client on dead_list!");
- dlinkDestroy(ptr, &dead_list);
+ rb_dlinkDestroy(ptr, &dead_list);
continue;
}
release_client_state(target_p);
free_client(target_p);
- dlinkDestroy(ptr, &dead_remote_list);
+ rb_dlinkDestroy(ptr, &dead_remote_list);
}
#endif
const char *comment)
{
struct Client *target_p;
- dlink_node *ptr, *ptr_next;
+ rb_dlink_node *ptr, *ptr_next;
/* If this server can handle quit storm (QS) removal
* of dependents, just send the SQUIT
*/
}
else
{
- DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
+ RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
{
target_p = ptr->data;
sendto_one(to, ":%s QUIT :%s", target_p->name, comment1);
}
- DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
+ RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
{
target_p = ptr->data;
recurse_send_quits(client_p, target_p, to, comment1, comment);
recurse_remove_clients(struct Client *source_p, const char *comment)
{
struct Client *target_p;
- dlink_node *ptr, *ptr_next;
+ rb_dlink_node *ptr, *ptr_next;
if(IsMe(source_p))
return;
/* this is very ugly, but it saves cpu :P */
if(ConfigFileEntry.nick_delay > 0)
{
- DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
+ RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
{
target_p = ptr->data;
target_p->flags |= FLAGS_KILLED;
}
else
{
- DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
+ RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
{
target_p = ptr->data;
target_p->flags |= FLAGS_KILLED;
}
}
- DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
+ RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
{
target_p = ptr->data;
recurse_remove_clients(target_p, comment);
struct Client *from, const char *comment, const char *comment1)
{
struct Client *to;
- dlink_node *ptr, *next;
+ rb_dlink_node *ptr, *next;
- DLINK_FOREACH_SAFE(ptr, next, serv_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next, serv_list.head)
{
to = ptr->data;
exit_aborted_clients(void *unused)
{
struct abort_client *abt;
- dlink_node *ptr, *next;
- DLINK_FOREACH_SAFE(ptr, next, abort_list.head)
+ rb_dlink_node *ptr, *next;
+ RB_DLINK_FOREACH_SAFE(ptr, next, abort_list.head)
{
abt = ptr->data;
#ifdef DEBUG_EXITED_CLIENTS
{
- if(dlinkFind(abt->client, &dead_list))
+ if(rb_dlinkFind(abt->client, &dead_list))
{
s_assert(0);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
#endif
s_assert(*((unsigned long*)abt->client) != 0xdeadbeef); /* This is lame but its a debug thing */
- dlinkDelete(ptr, &abort_list);
+ rb_dlinkDelete(ptr, &abort_list);
if(IsAnyServer(abt->client))
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Closing link to %s: %s",
- get_server_name(abt->client, HIDE_IP), abt->notice);
+ abt->client->name, abt->notice);
/* its no longer on abort list - we *must* remove
* FLAGS_CLOSING otherwise exit_client() will not run --fl
*/
abt->client->flags &= ~FLAGS_CLOSING;
exit_client(abt->client, abt->client, &me, abt->notice);
- MyFree(abt);
+ rb_free(abt);
}
}
if(IsDead(client_p) || IsClosing(client_p) || IsMe(client_p))
return;
- abt = (struct abort_client *) MyMalloc(sizeof(struct abort_client));
+ abt = (struct abort_client *) rb_malloc(sizeof(struct abort_client));
if(client_p->flags & FLAGS_SENDQEX)
- strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
+ rb_strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
else
- ircsnprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
+ rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
abt->client = client_p;
SetIOError(client_p);
SetDead(client_p);
SetClosing(client_p);
- dlinkAdd(abt, &abt->node, &abort_list);
+ rb_dlinkAdd(abt, &abt->node, &abort_list);
}
exit_generic_client(struct Client *client_p, struct Client *source_p, struct Client *from,
const char *comment)
{
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
if(IsOper(source_p))
- dlinkFindDestroy(source_p, &oper_list);
+ rb_dlinkFindDestroy(source_p, &oper_list);
sendto_common_channels_local(source_p, ":%s!%s@%s QUIT :%s",
source_p->name,
s_assert(source_p->user->channel.head == NULL);
/* Clean up invitefield */
- DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->user->invited.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->user->invited.head)
{
del_invite(ptr->data, source_p);
}
if(source_p->servptr && source_p->servptr->serv)
{
- dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
+ rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
}
if((source_p->flags & FLAGS_KILLED) == 0)
{
sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
":%s QUIT :%s", use_id(source_p), comment);
- sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
- ":%s QUIT :%s", source_p->name, comment);
}
SetDead(source_p);
#ifdef DEBUG_EXITED_CLIENTS
- dlinkAddAlloc(source_p, &dead_remote_list);
+ rb_dlinkAddAlloc(source_p, &dead_remote_list);
#else
- dlinkAddAlloc(source_p, &dead_list);
+ rb_dlinkAddAlloc(source_p, &dead_list);
#endif
return(CLIENT_EXITED);
}
const char *comment)
{
delete_auth_queries(source_p);
- client_flush_input(source_p);
- del_unknown_ip(source_p);
- dlinkDelete(&source_p->localClient->tnode, &unknown_list);
+ if (source_p->localClient->dnsquery)
+ {
+ delete_resolver_queries(source_p->localClient->dnsquery);
+ rb_free(source_p->localClient->dnsquery);
+ }
+ rb_dlinkDelete(&source_p->localClient->tnode, &unknown_list);
if(!IsIOError(source_p))
sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
del_from_client_hash(source_p->name, source_p);
remove_client_from_list(source_p);
SetDead(source_p);
- dlinkAddAlloc(source_p, &dead_list);
+ rb_dlinkAddAlloc(source_p, &dead_list);
/* Note that we don't need to add unknowns to the dead_list */
return(CLIENT_EXITED);
strcpy(comment1, "*.net *.split");
else
{
- if((source_p->serv) && (source_p->serv->up))
- strcpy(comment1, source_p->serv->up);
- else
- strcpy(comment1, "<Unknown>");
-
+ strcpy(comment1, source_p->servptr->name);
strcat(comment1, " ");
strcat(comment1, source_p->name);
}
if (IsPerson(from))
- ircsnprintf(newcomment, sizeof(newcomment), "by %s: %s",
+ rb_snprintf(newcomment, sizeof(newcomment), "by %s: %s",
from->name, comment);
if(source_p->serv != NULL)
remove_dependents(client_p, source_p, from, IsPerson(from) ? newcomment : comment, comment1);
if(source_p->servptr && source_p->servptr->serv)
- dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
+ rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
else
s_assert(0);
- dlinkFindDestroy(source_p, &global_serv_list);
+ rb_dlinkFindDestroy(source_p, &global_serv_list);
target_p = source_p->from;
if(target_p != NULL && IsServer(target_p) && target_p != client_p &&
del_from_client_hash(source_p->name, source_p);
remove_client_from_list(source_p);
+ scache_split(source_p->serv->nameinfo);
SetDead(source_p);
#ifdef DEBUG_EXITED_CLIENTS
- dlinkAddAlloc(source_p, &dead_remote_list);
+ rb_dlinkAddAlloc(source_p, &dead_remote_list);
#else
- dlinkAddAlloc(source_p, &dead_list);
+ rb_dlinkAddAlloc(source_p, &dead_list);
#endif
return 0;
}
qs_server(struct Client *client_p, struct Client *source_p, struct Client *from,
const char *comment)
{
- struct Client *target_p;
-
if(source_p->servptr && source_p->servptr->serv)
- dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
+ rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
else
s_assert(0);
- dlinkFindDestroy(source_p, &global_serv_list);
- target_p = source_p->from;
+ rb_dlinkFindDestroy(source_p, &global_serv_list);
if(has_id(source_p))
del_from_id_hash(source_p->id, source_p);
del_from_client_hash(source_p->name, source_p);
remove_client_from_list(source_p);
+ scache_split(source_p->serv->nameinfo);
SetDead(source_p);
- dlinkAddAlloc(source_p, &dead_list);
+ rb_dlinkAddAlloc(source_p, &dead_list);
return 0;
}
static char newcomment[BUFSIZE];
unsigned int sendk, recvk;
- dlinkDelete(&source_p->localClient->tnode, &serv_list);
- dlinkFindDestroy(source_p, &global_serv_list);
+ rb_dlinkDelete(&source_p->localClient->tnode, &serv_list);
+ rb_dlinkFindDestroy(source_p, &global_serv_list);
unset_chcap_usage_counts(source_p);
sendk = source_p->localClient->sendK;
/* Always show source here, so the server notices show
* which side initiated the split -- jilles
*/
- ircsnprintf(newcomment, sizeof(newcomment), "by %s: %s",
+ rb_snprintf(newcomment, sizeof(newcomment), "by %s: %s",
from == source_p ? me.name : from->name, comment);
if (!IsIOError(source_p))
sendto_one(source_p, "SQUIT %s :%s", use_id(source_p),
}
if(source_p->servptr && source_p->servptr->serv)
- dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
+ rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
else
s_assert(0);
strcpy(comment1, "*.net *.split");
else
{
- if((source_p->serv) && (source_p->serv->up))
- strcpy(comment1, source_p->serv->up);
- else
- strcpy(comment1, "<Unknown>");
-
+ strcpy(comment1, source_p->servptr->name);
strcat(comment1, " ");
strcat(comment1, source_p->name);
}
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s was connected"
" for %ld seconds. %d/%d sendK/recvK.",
- source_p->name, CurrentTime - source_p->localClient->firsttime, sendk, recvk);
+ source_p->name, (long) rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
ilog(L_SERVER, "%s was connected for %ld seconds. %d/%d sendK/recvK.",
- source_p->name, CurrentTime - source_p->localClient->firsttime, sendk, recvk);
+ source_p->name, (long) rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
if(has_id(source_p))
del_from_id_hash(source_p->id, source_p);
del_from_client_hash(source_p->name, source_p);
remove_client_from_list(source_p);
+ scache_split(source_p->serv->nameinfo);
SetDead(source_p);
- dlinkAddAlloc(source_p, &dead_list);
+ rb_dlinkAddAlloc(source_p, &dead_list);
return 0;
}
const char *comment)
{
unsigned long on_for;
+ char tbuf[26];
exit_generic_client(client_p, source_p, from, comment);
clear_monitor(source_p);
s_assert(IsPerson(source_p));
- client_flush_input(source_p);
- dlinkDelete(&source_p->localClient->tnode, &lclient_list);
- dlinkDelete(&source_p->lnode, &me.serv->users);
+ rb_dlinkDelete(&source_p->localClient->tnode, &lclient_list);
+ rb_dlinkDelete(&source_p->lnode, &me.serv->users);
if(IsOper(source_p))
- dlinkFindDestroy(source_p, &local_oper_list);
+ rb_dlinkFindDestroy(source_p, &local_oper_list);
sendto_realops_snomask(SNO_CCONN, L_ALL,
"Client exiting: %s (%s@%s) [%s] [%s]",
show_ip(NULL, source_p) ? source_p->sockhost : "255.255.255.255",
comment);
- on_for = CurrentTime - source_p->localClient->firsttime;
+ on_for = rb_current_time() - source_p->localClient->firsttime;
- ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %d/%d",
- myctime(CurrentTime), on_for / 3600,
+ ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %s %d/%d",
+ rb_ctime(rb_current_time(), tbuf, sizeof(tbuf)), on_for / 3600,
(on_for % 3600) / 60, on_for % 60,
source_p->name, source_p->username, source_p->host,
+ source_p->sockhost,
source_p->localClient->sendK, source_p->localClient->receiveK);
sendto_one(source_p, "ERROR :Closing Link: %s (%s)", source_p->host, comment);
{
sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
":%s QUIT :%s", use_id(source_p), comment);
- sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
- ":%s QUIT :%s", source_p->name, comment);
}
SetDead(source_p);
- dlinkAddAlloc(source_p, &dead_list);
+ rb_dlinkAddAlloc(source_p, &dead_list);
return(CLIENT_EXITED);
}
count_local_client_memory(size_t * count, size_t * local_client_memory_used)
{
size_t lusage;
- BlockHeapUsage(lclient_heap, count, NULL, &lusage);
- *local_client_memory_used = lusage + (*count * (sizeof(MemBlock) + sizeof(struct Client)));
+ rb_bh_usage(lclient_heap, count, NULL, &lusage, NULL);
+ *local_client_memory_used = lusage + (*count * (sizeof(void *) + sizeof(struct Client)));
}
/*
count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
{
size_t lcount, rcount;
- BlockHeapUsage(lclient_heap, &lcount, NULL, NULL);
- BlockHeapUsage(client_heap, &rcount, NULL, NULL);
+ rb_bh_usage(lclient_heap, &lcount, NULL, NULL, NULL);
+ rb_bh_usage(client_heap, &rcount, NULL, NULL, NULL);
*count = rcount - lcount;
- *remote_client_memory_used = *count * (sizeof(MemBlock) + sizeof(struct Client));
+ *remote_client_memory_used = *count * (sizeof(void *) + sizeof(struct Client));
}
void
del_all_accepts(struct Client *client_p)
{
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
struct Client *target_p;
if(MyClient(client_p) && client_p->localClient->allow_list.head)
/* clear this clients accept list, and remove them from
* everyones on_accept_list
*/
- DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->allow_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->allow_list.head)
{
target_p = ptr->data;
- dlinkFindDestroy(client_p, &target_p->on_allow_list);
- dlinkDestroy(ptr, &client_p->localClient->allow_list);
+ rb_dlinkFindDestroy(client_p, &target_p->on_allow_list);
+ rb_dlinkDestroy(ptr, &client_p->localClient->allow_list);
}
}
/* remove this client from everyones accept list */
- DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
{
target_p = ptr->data;
- dlinkFindDestroy(client_p, &target_p->localClient->allow_list);
- dlinkDestroy(ptr, &client_p->on_allow_list);
+ rb_dlinkFindDestroy(client_p, &target_p->localClient->allow_list);
+ rb_dlinkDestroy(ptr, &client_p->on_allow_list);
}
}
{
if(IsAnyServer(target_p))
{
-#ifndef HIDE_SERVERS_IPS
- if(source_p == NULL || IsOper(source_p))
- return 1;
-#endif
return 0;
}
else if(IsIPSpoof(target_p))
return 1;
}
-/*
- * initUser
- *
- * inputs - none
- * outputs - none
- *
- * side effects - Creates a block heap for struct Users
- *
- */
-static BlockHeap *user_heap;
-void
-initUser(void)
-{
- user_heap = BlockHeapCreate(sizeof(struct User), USER_HEAP_SIZE);
- if(!user_heap)
- outofmemory();
-}
-
/*
* make_user
*
user = client_p->user;
if(!user)
{
- user = (struct User *) BlockHeapAlloc(user_heap);
+ user = (struct User *) rb_bh_alloc(user_heap);
user->refcnt = 1;
client_p->user = user;
}
if(!serv)
{
- serv = (server_t *) MyMalloc(sizeof(server_t));
+ serv = (server_t *) rb_malloc(sizeof(server_t));
client_p->serv = serv;
}
return client_p->serv;
void
free_user(struct User *user, struct Client *client_p)
{
+ free_away(client_p);
+
if(--user->refcnt <= 0)
{
if(user->away)
- MyFree((char *) user->away);
+ rb_free((char *) user->away);
/*
* sanity check
*/
(unsigned long) user,
(unsigned long) user->invited.head,
(unsigned long) user->channel.head,
- dlink_list_length(&user->channel),
+ rb_dlink_list_length(&user->channel),
user->refcnt);
s_assert(!user->refcnt);
s_assert(!user->invited.head);
s_assert(!user->channel.head);
}
- BlockHeapFree(user_heap, user);
+ rb_bh_free(user_heap, user);
+ }
+}
+
+void
+allocate_away(struct Client *client_p)
+{
+ if(client_p->user->away == NULL)
+ client_p->user->away = rb_bh_alloc(away_heap);
+}
+
+
+void
+free_away(struct Client *client_p)
+{
+ if(client_p->user != NULL && client_p->user->away != NULL) {
+ rb_bh_free(away_heap, client_p->user->away);
+ client_p->user->away = NULL;
}
}
{
struct server_conf *server_p;
- ServerStats->is_sv++;
- ServerStats->is_sbs += client_p->localClient->sendB;
- ServerStats->is_sbr += client_p->localClient->receiveB;
- ServerStats->is_sks += client_p->localClient->sendK;
- ServerStats->is_skr += client_p->localClient->receiveK;
- ServerStats->is_sti += CurrentTime - client_p->localClient->firsttime;
- if(ServerStats->is_sbs > 2047)
- {
- ServerStats->is_sks += (ServerStats->is_sbs >> 10);
- ServerStats->is_sbs &= 0x3ff;
- }
- if(ServerStats->is_sbr > 2047)
- {
- ServerStats->is_skr += (ServerStats->is_sbr >> 10);
- ServerStats->is_sbr &= 0x3ff;
- }
+ ServerStats.is_sv++;
+ ServerStats.is_sbs += client_p->localClient->sendB;
+ ServerStats.is_sbr += client_p->localClient->receiveB;
+ ServerStats.is_sti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime);
/*
* If the connection has been up for a long amount of time, schedule
}
else if(IsClient(client_p))
{
- ServerStats->is_cl++;
- ServerStats->is_cbs += client_p->localClient->sendB;
- ServerStats->is_cbr += client_p->localClient->receiveB;
- ServerStats->is_cks += client_p->localClient->sendK;
- ServerStats->is_ckr += client_p->localClient->receiveK;
- ServerStats->is_cti += CurrentTime - client_p->localClient->firsttime;
- if(ServerStats->is_cbs > 2047)
- {
- ServerStats->is_cks += (ServerStats->is_cbs >> 10);
- ServerStats->is_cbs &= 0x3ff;
- }
- if(ServerStats->is_cbr > 2047)
- {
- ServerStats->is_ckr += (ServerStats->is_cbr >> 10);
- ServerStats->is_cbr &= 0x3ff;
- }
+ ServerStats.is_cl++;
+ ServerStats.is_cbs += client_p->localClient->sendB;
+ ServerStats.is_cbr += client_p->localClient->receiveB;
+ ServerStats.is_cti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime);
}
else
- ServerStats->is_ni++;
+ ServerStats.is_ni++;
- if(-1 < client_p->localClient->fd)
+ if(client_p->localClient->F != NULL)
{
/* attempt to flush any pending dbufs. Evil, but .. -- adrian */
if(!IsIOError(client_p))
- send_queued_write(client_p->localClient->fd, client_p);
+ send_queued(client_p);
- comm_close(client_p->localClient->fd);
- client_p->localClient->fd = -1;
+ del_from_cli_fd_hash(client_p);
+ rb_close(client_p->localClient->F);
+ client_p->localClient->F = NULL;
}
- if(-1 < client_p->localClient->ctrlfd)
- {
- comm_close(client_p->localClient->ctrlfd);
- client_p->localClient->ctrlfd = -1;
- }
-
- linebuf_donebuf(&client_p->localClient->buf_sendq);
- linebuf_donebuf(&client_p->localClient->buf_recvq);
+ rb_linebuf_donebuf(&client_p->localClient->buf_sendq);
+ rb_linebuf_donebuf(&client_p->localClient->buf_recvq);
detach_conf(client_p);
/* XXX shouldnt really be done here. */
* for reading even though it ends up being an EOF. -avalon
*/
char errmsg[255];
- int current_error = comm_get_sockerr(client_p->localClient->fd);
+ int current_error = rb_get_sockerr(client_p->localClient->F);
SetIOError(client_p);
if(IsServer(client_p) || IsHandshake(client_p))
{
- int connected = CurrentTime - client_p->localClient->firsttime;
-
if(error == 0)
{
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
"Server %s closed the connection",
- get_server_name(client_p, SHOW_IP));
+ client_p->name);
ilog(L_SERVER, "Server %s closed the connection",
log_client_name(client_p, SHOW_IP));
ilog(L_SERVER, "Lost connection to %s: %s",
log_client_name(client_p, SHOW_IP), strerror(current_error));
}
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s had been connected for %d day%s, %2d:%02d:%02d",
- client_p->name, connected / 86400,
- (connected / 86400 == 1) ? "" : "s",
- (connected % 86400) / 3600,
- (connected % 3600) / 60, connected % 60);
}
if(error == 0)
- strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
+ rb_strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
else
- ircsnprintf(errmsg, sizeof(errmsg), "Read error: %s", strerror(current_error));
+ rb_snprintf(errmsg, sizeof(errmsg), "Read error: %s", strerror(current_error));
exit_client(client_p, client_p, &me, errmsg);
}
projects / irc / rqf / shadowircd.git / blobdiff