#include "class.h"
#include "common.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 "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 "reject.h"
#include "scache.h"
#include "irc_dictionary.h"
+#include "sslproc.h"
#define DEBUG_EXITED_CLIENTS
static EVH check_pings;
-extern BlockHeap *client_heap;
-extern BlockHeap *lclient_heap;
-extern BlockHeap *pclient_heap;
+extern rb_bh *client_heap;
+extern rb_bh *lclient_heap;
+extern rb_bh *pclient_heap;
+static rb_bh *away_heap = NULL;
extern char current_uid[IDLEN];
enum
{
D_LINED,
- K_LINED,
- G_LINED
+ K_LINED
};
rb_dlink_list dead_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);
+ 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");
+ 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 = (struct LocalUser *) 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->F = NULL;
- client_p->localClient->ctrlfd = -1;
- client_p->preClient = (struct PreClient *) BlockHeapAlloc(pclient_heap);
+ client_p->preClient = (struct PreClient *) rb_bh_alloc(pclient_heap);
/* as good a place as any... */
rb_dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
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->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)
{
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);
- BlockHeapFree(lclient_heap, client_p->localClient);
+ ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+
+ 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);
}
/*
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(IsServer(client_p))
}
(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);
}
}
*/
timeout = IsAnyServer(client_p) ? ConfigFileEntry.connect_timeout : 30;
- if((CurrentTime - client_p->localClient->firsttime) > timeout)
+ if((rb_current_time() - client_p->localClient->firsttime) > timeout)
{
if(IsAnyServer(client_p))
{
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 -
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);
}
}
*/
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
rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
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);
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);
const char *comment)
{
unsigned long on_for;
+ char tbuf[26];
exit_generic_client(client_p, source_p, from, comment);
clear_monitor(source_p);
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,
+ 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->localClient->sendK, source_p->localClient->receiveK);
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));
}
* side effects - Creates a block heap for struct Users
*
*/
-static BlockHeap *user_heap;
+static rb_bh *user_heap;
void
initUser(void)
{
- user_heap = BlockHeapCreate(sizeof(struct User), USER_HEAP_SIZE);
+ user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
if(!user_heap)
- outofmemory();
+ rb_outofmemory();
}
/*
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
*/
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 += 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 += 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(-1 < client_p->localClient->ctrlfd)
- {
- rb_close(client_p->localClient->ctrlfd);
- client_p->localClient->ctrlfd = -1;
- }
-
rb_linebuf_donebuf(&client_p->localClient->buf_sendq);
rb_linebuf_donebuf(&client_p->localClient->buf_recvq);
detach_conf(client_p);
}
if(error == 0)
- strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
+ rb_strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
else
rb_snprintf(errmsg, sizeof(errmsg), "Read error: %s", strerror(current_error));
projects / irc / rqf / shadowircd.git / blobdiff