Conn_Write(): Make sure there is a client when detecting its type

[ngircd-alex.git] / src / ngircd / lists.c

diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index 8e120bfeb16a059bf17d043dd440bd69c587cfe7..fd86f3017efabea10175054619177b982f2a4670 100644 (file)
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -60,13 +60,13 @@ Lists_GetMask(const struct list_elem *e)
  * Get optional "reason" text stored in list element.
  *
  * @param list_elem List element.
- * @return Pointer to "reason" text or NULL.
+ * @return Pointer to "reason" text or empty string ("").
  */
 GLOBAL const char *
 Lists_GetReason(const struct list_elem *e)
 {
        assert(e != NULL);
-       return e->reason;
+       return e->reason ? e->reason : "";
 }
 
 /**
@@ -126,8 +126,15 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil,
        assert(h != NULL);
        assert(Mask != NULL);
 
-       if (Lists_CheckDupeMask(h, Mask))
+       e = Lists_CheckDupeMask(h, Mask);
+       if (e) {
+               e->valid_until = ValidUntil;
+               if (Reason) {
+                       free(e->reason);
+                       e->reason = strdup(Reason);
+               }
                return true;
+       }
 
        e = Lists_GetFirst(h);
 
@@ -240,17 +247,17 @@ Lists_Free(struct list_head *head)
  * @param Mask IRC mask to test.
  * @return true if mask is already stored in the list, false otherwise.
  */
-GLOBAL bool
+GLOBAL struct list_elem *
 Lists_CheckDupeMask(const struct list_head *h, const char *Mask )
 {
        struct list_elem *e;
        e = h->first;
        while (e) {
                if (strcasecmp(e->mask, Mask) == 0)
-                       return true;
+                       return e;
                e = e->next;
        }
-       return false;
+       return NULL;
 }
 
 /**
@@ -324,14 +331,6 @@ Lists_Check( struct list_head *h, CLIENT *Client)
 
        while (e) {
                next = e->next;
-               if (e->valid_until > 1 && e->valid_until < time(NULL)) {
-                       /* Entry is expired, delete it */
-                       LogDebug("Deleted \"%s\" from list (expired).",
-                                e->mask);
-                       Lists_Unlink(h, last, e);
-                       e = next;
-                       continue;
-               }
                if (Match(e->mask, Client_Mask(Client))) {
                        if (e->valid_until == 1) {
                                /* Entry is valid only once, delete it */
@@ -348,4 +347,42 @@ Lists_Check( struct list_head *h, CLIENT *Client)
        return false;
 }
 
+/**
+ * Check list and purge expired entries.
+ *
+ * @param h List head.
+ */
+GLOBAL void
+Lists_Expire(struct list_head *h, const char *ListName)
+{
+       struct list_elem *e, *last, *next;
+       time_t now;
+
+       assert(h != NULL);
+
+       e = h->first;
+       last = NULL;
+       now = time(NULL);
+
+       while (e) {
+               next = e->next;
+               if (e->valid_until > 1 && e->valid_until < now) {
+                       /* Entry is expired, delete it */
+                       if (e->reason)
+                               Log(LOG_INFO,
+                                   "Deleted \"%s\" (\"%s\") from %s list (expired).",
+                                   e->mask, e->reason, ListName);
+                       else
+                               Log(LOG_INFO,
+                                   "Deleted \"%s\" from %s list (expired).",
+                                   e->mask, ListName);
+                       Lists_Unlink(h, last, e);
+                       e = next;
+                       continue;
+               }
+               last = e;
+               e = next;
+       }
+}
+
 /* -eof- */