X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/4fd52c8c20d60a5f2b650dc1f2273b93439dd0bf..377b98f0794834938a3fc1e5959236a7927d19d7:/src/client.c diff --git a/src/client.c b/src/client.c index dd3ae34..ac45624 100644 --- a/src/client.c +++ b/src/client.c @@ -235,8 +235,14 @@ 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); - 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; @@ -323,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)); @@ -391,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)); @@ -850,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) @@ -879,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() * @@ -1200,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 @@ -1325,7 +1286,6 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli 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)) @@ -1407,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); @@ -1533,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", + 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); @@ -1722,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)) @@ -1934,7 +1888,7 @@ close_connection(struct Client *client_p) 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; + 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 @@ -1960,7 +1914,7 @@ close_connection(struct Client *client_p) 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; + ServerStats.is_cti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime); } else ServerStats.is_ni++; @@ -2013,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));