X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/9f6bbe3cf9c786c5089bfd605315aed5268e8974..dc83edfac4cf3f5725f7e1f8ba512a524953bce6:/src/client.c diff --git a/src/client.c b/src/client.c index eee6db1..ac45624 100644 --- a/src/client.c +++ b/src/client.c @@ -31,16 +31,14 @@ #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" @@ -56,6 +54,7 @@ #include "reject.h" #include "scache.h" #include "irc_dictionary.h" +#include "sslproc.h" #define DEBUG_EXITED_CLIENTS @@ -73,19 +72,19 @@ static int qs_server(struct Client *, struct Client *, struct Client *, const ch static EVH check_pings; -extern BlockHeap *client_heap; -extern BlockHeap *lclient_heap; -extern BlockHeap *pclient_heap; - -extern char current_uid[IDLEN]; +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]; struct Dictionary *nd_dict = NULL; enum { D_LINED, - K_LINED, - G_LINED + K_LINED }; rb_dlink_list dead_list; @@ -117,12 +116,16 @@ init_client(void) * 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"); + 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); } @@ -144,22 +147,21 @@ make_client(struct Client *from) 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 = rb_current_time(); client_p->localClient->F = NULL; - client_p->localClient->ctrlfd = -1; - client_p->preClient = (struct PreClient *) BlockHeapAlloc(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); @@ -191,7 +193,7 @@ free_pre_client(struct Client *client_p) 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; } @@ -216,8 +218,11 @@ free_local_client(struct Client *client_p) 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) { @@ -230,8 +235,16 @@ free_local_client(struct Client *client_p) 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; } @@ -242,7 +255,7 @@ free_client(struct Client *client_p) 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); } /* @@ -316,7 +329,7 @@ check_pings_list(rb_dlink_list * list) { 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)); @@ -367,6 +380,11 @@ check_unknowns_list(rb_dlink_list * list) 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. @@ -379,7 +397,7 @@ check_unknowns_list(rb_dlink_list * list) { 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)); @@ -395,7 +413,6 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban) 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; @@ -406,18 +423,7 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban) } 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)) @@ -435,7 +441,7 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban) * 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 @@ -486,33 +492,6 @@ check_banned_lines(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)) @@ -602,55 +581,6 @@ check_klines(void) } } -/* 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 - @@ -926,10 +856,8 @@ get_client_name(struct Client *client, int showip) 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) @@ -955,49 +883,6 @@ get_client_name(struct Client *client, int 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() * @@ -1276,7 +1161,7 @@ exit_aborted_clients(void *unused) 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 @@ -1304,7 +1189,7 @@ dead_link(struct Client *client_p) 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)); @@ -1376,8 +1261,6 @@ exit_remote_client(struct Client *client_p, struct Client *source_p, struct Clie { 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); @@ -1398,7 +1281,11 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli const char *comment) { delete_auth_queries(source_p); - del_unknown_ip(source_p); + 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)) @@ -1480,15 +1367,12 @@ static int 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); @@ -1553,10 +1437,10 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s was connected" " for %ld seconds. %d/%d sendK/recvK.", - source_p->name, rb_current_time() - 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, rb_current_time() - 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); @@ -1580,6 +1464,7 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien const char *comment) { unsigned long on_for; + char tbuf[26]; exit_generic_client(client_p, source_p, from, comment); clear_monitor(source_p); @@ -1605,10 +1490,11 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien 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); @@ -1618,8 +1504,6 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien { 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); @@ -1709,8 +1593,8 @@ void 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))); } /* @@ -1720,10 +1604,10 @@ void 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)); } @@ -1796,10 +1680,6 @@ show_ip(struct Client *source_p, struct Client *target_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)) @@ -1832,24 +1712,6 @@ show_ip_conf(struct ConfItem *aconf, struct Client *source_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 * @@ -1866,7 +1728,7 @@ make_user(struct Client *client_p) 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; } @@ -1906,6 +1768,8 @@ make_server(struct Client *client_p) void free_user(struct User *user, struct Client *client_p) { + free_away(client_p); + if(--user->refcnt <= 0) { if(user->away) @@ -1932,25 +1796,25 @@ free_user(struct User *user, struct Client *client_p) 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->away != NULL) { - rb_bh_free(away_heap, client_p->user->away); - client_p->user->away = NULL; - } +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; + } } void @@ -2021,22 +1885,10 @@ close_connection(struct Client *client_p) { 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 += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime); /* * If the connection has been up for a long amount of time, schedule @@ -2059,42 +1911,25 @@ close_connection(struct Client *client_p) } 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 += (unsigned long long)(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); @@ -2132,7 +1967,7 @@ error_exit_client(struct Client *client_p, int error) { 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)); @@ -2148,7 +1983,7 @@ error_exit_client(struct Client *client_p, int error) } 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));