#include "irc_string.h"
#include "sprintf_irc.h"
#include "ircd.h"
-#include "s_gline.h"
#include "numeric.h"
#include "packet.h"
#include "s_auth.h"
#include "reject.h"
#include "scache.h"
#include "irc_dictionary.h"
+#include "sslproc.h"
#define DEBUG_EXITED_CLIENTS
enum
{
D_LINED,
- K_LINED,
- G_LINED
+ K_LINED
};
rb_dlink_list dead_list;
client_p->localClient->lasttime = client_p->localClient->firsttime = rb_current_time();
client_p->localClient->F = NULL;
- client_p->localClient->ctrlF = NULL;
client_p->preClient = (struct PreClient *) rb_bh_alloc(pclient_heap);
client_p->localClient->listener = 0;
}
- if(client_p->localClient->F)
+ if(client_p->localClient->F != NULL)
+ {
+ del_from_cli_fd_hash(client_p);
rb_close(client_p->localClient->F);
+ }
if(client_p->localClient->passwd)
{
rb_free(client_p->localClient->opername);
rb_free(client_p->localClient->mangledhost);
+ ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+
rb_bh_free(lclient_heap, client_p->localClient);
client_p->localClient = NULL;
}
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;
case D_LINED:
reason = d_lined;
break;
- case G_LINED:
- reason = g_lined;
- break;
default:
reason = k_lined;
break;
* 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
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))
}
}
-/* check_glines()
- *
- * inputs -
- * outputs -
- * side effects - all clients will be checked for glines
- */
-void
-check_glines(void)
-{
- struct Client *client_p;
- struct ConfItem *aconf;
- rb_dlink_node *ptr;
- rb_dlink_node *next_ptr;
-
- RB_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 -
const char *comment)
{
delete_auth_queries(source_p);
+ if (source_p->localClient->dnsquery)
+ {
+ delete_resolver_queries(source_p->localClient->dnsquery);
+ rb_free(source_p->localClient->dnsquery);
+ }
del_unknown_ip(source_p);
rb_dlinkDelete(&source_p->localClient->tnode, &unknown_list);
{
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 += rb_current_time() - 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 += 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 += rb_current_time() - 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 += rb_current_time() - client_p->localClient->firsttime;
}
else
- ServerStats->is_ni++;
+ ServerStats.is_ni++;
- if(client_p->localClient->F)
+ if(client_p->localClient->F != NULL)
{
/* attempt to flush any pending dbufs. Evil, but .. -- adrian */
if(!IsIOError(client_p))
send_queued(client_p);
+ del_from_cli_fd_hash(client_p);
rb_close(client_p->localClient->F);
client_p->localClient->F = NULL;
}
- if(client_p->localClient->ctrlF)
- {
- rb_close(client_p->localClient->ctrlF);
- client_p->localClient->ctrlF = NULL;
- }
-
rb_linebuf_donebuf(&client_p->localClient->buf_sendq);
rb_linebuf_donebuf(&client_p->localClient->buf_recvq);
detach_conf(client_p);
projects / irc / rqf / shadowircd.git / blobdiff