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

mr_server: Handle unknown error codes

Browse source 
As mr_server is a module, it could potentially receive an unknown
error code from check_server().
This commit is contained in:
Simon Arlott 2016-04-23 17:30:59 +01:00
parent 3bb3dcf7f5
commit b49efe577c
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/core/m_server.c
View file

@ -77,6 +77,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
int hop; int hop;
unsigned int required_mask; unsigned int required_mask;
const char *missing; const char *missing;
int ret;
name = parv[1]; name = parv[1];
hop = atoi(parv[2]); hop = atoi(parv[2]);
@ -112,8 +113,12 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
/* Now we just have to call check_server and everything should be /* Now we just have to call check_server and everything should be
* check for us... -A1kmm. */ * check for us... -A1kmm. */
switch (check_server(name, client_p)) ret = check_server(name, client_p);
switch (ret)
{ {
case 0:
/* success */
break;
case -1: case -1:
if(ConfigFileEntry.warn_no_nline) if(ConfigFileEntry.warn_no_nline)
{ {
@ -183,6 +188,16 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext"); exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext");
return; return;
default:
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Connection from servername %s rejected, unknown error %d",
name, ret);
ilog(L_SERVER, "Access denied, unknown error %d for server %s%s", ret,
EmptyString(client_p->name) ? name : "",
log_client_name(client_p, SHOW_IP));
exit_client(client_p, client_p, client_p, "Unknown error.");
return;
} }
/* require TS6 for direct links */ /* require TS6 for direct links */