Moved to new module init structure.

[citadel.git] / citadel / serv_test.c

diff --git a/citadel/serv_test.c b/citadel/serv_test.c
index ec20e4d395f75a1432f2bf8d2c03c1e1ae1b41b3..356b167b5607c0d54dfd7435992ffd8a135aa89f 100644 (file)
--- a/citadel/serv_test.c
+++ b/citadel/serv_test.c
@@ -1,4 +1,10 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * A skeleton module to test the dynamic loader.
+ *
+ */
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -8,87 +14,58 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#include "citadel.h"
-#include "server.h"
-#include <syslog.h>
-#include <time.h>
-#include "sysdep_decls.h"
-#include "citserver.h"
-#include "support.h"
-#include "config.h"
-#include "dynloader.h"
-#include "room_ops.h"
-#include "policy.h"
-#include "database.h"
-#include "msgbase.h"
+#include "ctdl_module.h"
 
 extern struct CitContext *ContextList;
 
-#define MODULE_NAME    "Dummy test module"
-#define MODULE_AUTHOR  "Art Cancro"
-#define MODULE_EMAIL   "ajc@uncnsrd.mt-kisco.ny.us"
-#define MAJOR_VERSION  0
-#define MINOR_VERSION  4
-
-static struct DLModule_Info info = {
-       MODULE_NAME,
-       MODULE_AUTHOR,
-       MODULE_EMAIL,
-       MAJOR_VERSION,
-       MINOR_VERSION
-       };
-
 void CleanupTest(void) {
-       lprintf(9, "--- test of adding an unload hook --- \n");
+       lprintf(CTDL_DEBUG, "--- test of adding an unload hook --- \n");
        }
 
 void NewRoomTest(void) {
-       lprintf(9, "--- test module was told we're now in %s ---\n",
-               CC->cs_room);
+       lprintf(CTDL_DEBUG, "--- test module was told we're now in a new room ---\n");
        }
 
 void SessionStartTest(void) {
-       lprintf(9, "--- starting up session %d ---\n",
+       lprintf(CTDL_DEBUG, "--- starting up session %d ---\n",
                CC->cs_pid);
        }
 
 void SessionStopTest(void) {
-       lprintf(9, "--- ending session %d ---\n", 
+       lprintf(CTDL_DEBUG, "--- ending session %d ---\n", 
                CC->cs_pid);
        }
 
 void LoginTest(void) {
-       lprintf(9, "--- Hello, %s ---\n", CC->curr_user);
+       lprintf(CTDL_DEBUG, "--- Hello, %s ---\n", CC->curr_user);
        }
 
-
-void Ygorl(char *username, long usernum) {
-       if (!strcasecmp(username, "Unsuspecting User")) {
-               strcpy(username, "Flaming Asshole");
-               }
-       }
-
-void LogTest(char *buf) {
-       fprintf(stderr,"%c[1m%s%c[0m", 27, buf, 27);
-       fflush(stderr);
-       }
-
-
-struct DLModule_Info *Dynamic_Module_Init(void)
+/* To insert this module into the server activate the next block by changing the #if 0 to #if 1 */
+CTDL_MODULE_INIT(test)
 {
+#if 0
    CtdlRegisterCleanupHook(CleanupTest);
    CtdlRegisterSessionHook(NewRoomTest, EVT_NEWROOM);
    CtdlRegisterSessionHook(SessionStartTest, EVT_START);
    CtdlRegisterSessionHook(SessionStopTest, EVT_STOP);
    CtdlRegisterSessionHook(LoginTest, EVT_LOGIN);
-   CtdlRegisterUserHook(Ygorl, EVT_OUTPUTMSG);
-   CtdlRegisterLogHook(LogTest, 1);
-   return &info;
+#endif
+
+   /* return our Subversion id for the Log */
+   return "$Id$";
 }