]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_expire.c
* Removed all of the thread cancellation cruft that is no longer necessary
[citadel.git] / citadel / serv_expire.c
index 59cd938571f8c9740e1f2f4e1de5e4fcb9d7be48..6ba24723e7f53f11ff5b7278b363555b54387bb7 100644 (file)
@@ -3,8 +3,8 @@
  *
  * This module handles the expiry of old messages and the purging of old users.
  *
+ * $Id$
  */
-/* $Id$ */
 
 
 /*
@@ -23,6 +23,7 @@
  */
 
 
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -35,7 +36,6 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
-#include <pthread.h>
 #include "citadel.h"
 #include "server.h"
 #include <syslog.h>
@@ -59,30 +59,30 @@ struct oldvisit {
        long v_generation;
        long v_lastseen;
        unsigned int v_flags;
-       };
+};
 
 struct PurgeList {
        struct PurgeList *next;
        char name[ROOMNAMELEN]; /* use the larger of username or roomname */
-       };
+};
 
 struct VPurgeList {
        struct VPurgeList *next;
        long vp_roomnum;
        long vp_roomgen;
        long vp_usernum;
-       };
+};
 
 struct ValidRoom {
        struct ValidRoom *next;
        long vr_roomnum;
        long vr_roomgen;
-       };
+};
 
 struct ValidUser {
        struct ValidUser *next;
        long vu_usernum;
-       };
+};
 
 struct PurgeList *UserPurgeList = NULL;
 struct PurgeList *RoomPurgeList = NULL;
@@ -92,142 +92,212 @@ int messages_purged;
 
 extern struct CitContext *ContextList;
 
-#define MODULE_NAME    "Expire old messages, users, rooms"
-#define MODULE_AUTHOR  "Art Cancro"
-#define MODULE_EMAIL   "ajc@uncnsrd.mt-kisco.ny.us"
-#define MAJOR_VERSION  0
-#define MINOR_VERSION  1
-
-static struct DLModule_Info info = {
-       MODULE_NAME,
-       MODULE_AUTHOR,
-       MODULE_EMAIL,
-       MAJOR_VERSION,
-       MINOR_VERSION
-       };
-
 void DoPurgeMessages(struct quickroom *qrbuf) {
        struct ExpirePolicy epbuf;
        long delnum;
        time_t xtime, now;
-       char msgid[64];
+       struct CtdlMessage *msg;
        int a;
+        struct cdbdata *cdbfr;
+       long *msglist = NULL;
+       int num_msgs = 0;
 
-       messages_purged = 0;
        time(&now);
        GetExpirePolicy(&epbuf, qrbuf);
        
-       /*
-       lprintf(9, "ExpirePolicy for <%s> is <%d> <%d>\n",
-               qrbuf->QRname, epbuf.expire_mode, epbuf.expire_value);
-       */
-
        /* If the room is set to never expire messages ... do nothing */
        if (epbuf.expire_mode == EXPIRE_NEXTLEVEL) return;
        if (epbuf.expire_mode == EXPIRE_MANUAL) return;
 
        begin_critical_section(S_QUICKROOM);
-       get_msglist(qrbuf);
+        cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf->QRnumber, sizeof(long));
+
+        if (cdbfr != NULL) {
+               msglist = mallok(cdbfr->len);
+               memcpy(msglist, cdbfr->ptr, cdbfr->len);
+               num_msgs = cdbfr->len / sizeof(long);
+               cdb_free(cdbfr);
+       }
        
        /* Nothing to do if there aren't any messages */
-       if (CC->num_msgs == 0) {
+       if (num_msgs == 0) {
                end_critical_section(S_QUICKROOM);
                return;
-               }
+       }
 
        /* If the room is set to expire by count, do that */
        if (epbuf.expire_mode == EXPIRE_NUMMSGS) {
-               while (CC->num_msgs > epbuf.expire_value) {
-                       delnum = MessageFromList(0);
+               while (num_msgs > epbuf.expire_value) {
+                       delnum = msglist[0];
                        lprintf(5, "Expiring message %ld\n", delnum);
-                       cdb_delete(CDB_MSGMAIN, &delnum, sizeof(long));
-                       memcpy(&CC->msglist[0], &CC->msglist[1],
-                               (sizeof(long)*(CC->num_msgs - 1)));
-                       CC->num_msgs = CC->num_msgs - 1;
+                       AdjRefCount(delnum, -1); 
+                       memcpy(&msglist[0], &msglist[1],
+                               (sizeof(long)*(num_msgs - 1)));
+                       --num_msgs;
                        ++messages_purged;
-                       }
                }
+       }
 
        /* If the room is set to expire by age... */
        if (epbuf.expire_mode == EXPIRE_AGE) {
-               for (a=0; a<(CC->num_msgs); ++a) {
-                       delnum = MessageFromList(a);
-                       sprintf(msgid, "%ld", delnum);
-                       xtime = output_message(msgid, MT_DATE, 0, 0);
+               for (a=0; a<num_msgs; ++a) {
+                       delnum = msglist[a];
+
+                       msg = CtdlFetchMessage(delnum);
+                       if (msg != NULL) {
+                               xtime = atol(msg->cm_fields['T']);
+                               CtdlFreeMessage(msg);
+                       } else {
+                               xtime = 0L;
+                       }
 
                        if ((xtime > 0L)
                           && (now - xtime > (time_t)(epbuf.expire_value * 86400L))) {
-                               cdb_delete(CDB_MSGMAIN, &delnum, sizeof(long));
-                               SetMessageInList(a, 0L);
                                lprintf(5, "Expiring message %ld\n", delnum);
-                               }
+                               AdjRefCount(delnum, -1); 
+                               msglist[a] = 0L;
+                               ++messages_purged;
                        }
                }
-       CC->num_msgs = sort_msglist(CC->msglist, CC->num_msgs);
-       put_msglist(qrbuf);
-       end_critical_section(S_QUICKROOM);
        }
 
+       if (num_msgs > 0) {
+               num_msgs = sort_msglist(msglist, num_msgs);
+       }
+       
+       cdb_store(CDB_MSGLISTS, &qrbuf->QRnumber, sizeof(long),
+               msglist, (num_msgs * sizeof(long)) );
+
+       if (msglist != NULL) phree(msglist);
+
+       end_critical_section(S_QUICKROOM);
+}
+
 void PurgeMessages(void) {
        lprintf(5, "PurgeMessages() called\n");
+       messages_purged = 0;
        ForEachRoom(DoPurgeMessages);
-       }
+}
 
 
+void AddValidUser(struct usersupp *usbuf) {
+       struct ValidUser *vuptr;
+
+       vuptr = (struct ValidUser *)mallok(sizeof(struct ValidUser));
+       vuptr->next = ValidUserList;
+       vuptr->vu_usernum = usbuf->usernum;
+       ValidUserList = vuptr;
+}
+
+void AddValidRoom(struct quickroom *qrbuf) {
+       struct ValidRoom *vrptr;
+
+       vrptr = (struct ValidRoom *)mallok(sizeof(struct ValidRoom));
+       vrptr->next = ValidRoomList;
+       vrptr->vr_roomnum = qrbuf->QRnumber;
+       vrptr->vr_roomgen = qrbuf->QRgen;
+       ValidRoomList = vrptr;
+}
+
 void DoPurgeRooms(struct quickroom *qrbuf) {
        time_t age, purge_secs;
        struct PurgeList *pptr;
+       struct ValidUser *vuptr;
+       int do_purge = 0;
+
+       /* For mailbox rooms, there's only one purging rule: if the user who
+        * owns the room still exists, we keep the room; otherwise, we purge
+        * it.  Bypass any other rules.
+        */
+       if (qrbuf->QRflags & QR_MAILBOX) {
+               for (vuptr=ValidUserList; vuptr!=NULL; vuptr=vuptr->next) {
+                       if (vuptr->vu_usernum == atol(qrbuf->QRname)) {
+                               do_purge = 0;
+                               goto BYPASS;
+                       }
+               }
+               /* user not found */
+               do_purge = 1;
+               goto BYPASS;
+       }
 
        /* Any of these attributes render a room non-purgable */
        if (qrbuf->QRflags & QR_PERMANENT) return;
        if (qrbuf->QRflags & QR_DIRECTORY) return;
        if (qrbuf->QRflags & QR_NETWORK) return;
-       if (qrbuf->QRflags & QR_MAILBOX) return;
        if (is_noneditable(qrbuf)) return;
 
        /* If we don't know the modification date, be safe and don't purge */
        if (qrbuf->QRmtime <= (time_t)0) return;
 
+       /* If no room purge time is set, be safe and don't purge */
+       if (config.c_roompurge < 0) return;
+
        /* Otherwise, check the date of last modification */
        age = time(NULL) - (qrbuf->QRmtime);
        purge_secs = (time_t)config.c_roompurge * (time_t)86400;
        if (purge_secs <= (time_t)0) return;
        lprintf(9, "<%s> is <%ld> seconds old\n", qrbuf->QRname, age);
+       if (age > purge_secs) do_purge = 1;
 
-       if (age > purge_secs) {
-               
-               pptr = (struct PurgeList *) malloc(sizeof(struct PurgeList));
+BYPASS:        if (do_purge) {
+               pptr = (struct PurgeList *) mallok(sizeof(struct PurgeList));
                pptr->next = RoomPurgeList;
                strcpy(pptr->name, qrbuf->QRname);
                RoomPurgeList = pptr;
-
-               }
        }
 
+}
+       
+
 
 int PurgeRooms(void) {
        struct PurgeList *pptr;
        int num_rooms_purged = 0;
        struct quickroom qrbuf;
+       struct ValidUser *vuptr;
+       char *transcript = NULL;
 
        lprintf(5, "PurgeRooms() called\n");
-       if (config.c_roompurge > 0) {
-               ForEachRoom(DoPurgeRooms);
-               }
+
+
+       /* Load up a table full of valid user numbers so we can delete
+        * user-owned rooms for users who no longer exist */
+       ForEachUser(AddValidUser);
+
+       /* Then cycle through the room file */
+       ForEachRoom(DoPurgeRooms);
+
+       /* Free the valid user list */
+       while (ValidUserList != NULL) {
+               vuptr = ValidUserList->next;
+               phree(ValidUserList);
+               ValidUserList = vuptr;
+       }
+
+
+       transcript = mallok(256);
+       strcpy(transcript, "The following rooms have been auto-purged:\n");
 
        while (RoomPurgeList != NULL) {
                if (getroom(&qrbuf, RoomPurgeList->name) == 0) {
+                       transcript=reallok(transcript, strlen(transcript)+256);
+                       sprintf(&transcript[strlen(transcript)], " %s\n",
+                               qrbuf.QRname);
                        delete_room(&qrbuf);
-                       }
+               }
                pptr = RoomPurgeList->next;
-               free(RoomPurgeList);
+               phree(RoomPurgeList);
                RoomPurgeList = pptr;
                ++num_rooms_purged;
-               }
+       }
+
+       if (num_rooms_purged > 0) aide_message(transcript);
+       phree(transcript);
 
        lprintf(5, "Purged %d rooms.\n", num_rooms_purged);
        return(num_rooms_purged);
-       }
+}
 
 
 void do_user_purge(struct usersupp *us) {
@@ -239,10 +309,10 @@ void do_user_purge(struct usersupp *us) {
        /* Set purge time; if the user overrides the system default, use it */
        if (us->USuserpurge > 0) {
                purge_time = ((time_t)us->USuserpurge) * 86400L;
-               }
+       }
        else {
                purge_time = ((time_t)config.c_userpurge) * 86400L;
-               }
+       }
 
        /* The default rule is to not purge. */
        purge = 0;
@@ -274,55 +344,46 @@ void do_user_purge(struct usersupp *us) {
        if (us->timescalled == 0) purge = 1;
 
        if (purge == 1) {
-               pptr = (struct PurgeList *) malloc(sizeof(struct PurgeList));
+               pptr = (struct PurgeList *) mallok(sizeof(struct PurgeList));
                pptr->next = UserPurgeList;
                strcpy(pptr->name, us->fullname);
                UserPurgeList = pptr;
-               }
-
        }
 
+}
+
 
 
 int PurgeUsers(void) {
        struct PurgeList *pptr;
        int num_users_purged = 0;
+       char *transcript = NULL;
 
        lprintf(5, "PurgeUsers() called\n");
        if (config.c_userpurge > 0) {
                ForEachUser(do_user_purge);
-               }
+       }
+
+       transcript = mallok(256);
+       strcpy(transcript, "The following users have been auto-purged:\n");
 
        while (UserPurgeList != NULL) {
+               transcript=reallok(transcript, strlen(transcript)+256);
+               sprintf(&transcript[strlen(transcript)], " %s\n",
+                       UserPurgeList->name);
                purge_user(UserPurgeList->name);
                pptr = UserPurgeList->next;
-               free(UserPurgeList);
+               phree(UserPurgeList);
                UserPurgeList = pptr;
                ++num_users_purged;
-               }
-
-       lprintf(5, "Purged %d users.\n", num_users_purged);
-       return(num_users_purged);
        }
 
-void AddValidUser(struct usersupp *usbuf) {
-       struct ValidUser *vuptr;
+       if (num_users_purged > 0) aide_message(transcript);
+       phree(transcript);
 
-       vuptr = (struct ValidUser *)malloc(sizeof(struct ValidUser));
-       vuptr->next = ValidUserList;
-       vuptr->vu_usernum = usbuf->usernum;
-       ValidUserList = vuptr;
-       }
-
-void AddValidRoom(struct quickroom *qrbuf) {
-       struct ValidRoom *vrptr;
-
-       vrptr = (struct ValidRoom *)malloc(sizeof(struct ValidRoom));
-       vrptr->next = ValidRoomList;
-       vrptr->vr_roomnum = qrbuf->QRnumber;
-       vrptr->vr_roomgen = qrbuf->QRgen;
-       ValidRoomList = vrptr;
-       }
+       lprintf(5, "Purged %d users.\n", num_users_purged);
+       return(num_users_purged);
+}
 
 
 /*
@@ -372,40 +433,40 @@ int PurgeVisits(void) {
                        if ( (vrptr->vr_roomnum==vbuf.v_roomnum)
                             && (vrptr->vr_roomgen==vbuf.v_roomgen))
                                RoomIsValid = 1;
-                       }
+               }
 
                /* Check to see if the user exists */
                for (vuptr=ValidUserList; vuptr!=NULL; vuptr=vuptr->next) {
                        if (vuptr->vu_usernum == vbuf.v_usernum)
                                UserIsValid = 1;
-                       }
+               }
 
                /* Put the record on the purge list if it's dead */
                if ((RoomIsValid==0) || (UserIsValid==0)) {
                        vptr = (struct VPurgeList *)
-                               malloc(sizeof(struct VPurgeList));
+                               mallok(sizeof(struct VPurgeList));
                        vptr->next = VisitPurgeList;
                        vptr->vp_roomnum = vbuf.v_roomnum;
                        vptr->vp_roomgen = vbuf.v_roomgen;
                        vptr->vp_usernum = vbuf.v_usernum;
                        VisitPurgeList = vptr;
-                       }
-
                }
 
+       }
+
        /* Free the valid room/gen combination list */
        while (ValidRoomList != NULL) {
                vrptr = ValidRoomList->next;
-               free(ValidRoomList);
+               phree(ValidRoomList);
                ValidRoomList = vrptr;
-               }
+       }
 
        /* Free the valid user list */
        while (ValidUserList != NULL) {
                vuptr = ValidUserList->next;
-               free(ValidUserList);
+               phree(ValidUserList);
                ValidUserList = vuptr;
-               }
+       }
 
        /* Now delete every visit on the purged list */
        while (VisitPurgeList != NULL) {
@@ -415,13 +476,13 @@ int PurgeVisits(void) {
                                VisitPurgeList->vp_usernum);
                cdb_delete(CDB_VISIT, IndexBuf, IndexLen);
                vptr = VisitPurgeList->next;
-               free(VisitPurgeList);
+               phree(VisitPurgeList);
                VisitPurgeList = vptr;
                ++purged;
-               }
+       }
        
        return(purged);
-       }
+}
 
 
 void cmd_expi(char *argbuf) {
@@ -432,48 +493,48 @@ void cmd_expi(char *argbuf) {
        if ((!(CC->logged_in))&&(!(CC->internal_pgm))) {
                cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
                return;
-               }
+       }
 
        if ((!is_room_aide()) && (!(CC->internal_pgm)) ) {
                cprintf("%d Higher access required.\n",
                        ERROR+HIGHER_ACCESS_REQUIRED);
                return;
-               }
+       }
 
        extract(cmd, argbuf, 0);
        if (!strcasecmp(cmd, "users")) {
                retval = PurgeUsers();
                cprintf("%d Purged %d users.\n", OK, retval);
                return;
-               }
+       }
        else if (!strcasecmp(cmd, "messages")) {
                PurgeMessages();
                cprintf("%d Expired %d messages.\n", OK, messages_purged);
                return;
-               }
+       }
        else if (!strcasecmp(cmd, "rooms")) {
                retval = PurgeRooms();
                cprintf("%d Expired %d rooms.\n", OK, retval);
                return;
-               }
+       }
        else if (!strcasecmp(cmd, "visits")) {
                retval = PurgeVisits();
                cprintf("%d Purged %d visits.\n", OK, retval);
-               }
+       }
        else if (!strcasecmp(cmd, "defrag")) {
                defrag_databases();
                cprintf("%d Defragmented the databases.\n", OK);
-               }
+       }
        else {
                cprintf("%d Invalid command.\n", ERROR+ILLEGAL_VALUE);
                return;
-               }
        }
+}
 
 
 
-struct DLModule_Info *Dynamic_Module_Init(void)
+char *Dynamic_Module_Init(void)
 {
-   CtdlRegisterProtoHook(cmd_expi, "EXPI", "Expire old system objects");
-   return &info;
+       CtdlRegisterProtoHook(cmd_expi, "EXPI", "Expire old system objects");
+       return "$Id$";
 }