[GNUnet-SVN] r37958 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2016-09-20 11:55:42 +0200 (Tue, 20 Sep 2016)
New Revision: 37958

Modified:
   gnunet/src/include/gnunet_scalarproduct_service.h
   gnunet/src/util/service_new.c
Log:
-fix minor issues

Modified: gnunet/src/include/gnunet_scalarproduct_service.h
===================================================================
--- gnunet/src/include/gnunet_scalarproduct_service.h   2016-09-20 09:55:33 UTC 
(rev 37957)
+++ gnunet/src/include/gnunet_scalarproduct_service.h   2016-09-20 09:55:42 UTC 
(rev 37958)
@@ -55,9 +55,14 @@
   /**
    * Operation is still active (never returned, used internally).
    */
-  GNUNET_SCALARPRODUCT_STATUS_ACTIVE = 0,
+  GNUNET_SCALARPRODUCT_STATUS_INIT = 0,
 
   /**
+   * Operation is still active (never returned, used internally).
+   */
+  GNUNET_SCALARPRODUCT_STATUS_ACTIVE = 1,
+
+  /**
    * The computation was successful.
    */
   GNUNET_SCALARPRODUCT_STATUS_SUCCESS,

Modified: gnunet/src/util/service_new.c
===================================================================
--- gnunet/src/util/service_new.c       2016-09-20 09:55:33 UTC (rev 37957)
+++ gnunet/src/util/service_new.c       2016-09-20 09:55:42 UTC (rev 37958)
@@ -384,9 +384,10 @@
     GNUNET_SCHEDULER_add_shutdown (&service_shutdown,
                                    sh);
   GNUNET_SERVICE_resume (sh);
-  sh->service_init_cb (sh->cb_cls,
-                       sh->cfg,
-                       sh);
+  if (NULL != sh->service_init_cb)
+    sh->service_init_cb (sh->cb_cls,
+                        sh->cfg,
+                        sh);
 }
 
 
@@ -2250,6 +2251,8 @@
   if (GNUNET_YES == c->needs_continue)
     return; /* #GNUNET_MST_next() did give a message to the client */
   /* need to receive more data from the network first */
+  if (NULL != c->recv_task)
+    return;
   c->recv_task
     = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                     c->sock,