/*
- * 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: client.c 3167 2007-01-26 18:52:11Z jilles $
+ * $Id: client.c 3514 2007-06-06 16:25:21Z nenolod $
*/
#include "stdinc.h"
#include "config.h"
#include "msg.h"
#include "monitor.h"
#include "blacklist.h"
+#include "reject.h"
+#include "scache.h"
+#include "irc_dictionary.h"
#define DEBUG_EXITED_CLIENTS
extern char current_uid[IDLEN];
+struct Dictionary *nd_dict = NULL;
+
enum
{
D_LINED,
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);
+
+ nd_dict = irc_dictionary_create(irccmp);
}
client_p->localClient->lasttime = client_p->localClient->firsttime = CurrentTime;
- client_p->localClient->fd = -1;
+ client_p->localClient->F = NULL;
client_p->localClient->ctrlfd = -1;
client_p->preClient = (struct PreClient *) BlockHeapAlloc(pclient_heap);
client_p->localClient->listener = 0;
}
- if(client_p->localClient->fd >= 0)
- comm_close(client_p->localClient->fd);
+ if(client_p->localClient->F->fd >= 0)
+ comm_close(client_p->localClient->F->fd);
if(client_p->localClient->passwd)
{
{
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(!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(((CurrentTime - 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));
ilog(L_SERVER,
{
dlink_node *ptr, *next_ptr;
struct Client *client_p;
+ int timeout;
DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
{
* for > 30s, close them.
*/
- if((CurrentTime - client_p->localClient->firsttime) > 30)
+ timeout = IsAnyServer(client_p) ? ConfigFileEntry.connect_timeout : 30;
+ if((CurrentTime - 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",
+ get_server_name(client_p, HIDE_IP));
+ 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");
+ }
}
}
target_p->name, (unsigned int) target_p->status,
target_p->flags, target_p->flags2, target_p->handler);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Please report this to the ratbox developers!");
+ "Please report this to the charybdis developers!");
found++;
}
}
abt->client->name, (unsigned int) abt->client->status,
abt->client->flags, abt->client->flags2, abt->client->handler);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Please report this to the ratbox developers!");
+ "Please report this to the charybdis developers!");
continue;
}
}
{
delete_auth_queries(source_p);
client_flush_input(source_p);
+ del_unknown_ip(source_p);
dlinkDelete(&source_p->localClient->tnode, &unknown_list);
if(!IsIOError(source_p))
del_from_hostname_hash(source_p->host, source_p);
del_from_client_hash(source_p->name, source_p);
remove_client_from_list(source_p);
- free_pre_client(source_p);
SetDead(source_p);
dlinkAddAlloc(source_p, &dead_list);
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);
}
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
source_p->name, comment);
}
- if(source_p->localClient->ctrlfd >= 0)
- {
- comm_close(source_p->localClient->ctrlfd);
- source_p->localClient->ctrlfd = -1;
- }
-
if(source_p->servptr && source_p->servptr->serv)
dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
else
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);
}
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);
else
ServerStats->is_ni++;
- if(-1 < client_p->localClient->fd)
+ if(client_p->localClient->F)
{
/* attempt to flush any pending dbufs. Evil, but .. -- adrian */
if(!IsIOError(client_p))
- send_queued_write(client_p->localClient->fd, client_p);
+ send_queued_write(client_p->localClient->F->fd, client_p);
- comm_close(client_p->localClient->fd);
- client_p->localClient->fd = -1;
+ comm_close(client_p->localClient->F->fd);
+ client_p->localClient->F = NULL;
}
- if(HasServlink(client_p))
+ if(-1 < client_p->localClient->ctrlfd)
{
- if(client_p->localClient->fd > -1)
- {
- comm_close(client_p->localClient->ctrlfd);
- client_p->localClient->ctrlfd = -1;
- }
+ comm_close(client_p->localClient->ctrlfd);
+ client_p->localClient->ctrlfd = -1;
}
linebuf_donebuf(&client_p->localClient->buf_sendq);
* 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 = comm_get_sockerr(client_p->localClient->F->fd);
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,
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)
projects / irc / rqf / shadowircd.git / blobdiff