Merge topic branch t/mixer into pupu

para_mixer improvements
-----------------------
Link para_mixer with audioc_common.o to make it single threaded.

* t/mixer:
  Make para_mixer single-threaded.
  mixer: Introduce die().
  crypt: use {con,de}structor to init/shutdown the library.
  client: Use a named enumeration for the client status.
  Introduce struct client_config to hide context from public API.
  mixer: Link with audioc_common.o
  Move recv_buffer() and recv_bin_buffer() from net.c to fd.c.
  mixer: Rename client_cmd() -> run_client_cmd().
  mixer: Rename audioc_cmd() -> run_audioc_cmd().

1 files changed, 0 insertions, 3 deletions

diff --git a/server.c b/server.c
index afa6e137..a766968a 100644
--- a/server.c
+++ b/server.c
@@ -786,7 +786,6 @@ static int init_afs(int argc, char **argv)
 		int i;
 
 		afs_pid = getpid();
-		crypt_shutdown();
 		user_list_deplete();
 		for (i = argc - 1; i >= 0; i--)
 			memset(argv[i], 0, strlen(argv[i]));
@@ -869,7 +868,6 @@ static struct sched *server_init(int argc, char **argv,
 	if (OPT_GIVEN(DAEMON))
 		daemon_pipe = daemonize(true /* parent waits for SIGTERM */);
 	server_pid = getpid();
-	crypt_init();
 	daemon_log_welcome("server");
 	init_ipc_or_die(); /* init mmd struct, mmd and log mutex */
 	daemon_set_start_time();
@@ -960,7 +958,6 @@ int main(int argc, char *argv[])
 	 */
 	mutex_unlock(mmd_mutex);
 	sched_shutdown(sched);
-	crypt_shutdown();
 	if (!process_is_command_handler()) { /* parent (server) */
 		mutex_destroy(mmd_mutex);
 		daemon_set_hooks(NULL, NULL); /* only one process remaining */