* shrinked the rest of these shutdown stuff into the module-handler.

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 208521386eb318cefe76e92a27da39b1a5a6462c..314313c37b6dd31f6cc7e280e11386cf18f2986a 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -20,28 +20,6 @@ wcsession *SessionList = NULL; /**< our sessions ????*/
 pthread_key_t MyConKey;         /**< TSD key for MySession() */
 
 
-
-void DestroySession(wcsession **sessions_to_kill)
-{
-       close((*sessions_to_kill)->serv_sock);
-       close((*sessions_to_kill)->chat_sock);
-/*
-//             if ((*sessions_to_kill)->preferences != NULL) {
-//                     free((*sessions_to_kill)->preferences);
-//             }
-*/
-       if ((*sessions_to_kill)->cache_fold != NULL) {
-               free((*sessions_to_kill)->cache_fold);
-       }
-       DeleteServInfo(&((*sessions_to_kill)->serv_info));
-       free_march_list((*sessions_to_kill));
-       
-       session_destroy_modules(*sessions_to_kill);
-
-       free((*sessions_to_kill));
-       (*sessions_to_kill) = NULL;
-}
-
 void shutdown_sessions(void)
 {
        wcsession *sptr;
@@ -101,7 +79,7 @@ void do_housekeeping(void)
                pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
                sptr = sessions_to_kill->next;
 
-               DestroySession(&sessions_to_kill);
+               session_destroy_modules(&sessions_to_kill);
                sessions_to_kill = sptr;
                --num_sessions;
        }

diff --git a/webcit/mk_module_init.sh b/webcit/mk_module_init.sh
index e3c91a1a311c5212069c10c851e833a2c6825d7c..b46d4e38950c9a8c477b79cbf82725b448828929 100755 (executable)
--- a/webcit/mk_module_init.sh
+++ b/webcit/mk_module_init.sh
@@ -74,7 +74,7 @@ void shutdown_modules (void);
 void session_new_modules (wcsession *sess);
 void session_attach_modules (wcsession *sess);
 void session_detach_modules (wcsession *sess);
-void session_destroy_modules (wcsession *sess);
+void session_destroy_modules (wcsession **sess);
 
 
 
@@ -333,7 +333,7 @@ cat <<EOF  >>$C_FILE
 }
 
 
-void session_destroy_modules (wcsession *sess)
+void session_destroy_modules (wcsession **sess)
 {
 
 EOF
@@ -344,7 +344,7 @@ cat <<EOF >> $C_FILE
 #ifdef DBG_PRINNT_HOOKS_AT_START
        lprintf (CTDL_INFO, "Initializing $HOOKNAME\n");
 #endif
-       $HOOK(sess);
+       $HOOK(*sess);
 EOF
 # Add this entry point to the .h file
 cat <<EOF >> $H_FILE
@@ -358,6 +358,8 @@ done
 
 
 cat <<EOF  >>$C_FILE
+       free((*sess));
+       (*sess) = NULL;
 }
 
 EOF

diff --git a/webcit/paging.c b/webcit/paging.c
index 7f81049d4781dc99ec19369f92a61eee0ba1427c..d44c816cb2327d4101acc869afb87b93c8583985 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -527,3 +527,12 @@ InitModule_PAGING
        WebcitAddUrlHandler(HKEY("chat_send"), chat_send, 0);
        WebcitAddUrlHandler(HKEY("ajax_send_instant_message"), ajax_send_instant_message, AJAX);
 }
+
+
+void 
+SessionDestroyModule_CHAT
+(wcsession *sess)
+{
+       if (sess->chat_sock > 0)
+               close(sess->chat_sock);
+}

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 936defa9bbaba468eb880df8a6c8b4d19b275ef7..442d167ac5b7e086d4a35f6e301110a2bb293330 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -4126,4 +4126,16 @@ InitModule_ROOMOPS
        RegisterNamespace("ROOM:INFO", 1, 2, tmplput_ROOM_Value, CTX_ROOMS);
 }
 
+
+
+void 
+SessionDestroyModule_ROOMOPS
+(wcsession *sess)
+{
+       if (sess->cache_fold != NULL) {
+               free(sess->cache_fold);
+       }
+       
+       free_march_list(sess);
+}
 /*@}*/

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 2d8188cb0cca912bddadf4e6799ed66f2f21468c..de6fb0538411cd4561f19b85ccb315f79e3be21d 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -647,4 +647,12 @@ InitModule_SERVFUNC
 /*TODO //      RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmplput_serv_ldap_enabled, 0); */
 }
 
+
+
+void 
+SessionDestroyModule_SERVFUNC
+(wcsession *sess)
+{
+       DeleteServInfo(&sess->serv_info);
+}
 /*@}*/

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 42419b179ed28ce2a5dad341b10cff24e8b3039b..9c74b5782b8a4c1a094c7ecde2832426f81135f8 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -686,4 +686,6 @@ SessionDestroyModule_TCPSOCKETS
        FreeStrBuf(&sess->CLineBuf);
        FreeStrBuf(&sess->ReadBuf);
        FreeStrBuf(&sess->MigrateReadLineBuf);
+       if (sess->serv_sock > 0)
+               close(sess->serv_sock);
 }