#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"
static EVH check_pings;
-extern rb_bh *client_heap;
-extern rb_bh *lclient_heap;
-extern rb_bh *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;
-
-extern char current_uid[IDLEN];
+static char current_uid[IDLEN];
struct Dictionary *nd_dict = NULL;
enum
{
D_LINED,
- K_LINED,
- G_LINED
+ K_LINED
};
rb_dlink_list dead_list;
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);
{
client_p->from = client_p; /* 'from' of local client is self! */
- localClient = (struct LocalUser *) rb_bh_alloc(lclient_heap);
+ localClient = rb_bh_alloc(lclient_heap);
SetMyConnect(client_p);
client_p->localClient = localClient;
client_p->localClient->F = NULL;
- client_p->preClient = (struct PreClient *) rb_bh_alloc(pclient_heap);
+ client_p->preClient = rb_bh_alloc(pclient_heap);;
/* as good a place as any... */
rb_dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
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);
- ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+ 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);
rb_bh_free(lclient_heap, client_p->localClient);
client_p->localClient = NULL;
{
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));
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.
{
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));
+ client_p->name);
ilog(L_SERVER,
"No response from %s, closing link",
log_client_name(client_p, HIDE_IP));
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
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(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)
*/
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))
- {
- rb_snprintf(nbuf, sizeof(nbuf), "[%s@255.255.255.255]",
- target_p->username);
- return nbuf;
- }
- else
- return target_p->name;
-#endif
-
- switch (showip)
- {
- case SHOW_IP:
- rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
- target_p->name, target_p->username,
- target_p->sockhost);
- break;
-
- case MASK_IP:
- rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
- target_p->name, target_p->username);
-
- default:
- rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
- target_p->name, target_p->username,
- target_p->host);
- }
-
- return nbuf;
-}
/* log_client_name()
*
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 = (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));
{
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);
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);
if(!IsIOError(source_p))
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)
rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
else
s_assert(0);
rb_dlinkFindDestroy(source_p, &global_serv_list);
- target_p = source_p->from;
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);
on_for = rb_current_time() - source_p->localClient->firsttime;
- ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %d/%d",
- myctime(rb_current_time()), 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);
{
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 rb_bh *user_heap;
-void
-initUser(void)
-{
- user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
- if(!user_heap)
- rb_outofmemory();
-}
-
/*
* make_user
*
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_sti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime);
/*
* If the connection has been up for a long amount of time, schedule
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_cti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime);
}
else
ServerStats.is_ni++;
{
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));
}
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