/*
- * Traverse the room file...
+ * Iterate through the room table, performing a callback for each room.
*/
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;
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);
}
}
}
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",
+ 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
);
* 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;
long owner = 0L;
char actual_old_name[ROOMNAMELEN];
- syslog(LOG_DEBUG, "CtdlRenameRoom(%s, %s, %d)", 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);
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;
}
lgetfloor(&flbuf, old_floor);
--flbuf.f_ref_count;
lputfloor(&flbuf, old_floor);
- syslog(LOG_DEBUG, "Reference count for floor %d is now %d", 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", 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!" */
{
struct floor flbuf;
char filename[PATH_MAX];
+ char configdbkeyname[25];
syslog(LOG_NOTICE, "Deleting room <%s>", qrbuf->QRname);
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!)
}
-
/*
* Check access control for deleting a room
*/
struct floor flbuf;
visit vbuf;
- syslog(LOG_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)", 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, "Cannot create room <%s> - already exists", new_room_name);
+ MARK_syslog(LOG_DEBUG, "Cannot create room <%s> - already exists", new_room_name);
return(0);
}