MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-26 08:42:34 +01:00
Code Issues Releases Wiki Activity

authd: more minor cleanups

Browse source
This commit is contained in:
Elizabeth Myers 2016-04-02 01:16:47 -05:00
parent b1a577f224
commit 6a7bb6f1df
1 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
ircd/authd.c
View file

@ -109,6 +109,41 @@ start_authd(void)
return 0; return 0;
} }
static inline uint32_t
str_to_cid(const char *str)
{
long lcid = strtol(str, NULL, 16);
if(lcid > UINT32_MAX || lcid <= 0)
{
iwarn("authd sent us back a bad client ID: %lx", lcid);
restart_authd();
return 0;
}
return (uint32_t)lcid;
}
static inline struct Client *
cid_to_client(uint32_t cid, bool delete)
{
struct Client *client_p;
if(delete)
client_p = rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(cid));
else
client_p = rb_dictionary_retrieve(cid_clients, RB_UINT_TO_POINTER(cid));
if(client_p == NULL)
{
iwarn("authd sent us back a bad client ID: %ux", cid);
restart_authd();
return NULL;
}
return client_p;
}
static void static void
parse_authd_reply(rb_helper * helper) parse_authd_reply(rb_helper * helper)
{ {
@ -116,7 +151,6 @@ parse_authd_reply(rb_helper * helper)
int parc; int parc;
char authdBuf[READBUF_SIZE]; char authdBuf[READBUF_SIZE];
char *parv[MAXPARA + 1]; char *parv[MAXPARA + 1];
long lcid;
uint32_t cid; uint32_t cid;
struct Client *client_p; struct Client *client_p;
@ -134,22 +168,12 @@ parse_authd_reply(rb_helper * helper)
return; return;
} }
if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX || lcid < 0) if((cid = str_to_cid(parv[1])) == 0)
{
iwarn("authd sent us back a bad client ID: %ld", lcid);
restart_authd();
return; return;
}
cid = (uint32_t)lcid;
/* cid to uid (retrieve and delete) */ /* cid to uid (retrieve and delete) */
if((client_p = rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(cid))) == NULL) if((client_p = cid_to_client(cid, true)) == NULL)
{
iwarn("authd sent us back an unknown client ID %x", cid);
restart_authd();
return; return;
}
authd_accept_client(client_p, parv[2], parv[3]); authd_accept_client(client_p, parv[2], parv[3]);
break; break;
@ -161,22 +185,12 @@ parse_authd_reply(rb_helper * helper)
return; return;
} }
if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX || lcid < 0) if((cid = str_to_cid(parv[1])) == 0)
{
iwarn("authd sent us back a bad client ID %ld", lcid);
restart_authd();
return; return;
}
cid = (uint32_t)lcid;
/* cid to uid (retrieve and delete) */ /* cid to uid (retrieve and delete) */
if((client_p = rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(cid))) == NULL) if((client_p = cid_to_client(cid, true)) == NULL)
{
iwarn("authd sent us back an unknown client ID %x", cid);
restart_authd();
return; return;
}
authd_reject_client(client_p, parv[3], parv[4], toupper(*parv[2]), parv[5], parv[6]); authd_reject_client(client_p, parv[3], parv[4], toupper(*parv[2]), parv[5], parv[6]);
break; break;
@ -188,22 +202,12 @@ parse_authd_reply(rb_helper * helper)
return; return;
} }
if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX || lcid < 0) if((cid = str_to_cid(parv[1])) == 0)
{
iwarn("authd sent us back a bad client ID %ld", lcid);
restart_authd();
return; return;
}
cid = (uint32_t)lcid;
/* cid to uid */ /* cid to uid */
if((client_p = rb_dictionary_retrieve(cid_clients, RB_UINT_TO_POINTER(cid))) == NULL) if((client_p = cid_to_client(cid, false)) == NULL)
{
iwarn("authd sent us back an unknown client ID %x", cid);
restart_authd();
return; return;
}
sendto_one_notice(client_p, ":%s", parv[2]); sendto_one_notice(client_p, ":%s", parv[2]);
break; break;