X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_extensions.c;h=04c34704b7de0bc15a0dc69d32fcbf89114463a6;hb=eee9a1429dd032114946aad9e70fd8d84afbe918;hp=45221c514eef4a3ced49c122cadc8e8c49e14c32;hpb=c064b240ff457c4bcdc119aaf7a6a09ff31952e2;p=citadel.git

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 45221c514..04c34704b 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -55,6 +55,7 @@ typedef struct __LogDebugEntry {
 	CtdlDbgFunction F;
 	const char *Name;
 	long Len;
+	const int *LogP;
 } LogDebugEntry;
 HashList *LogDebugEntryTable = NULL;
 
@@ -332,15 +333,8 @@ long FourHash(const char *key, long length)
 
 	return ret;
 }
-/*
-typedef struct __LogDebugEntry {
-	CtdlDbgFunction F;
-	const char *Name;
-	long Len;
-} LogDebugEntry;
-HashList *LogDebugEntryTable = NULL;
-*/
-void CtdlRegisterDebugFlagHook(const char *Name, long Len, CtdlDbgFunction F)
+
+void CtdlRegisterDebugFlagHook(const char *Name, long Len, CtdlDbgFunction F, const int *LogP)
 {
 	LogDebugEntry *E;
 	if (LogDebugEntryTable == NULL)
@@ -349,6 +343,7 @@ void CtdlRegisterDebugFlagHook(const char *Name, long Len, CtdlDbgFunction F)
 	E->F = F;
 	E->Name = Name;
 	E->Len = Len;
+	E->LogP = LogP;
 	Put(LogDebugEntryTable, Name, Len, E, NULL);
 	
 }
@@ -377,7 +372,7 @@ void CtdlSetDebugLogFacilities(const char **Str, long n)
 				    (vptr != NULL))
 				{
 					LogDebugEntry *E = (LogDebugEntry*)vptr;
-					E->F();
+					E->F(1);
 				}
 			}
 		}
@@ -392,12 +387,58 @@ void CtdlSetDebugLogFacilities(const char **Str, long n)
 		Pos = GetNewHashPos(LogDebugEntryTable, 0);
 		while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
 			LogDebugEntry *E = (LogDebugEntry*)vptr;
-			E->F();
+			E->F(1);
 		}
 
 		DeleteHashPos(&Pos);
 	}
 }
+void cmd_log_get(char *argbuf)
+{
+	long HKLen;
+	const char *ch;
+	HashPos *Pos;
+	void *vptr;
+
+	if (CtdlAccessCheck(ac_aide)) return;
+
+	cprintf("%d Log modules enabled:\n", LISTING_FOLLOWS);
+
+	Pos = GetNewHashPos(LogDebugEntryTable, 0);
+
+	while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
+		LogDebugEntry *E = (LogDebugEntry*)vptr;
+		cprintf("%s: %d\n", ch, *E->LogP);
+	}
+	
+	DeleteHashPos(&Pos);
+	cprintf("000\n");
+}
+void cmd_log_set(char *argbuf)
+{
+	void *vptr;
+	int lset;
+	int wlen;
+	char which[SIZ] = "";
+
+	if (CtdlAccessCheck(ac_aide)) return;
+
+	wlen = extract_token(which, argbuf, 0, '|', sizeof(which));
+	if (wlen < 0) wlen = 0;
+	lset = extract_int(argbuf, 1);
+	if (lset != 0) lset = 1;
+	if (GetHash(LogDebugEntryTable, which, wlen, &vptr) && 
+	    (vptr != NULL))
+	{
+		LogDebugEntry *E = (LogDebugEntry*)vptr;
+		E->F(lset);
+		cprintf("%d %s|%d\n", CIT_OK, which, lset);
+	}
+	else {
+		cprintf("%d Log setting %s not known\n", 
+			ERROR, which);
+	}
+}
 void CtdlDestroyDebugTable(void)
 {
 
@@ -1309,3 +1350,13 @@ void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *er
 	CtdlStartTLS (ok_response, nosup_response, error_response);
 #endif
 }
+
+
+CTDL_MODULE_INIT(modules)
+{
+	if (!threading) {
+		CtdlRegisterProtoHook(cmd_log_get, "LOGP", "Print Log-parameters");
+		CtdlRegisterProtoHook(cmd_log_set, "LOGS", "Set Log-parameters");
+	}
+	return "modules";
+}