[GNUnet-SVN] r30840 - msh/src

[gnunet]

Author: harsha
Date: 2013-11-21 17:20:19 +0100 (Thu, 21 Nov 2013)
New Revision: 30840

Modified:
   msh/src/mshd.c
Log:
- restart scheduler after forking daemon server


Modified: msh/src/mshd.c
===================================================================
--- msh/src/mshd.c      2013-11-21 15:24:21 UTC (rev 30839)
+++ msh/src/mshd.c      2013-11-21 16:20:19 UTC (rev 30840)
@@ -508,6 +508,12 @@
 
 
 /**
+ * The connection that will be used by the daemon server for serving the client
+ */
+static struct GNUNET_CONNECTION_Handle *client_conn;
+
+
+/**
  * Fork a worker process.  This process forks a child which initiates the MSH
  * execution protocol.  Once the protocol authenticates the connecting client,
  * it then forks and execs the remote command.
@@ -516,14 +522,13 @@
 spawn_worker (struct GNUNET_NETWORK_Handle *sock)
 {
   struct ChildProc *chld;
-  struct GNUNET_CONNECTION_Handle *conn;
   pid_t ret;
 
   ret = fork ();
   if (0 != ret)
     return ret;
   /* Child process continues here */
-  conn = GNUNET_CONNECTION_create_from_existing (sock);
+  client_conn = GNUNET_CONNECTION_create_from_existing (sock);
   sock = NULL;
   GNUNET_log_setup ("mshd-worker", NULL, NULL);
   /* cleanup child processes as we are now not their parent */
@@ -537,10 +542,7 @@
   shutdown_task = GNUNET_SCHEDULER_NO_TASK;
   do_shutdown (NULL, NULL);
   mode = MODE_WORKER;
-  init_daemon_server ();
-  daemon_server_add_connection (conn);
-  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                &do_shutdown, NULL);
+  GNUNET_SCHEDULER_shutdown ();
   return 0;
 }
 
@@ -728,6 +730,19 @@
 
 
 /**
+ * Task which will initiate the daemon server
+ */
+static void
+daemon_server_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  init_daemon_server ();
+  daemon_server_add_connection (client_conn);
+  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                &do_shutdown, NULL);
+}
+
+
+/**
  * Task which will initiate the local address lookup server
  */
 static void
@@ -1419,6 +1434,9 @@
   case MODE_LOCAL_SERV:
     GNUNET_SCHEDULER_run (&local_server_run, NULL);
     break;
+  case MODE_WORKER:
+    GNUNET_SCHEDULER_run (&daemon_server_run, NULL);
+    break;
   default:
     break;
   }