X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=5b358b609bb88c175dc5c43b95964512e01aab95;hb=a4570bee71e9c8797b6d50ec1644efd234377707;hp=c545e4dde2abfcce76da25395fd131c8b4e65581;hpb=1a3138f7132003e097baa70dd1d9380fa65eadfe;p=citadel.git diff --git a/citadel/room_ops.c b/citadel/room_ops.c index c545e4dde..5b358b609 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -1,7 +1,7 @@ /* * Server functions which perform operations on room objects. * - * Copyright (c) 1987-2015 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 3. @@ -16,7 +16,6 @@ #include #include "citserver.h" - #include "ctdl_module.h" #include "config.h" #include "control.h" @@ -79,8 +78,8 @@ int CtdlDoIHavePermissionToPostInThisRoom( } - if ((CC->user.axlevel < AxProbU) - && ((CC->room.QRflags & QR_MAILBOX) == 0)) { + if ((CC->user.axlevel < AxProbU) && ((CC->room.QRflags & QR_MAILBOX) == 0)) + { snprintf(errmsgbuf, n, "Need to be validated to enter (except in %s> to sysop)", MAILROOM); return (ERROR + HIGHER_ACCESS_REQUIRED); } @@ -125,7 +124,8 @@ int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void) { } /* - * Retrieve access control information for any user/room pair + * Retrieve access control information for any user/room pair. + * Yes, it has a couple of gotos. If you don't like that, go die in a car fire. */ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, int *result, int *view) @@ -338,11 +338,12 @@ void room_sanity_check(struct ctdlroom *qrbuf) } /* Listing order of 0 is illegal except for base rooms */ if (qrbuf->QRorder == 0) - if (!(qrbuf->QRflags & QR_MAILBOX) && - strncasecmp(qrbuf->QRname, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN) - && - strncasecmp(qrbuf->QRname, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN)) + if ( !(qrbuf->QRflags & QR_MAILBOX) + && strncasecmp(qrbuf->QRname, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN) + && strncasecmp(qrbuf->QRname, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN) + ) { qrbuf->QRorder = 64; + } } @@ -395,6 +396,7 @@ int CtdlGetRoom(struct ctdlroom *qrbuf, const char *room_name) } } + /* * CtdlGetRoomLock() - same as getroom() but locks the record (if supported) */ @@ -458,10 +460,8 @@ void b_deleteroom(char *room_name) { */ void CtdlPutRoomLock(struct ctdlroom *qrbuf) { - CtdlPutRoom(qrbuf); end_critical_section(S_ROOMS); - } @@ -550,7 +550,6 @@ void CtdlGetFloor(struct floor *flbuf, int floor_num) */ void lgetfloor(struct floor *flbuf, int floor_num) { - begin_critical_section(S_FLOORTAB); CtdlGetFloor(flbuf, floor_num); } @@ -618,7 +617,6 @@ void CtdlPutFloor(struct floor *flbuf, int floor_num) */ void CtdlPutFloorLock(struct floor *flbuf, int floor_num) { - CtdlPutFloor(flbuf, floor_num); end_critical_section(S_FLOORTAB); @@ -635,7 +633,7 @@ void lputfloor(struct floor *flbuf, int floor_num) /* - * Traverse the room file... + * Iterate through the room table, performing a callback for each room. */ void CtdlForEachRoom(ForEachRoomCallBack CB, void *in_data) { @@ -659,11 +657,9 @@ void CtdlForEachRoom(ForEachRoomCallBack CB, void *in_data) } /* - * Traverse the room file... + * Iterate through the room table, performing a callback for each room that has a netconfig entry. */ -void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, - void *in_data, - RoomNetCfg filter) +void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data) { struct ctdlroom qrbuf; struct cdbdata *cdbqr; @@ -672,21 +668,17 @@ void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, while (cdbqr = cdb_next_item(CDB_ROOMS), cdbqr != NULL) { memset(&qrbuf, 0, sizeof(struct ctdlroom)); - memcpy(&qrbuf, cdbqr->ptr, - ((cdbqr->len > sizeof(struct ctdlroom)) ? - sizeof(struct ctdlroom) : cdbqr->len) - ); + memcpy(&qrbuf, cdbqr->ptr, ((cdbqr->len > sizeof(struct ctdlroom)) ? sizeof(struct ctdlroom) : cdbqr->len)); cdb_free(cdbqr); room_sanity_check(&qrbuf); if (qrbuf.QRflags & QR_INUSE) { - OneRoomNetCfg* RNCfg; + OneRoomNetCfg *RNCfg; RNCfg = CtdlGetNetCfgForRoom(qrbuf.QRnumber); - if ((RNCfg != NULL) && - ((filter == maxRoomNetCfg) || - (RNCfg->NetConfigs[filter] != NULL))) + if (RNCfg != NULL) { CB(&qrbuf, in_data, RNCfg); + FreeRoomNetworkStruct(&RNCfg); } } } @@ -834,8 +826,10 @@ void CtdlUserGoto(char *where, int display_result, int transiently, /* Check for new mail */ newmailcount = NewMailCount(); - /* set info to 1 if the user needs to read the room's info file */ - if (CCC->room.QRinfo > vbuf.v_lastseen) { + /* Set info to 1 if the room banner is new since our last visit. + * Some clients only want to display it when it changes. + */ + if (CCC->room.msgnum_info > vbuf.v_lastseen) { info = 1; } @@ -910,7 +904,7 @@ void CtdlUserGoto(char *where, int display_result, int transiently, if (retnew != NULL) *retnew = new_messages; if (retoldest != NULL) *retoldest = oldest_message; if (retnewest != NULL) *retnewest = newest_message; - MSG_syslog(LOG_INFO, "<%s> %d new of %d total messages, oldest=%ld, newest=%ld\n", + MSG_syslog(LOG_DEBUG, "<%s> %d new of %d total messages, oldest=%ld, newest=%ld", CCC->room.QRname, new_messages, total_messages, oldest_message, newest_message ); @@ -983,6 +977,7 @@ void convert_room_name_macros(char *towhere, size_t maxlen) { * in *at least* the old name! */ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { + struct CitContext *CCC = CC; int old_floor = 0; struct ctdlroom qrbuf; struct ctdlroom qrtmp; @@ -992,8 +987,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { long owner = 0L; char actual_old_name[ROOMNAMELEN]; - syslog(LOG_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n", - old_name, new_name, new_floor); + MSG_syslog(LOG_DEBUG, "CtdlRenameRoom(%s, %s, %d)", old_name, new_name, new_floor); if (new_floor >= 0) { fl = CtdlGetCachedFloor(new_floor); @@ -1013,9 +1007,9 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { ret = crr_room_not_found; } - else if ( (CC->user.axlevel < AxAideU) && (!CC->internal_pgm) - && (CC->user.usernum != qrbuf.QRroomaide) - && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->user.usernum))) ) { + else if ( (CCC->user.axlevel < AxAideU) && (!CCC->internal_pgm) + && (CCC->user.usernum != qrbuf.QRroomaide) + && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CCC->user.usernum))) ) { ret = crr_access_denied; } @@ -1040,7 +1034,8 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { /* Reject change of floor for baseroom/aideroom */ if (!strncasecmp(old_name, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN) || - !strncasecmp(old_name, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN)) { + !strncasecmp(old_name, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN)) + { new_floor = 0; } @@ -1081,11 +1076,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { lgetfloor(&flbuf, old_floor); --flbuf.f_ref_count; lputfloor(&flbuf, old_floor); - syslog(LOG_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count); + MSG_syslog(LOG_DEBUG, "Reference count for floor %d is now %d", old_floor, flbuf.f_ref_count); lgetfloor(&flbuf, new_floor); ++flbuf.f_ref_count; lputfloor(&flbuf, new_floor); - syslog(LOG_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count); + MSG_syslog(LOG_DEBUG, "Reference count for floor %d is now %d", new_floor, flbuf.f_ref_count); } /* ...and everybody say "YATTA!" */ @@ -1093,22 +1088,20 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { } - /* - * Asynchronously schedule a room for deletion. The room will appear - * deleted to the user(s), but it won't actually get purged from the - * database until THE DREADED AUTO-PURGER makes its next run. + * Asynchronously schedule a room for deletion. By placing the room into an invalid private namespace, + * the room will appear deleted to the user(s), but the session doesn't need to block while waiting for + * database operations to complete. Instead, the room gets purged when THE DREADED AUTO-PURGER makes + * its next run. Aren't we so clever?!! */ void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf) { char old_name[ROOMNAMELEN]; static int seq = 0; - syslog(LOG_NOTICE, "Scheduling room <%s> for deletion\n", - qrbuf->QRname); + syslog(LOG_NOTICE, "Scheduling room <%s> for deletion", qrbuf->QRname); safestrncpy(old_name, qrbuf->QRname, sizeof old_name); - CtdlGetRoom(qrbuf, qrbuf->QRname); /* Turn the room into a private mailbox owned by a user who doesn't @@ -1122,9 +1115,7 @@ void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf) ); qrbuf->QRflags |= QR_MAILBOX; time(&qrbuf->QRgen); /* Use a timestamp as the new generation number */ - CtdlPutRoom(qrbuf); - b_deleteroom(old_name); } @@ -1139,22 +1130,13 @@ void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf) void CtdlDeleteRoom(struct ctdlroom *qrbuf) { struct floor flbuf; - char filename[100]; - /* TODO: filename magic? does this realy work? */ - - syslog(LOG_NOTICE, "Deleting room <%s>\n", qrbuf->QRname); + char configdbkeyname[25]; - /* Delete the info file */ - assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir); - unlink(filename); + syslog(LOG_NOTICE, "Deleting room <%s>", qrbuf->QRname); - /* Delete the image file */ - assoc_file_name(filename, sizeof filename, qrbuf, ctdl_image_dir); - unlink(filename); - - /* Delete the room's network config file */ - assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir); - unlink(filename); + /* Delete the room's network configdb entry */ + netcfg_keyname(configdbkeyname, qrbuf->QRnumber); + CtdlDelConfig(configdbkeyname); /* Delete the messages in the room * (Careful: this opens an S_ROOMS critical section!) @@ -1176,7 +1158,6 @@ void CtdlDeleteRoom(struct ctdlroom *qrbuf) } - /* * Check access control for deleting a room */ @@ -1235,11 +1216,10 @@ unsigned CtdlCreateRoom(char *new_room_name, struct floor flbuf; visit vbuf; - syslog(LOG_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)\n", - new_room_name, new_room_type, new_room_view); + MARK_syslog(LOG_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)", new_room_name, new_room_type, new_room_view); if (CtdlGetRoom(&qrbuf, new_room_name) == 0) { - syslog(LOG_DEBUG, "%s already exists.\n", new_room_name); + MARK_syslog(LOG_DEBUG, "Cannot create room <%s> - already exists", new_room_name); return(0); }