Change Lists_CheckReason() to receive a buffer where the reason
will be stored and its length. Change callers accordingly.
Change Class_GetMemberReason() (and its callers) in a similar way
so it doesn't rely on a global buffer for the rejected reason.
struct list_head My_Classes[CLASS_COUNT];
struct list_head My_Classes[CLASS_COUNT];
-char Reject_Reason[COMMAND_LEN];
-
GLOBAL void
Class_Init(void)
{
GLOBAL void
Class_Init(void)
{
for (i = 0; i < CLASS_COUNT; Lists_Free(&My_Classes[i++]));
}
for (i = 0; i < CLASS_COUNT; Lists_Free(&My_Classes[i++]));
}
-GLOBAL char *
-Class_GetMemberReason(const int Class, CLIENT *Client)
+GLOBAL bool
+Class_GetMemberReason(const int Class, CLIENT *Client, char *reason, size_t len)
+ char str[COMMAND_LEN] = "listed";
assert(Class < CLASS_COUNT);
assert(Client != NULL);
assert(Class < CLASS_COUNT);
assert(Client != NULL);
- reason = Lists_CheckReason(&My_Classes[Class], Client);
- if (!reason)
- return NULL;
-
- if (!*reason)
- reason = "listed";
+ if (!Lists_CheckReason(&My_Classes[Class], Client, str, sizeof(str)))
+ return false;
switch(Class) {
case CLASS_GLINE:
switch(Class) {
case CLASS_GLINE:
- snprintf(Reject_Reason, sizeof(Reject_Reason),
- "\"%s\" (G-Line)", reason);
- return Reject_Reason;
+ snprintf(reason, len, "\"%s\" (G-Line)", str);
+ break;
- snprintf(Reject_Reason, sizeof(Reject_Reason),
- "\"%s\" (K-Line)", reason);
- return Reject_Reason;
+ snprintf(reason, len, "\"%s\" (K-Line)", str);
+ break;
+ default:
+ snprintf(reason, len, "%s", str);
+ break;
GLOBAL bool
Class_HandleServerBans(CLIENT *Client)
{
GLOBAL bool
Class_HandleServerBans(CLIENT *Client)
{
+ char reject[COMMAND_LEN];
- rejectptr = Class_GetMemberReason(CLASS_GLINE, Client);
- if (!rejectptr)
- rejectptr = Class_GetMemberReason(CLASS_KLINE, Client);
- if (rejectptr) {
- Client_Reject(Client, rejectptr, true);
+ if (Class_GetMemberReason(CLASS_GLINE, Client, reject, sizeof(reject)) ||
+ Class_GetMemberReason(CLASS_KLINE, Client, reject, sizeof(reject))) {
+ Client_Reject(Client, reject, true);
const time_t ValidUntil, const char *Reason));
GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask));
const time_t ValidUntil, const char *Reason));
GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask));
-GLOBAL char *Class_GetMemberReason PARAMS((const int Class, CLIENT *Client));
+GLOBAL bool Class_GetMemberReason PARAMS((const int Class, CLIENT *Client,
+ char *reason, size_t len));
GLOBAL bool Class_HandleServerBans PARAMS((CLIENT *Client));
GLOBAL struct list_head *Class_GetList PARAMS((const int Class));
GLOBAL bool Class_HandleServerBans PARAMS((CLIENT *Client));
GLOBAL struct list_head *Class_GetList PARAMS((const int Class));
if (e) {
e->valid_until = ValidUntil;
if (Reason) {
if (e) {
e->valid_until = ValidUntil;
if (Reason) {
+ if (e->reason)
+ free(e->reason);
e->reason = strdup(Reason);
}
return true;
e->reason = strdup(Reason);
}
return true;
bool
Lists_Check(struct list_head *h, CLIENT *Client)
{
bool
Lists_Check(struct list_head *h, CLIENT *Client)
{
- return Lists_CheckReason(h, Client) != NULL;
+ return Lists_CheckReason(h, Client, NULL, 0);
- * Check if a client is listed in a list and return the "reason".
+ * Check if a client is listed in a list and store the reason if a buffer
+ * is provided.
* @param Client Client to check.
* @param Client Client to check.
+ * @param reason Result buffer to store the reason.
+ * @param len Size of the buffer.
* @return true if client is listed, false if not.
*/
* @return true if client is listed, false if not.
*/
-char *
-Lists_CheckReason(struct list_head *h, CLIENT *Client)
+bool
+Lists_CheckReason(struct list_head *h, CLIENT *Client, char *reason, size_t len)
{
struct list_elem *e, *last, *next;
{
struct list_elem *e, *last, *next;
while (e) {
next = e->next;
if (Match(e->mask, Client_MaskCloaked(Client))) {
while (e) {
next = e->next;
if (Match(e->mask, Client_MaskCloaked(Client))) {
+ if (len && e->reason)
+ strlcpy(reason, e->reason, len);
if (e->valid_until == 1) {
/* Entry is valid only once, delete it */
LogDebug("Deleted \"%s\" from list (used).",
e->mask);
Lists_Unlink(h, last, e);
}
if (e->valid_until == 1) {
/* Entry is valid only once, delete it */
LogDebug("Deleted \"%s\" from list (used).",
e->mask);
Lists_Unlink(h, last, e);
}
- return e->reason ? e->reason : "";
GLOBAL struct list_elem *Lists_GetNext PARAMS((const struct list_elem *));
GLOBAL bool Lists_Check PARAMS((struct list_head *head, CLIENT *client));
GLOBAL struct list_elem *Lists_GetNext PARAMS((const struct list_elem *));
GLOBAL bool Lists_Check PARAMS((struct list_head *head, CLIENT *client));
-GLOBAL char *Lists_CheckReason PARAMS((struct list_head *head, CLIENT *client));
+GLOBAL bool Lists_CheckReason PARAMS((struct list_head *head, CLIENT *client,
+ char *reason, size_t len));
GLOBAL struct list_elem *Lists_CheckDupeMask PARAMS((const struct list_head *head,
const char *mask));
GLOBAL struct list_elem *Lists_CheckDupeMask PARAMS((const struct list_head *head,
const char *mask));