9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: Show the missing CAPABs when rejecting a server.

Browse source
This commit is contained in:
Jilles Tjoelker 2013-01-02 21:00:18 +01:00
parent 22b24f637d
commit fce4df5473
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/core/m_server.c
View file

@ -76,6 +76,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
struct Client *target_p; struct Client *target_p;
int hop; int hop;
unsigned int required_mask; unsigned int required_mask;
const char *missing;
name = parv[1]; name = parv[1];
hop = atoi(parv[2]); hop = atoi(parv[2]);
@ -194,15 +195,22 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
} }
/* check to ensure any "required" caps are set. --nenolod */ /* check to ensure any "required" caps are set. --nenolod */
/* XXX: show required CAPABs. */
required_mask = capability_index_get_required(serv_capindex); required_mask = capability_index_get_required(serv_capindex);
if (!IsCapable(client_p, required_mask)) if (!IsCapable(client_p, required_mask))
{ {
missing = capability_index_list(serv_capindex, required_mask &
~client_p->localClient->caps);
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Link %s dropped, required CAPABs are missing", name); "Link %s dropped, required CAPABs [%s] are missing",
ilog(L_SERVER, "Link %s%s dropped, required CAPABs are missing", name, missing);
ilog(L_SERVER, "Link %s%s dropped, required CAPABs [%s] are missing",
EmptyString(client_p->name) ? name : "", EmptyString(client_p->name) ? name : "",
log_client_name(client_p, SHOW_IP)); log_client_name(client_p, SHOW_IP), missing);
/* Do not use '[' in the below message because it would cause
* it to be considered potentially unsafe (might disclose IP
* addresses)
*/
sendto_one(client_p, "ERROR :Missing required CAPABs (%s)", missing);
exit_client(client_p, client_p, client_p, "Missing required CAPABs"); exit_client(client_p, client_p, client_p, "Missing required CAPABs");
return 0; return 0;