X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=e0df714be975b083f4d3cc7116ad0af2501a2b46;hb=87e0ea6a858f3727d0f6c8a0ace440146bb68afe;hp=d51e4e0bfe5b33c341ff744eda4f9380bd666844;hpb=f56e7627e5fbde3705f9241e6bcaeafe8c123674;p=paraslash.git

diff --git a/server.c b/server.c
index d51e4e0b..e0df714b 100644
--- a/server.c
+++ b/server.c
@@ -2,31 +2,6 @@
 
 /** \file server.c Paraslash's main server. */
 
-/**
- * \mainpage Main data structures and selected APIs:
- *
- *	- Senders: \ref sender,
- *	- Audio file selector: \ref afs_info, \ref afs_table,
- *	- Audio format handler: \ref audio_format_handler, \ref afh_info
- *	- Receivers/filters/writers: \ref receiver, \ref receiver_node,
- *	  \ref filter, \ref filter_node, \ref writer_node, \ref writer.
- *	- Scheduling: \ref sched.h,
- *	- Buffer trees: \ref buffer_tree.h,
- *	- Sideband API: \ref sideband.h,
- *	- Crypto: \ref crypt.h, \ref crypt_backend.h,
- *	- Error subsystem: \ref error.h,
- *	- Inter process communication: \ref ipc.h,
- *	- Forward error correction: \ref fec.h,
- *	- Daemons: \ref daemon.h,
- *	- Mixer API: \ref mix.h,
- *	- Interactive sessions: \ref interactive.h,
- *	- File descriptors: \ref fd.h,
- *	- Signals: \ref signal.h,
- *	- Networking: \ref net.h,
- *	- Time: \ref time.c,
- *	- Doubly linked lists: \ref list.h.
- */
-
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <signal.h>
@@ -704,12 +679,13 @@ int main(int argc, char *argv[])
 		deplete_close_on_fork_list();
 		if (ret < 0)
 			PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+		vss_shutdown();
 	} else {
+		vss_shutdown();
 		alarm(ALARM_TIMEOUT);
 		close_listed_fds();
 		ret = handle_connect(sct->child_fd);
 	}
-	vss_shutdown();
 	shm_detach(mmd);
 	user_list_deplete();
 	free_lpr();