11 files changed, 166 insertions, 171 deletions

diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c
index b37625988..e0902f112 100644
--- a/src/multicast/gnunet-multicast.c
+++ b/src/multicast/gnunet-multicast.c
@@ -2,20 +2,18 @@
      This file is part of GNUnet.
      Copyright (C) 2013 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index e66bacddb..f8441cc2b 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -2,20 +2,18 @@
      This file is part of GNUnet.
      Copyright (C) 2009 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**
@@ -1450,12 +1448,16 @@ check_client_member_join (void *cls,
   uint16_t msg_size = ntohs (msg->header.size);
   struct GNUNET_PeerIdentity *relays = (struct GNUNET_PeerIdentity *) &msg[1];
   uint32_t relay_count = ntohl (msg->relay_count);
-  if (UINT32_MAX / relay_count < sizeof (*relays)){
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "relay_count (%lu) * sizeof (*relays)  (%lu) exceeds UINT32_MAX!\n",
-              (unsigned long)relay_count,
-              sizeof (*relays));
-      return GNUNET_SYSERR;
+
+  if (0 != relay_count)
+  {
+    if (UINT32_MAX / relay_count < sizeof (*relays)){
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "relay_count (%lu) * sizeof (*relays)  (%lu) exceeds UINT32_MAX!\n",
+                (unsigned long)relay_count,
+                sizeof (*relays));
+        return GNUNET_SYSERR;
+    }
   }
   uint32_t relay_size = relay_count * sizeof (*relays);
   struct GNUNET_MessageHeader *join_msg = NULL;
diff --git a/src/multicast/multicast.conf.in b/src/multicast/multicast.conf.in
index f4a6daa1e..97a541336 100644
--- a/src/multicast/multicast.conf.in
+++ b/src/multicast/multicast.conf.in
@@ -1,5 +1,5 @@
 [multicast]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-multicast
 
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h
index aeb3c0b41..e95299a5e 100644
--- a/src/multicast/multicast.h
+++ b/src/multicast/multicast.h
@@ -2,20 +2,18 @@
      This file is part of GNUnet.
      Copyright (C) 2012, 2013 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index 3c911f48a..9f8d49253 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -2,20 +2,18 @@
      This file is part of GNUnet.
      Copyright (C) 2012, 2013 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c
index 7e9b51e23..e00f07b51 100644
--- a/src/multicast/test_multicast.c
+++ b/src/multicast/test_multicast.c
@@ -2,20 +2,18 @@
  * This file is part of GNUnet
  * Copyright (C) 2013 GNUnet e.V.
  *
- * GNUnet is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 3, or (at your
- * option) any later version.
+ * GNUnet is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
  *
  * GNUnet is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNUnet; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf
index 1b50e0893..b2f1a764b 100644
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -10,7 +10,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -21,36 +21,36 @@ USE_INCLUDED_HELLOS = NO
 NO_IO = YES
 
 [hostlist]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c
index 8ce4d585f..325d81498 100644
--- a/src/multicast/test_multicast_2peers.c
+++ b/src/multicast/test_multicast_2peers.c
@@ -2,20 +2,18 @@
  * This file is part of GNUnet
  * Copyright (C) 2013 GNUnet e.V.
  *
- * GNUnet is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 3, or (at your
- * option) any later version.
+ * GNUnet is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
  *
  * GNUnet is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNUnet; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -223,8 +221,11 @@ origin_notify (void *cls,
                void *data)
 {
   char text[] = "pong";
+
   *data_size = strlen(text)+1;
-  memcpy(data, text, *data_size);
+  GNUNET_memcpy (data,
+                 text,
+                 *data_size);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends (to all): %s\n", text);
 
diff --git a/src/multicast/test_multicast_line.conf b/src/multicast/test_multicast_line.conf
index 1047205cb..c1ce7c63f 100644
--- a/src/multicast/test_multicast_line.conf
+++ b/src/multicast/test_multicast_line.conf
@@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -25,39 +25,39 @@ NO_IO = YES
 ID_ANNOUNCE_TIME = 5 s
 
 [hostlist]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [nse]
 WORKBITS = 0
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c
index d1ed1cb39..7766ff875 100644
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@ -2,20 +2,18 @@
  * This file is part of GNUnet
  * Copyright (C) 2013 GNUnet e.V.
  *
- * GNUnet is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 3, or (at your
- * option) any later version.
+ * GNUnet is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
  *
  * GNUnet is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNUnet; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -54,7 +52,7 @@ enum pingpong
 struct pingpong_msg
 {
   int peer;
-  enum pingpong msg; 
+  enum pingpong msg;
 };
 
 static void service_connect (void *cls,
@@ -143,13 +141,13 @@ member_join_request (void *cls,
 {
   struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer #%u (%s) sent a join request.\n", 
-              mc_peer->peer, 
+              "Peer #%u (%s) sent a join request.\n",
+              mc_peer->peer,
               GNUNET_i2s (multicast_peers[mc_peer->peer]->id));
 }
 
 
-static int 
+static int
 notify (void *cls,
         size_t *data_size,
         void *data)
@@ -162,8 +160,9 @@ notify (void *cls,
 
   *data_size = sizeof (struct pingpong_msg);
   GNUNET_memcpy(data, pp_msg, *data_size);
+  GNUNET_free (pp_msg);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Peer #%u sents ping to origin\n", mc_peer->peer);
 
   return GNUNET_YES;
@@ -179,20 +178,20 @@ member_join_decision (void *cls,
                       const struct GNUNET_MessageHeader *join_msg)
 {
   struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls;
-  
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-              "Peer #%u (%s) received a decision from origin: %s\n", 
-              mc_peer->peer, 
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Peer #%u (%s) received a decision from origin: %s\n",
+              mc_peer->peer,
               GNUNET_i2s (multicast_peers[mc_peer->peer]->id),
               (GNUNET_YES == is_admitted)?"accepted":"rejected");
-  
+
   if (GNUNET_YES == is_admitted)
   {
     GNUNET_MULTICAST_member_to_origin (members[mc_peer->peer],
                                        0,
                                        notify,
                                        cls);
-    
+
   }
 }
 
@@ -236,7 +235,7 @@ member_disconnected_cb (void *cls)
 
 
 static void
-member_message (void *cls, 
+member_message (void *cls,
                 const struct GNUNET_MULTICAST_MessageHeader *msg)
 {
   struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls;
@@ -245,7 +244,7 @@ member_message (void *cls,
   if (PONG == pp_msg->msg && mc_peer->peer == pp_msg->peer)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "peer #%i (%s) receives a pong\n", 
+                "peer #%i (%s) receives a pong\n",
                 mc_peer->peer,
                 GNUNET_i2s (multicast_peers[mc_peer->peer]->id));
     mc_peer->test_ok = GNUNET_OK;
@@ -269,9 +268,9 @@ origin_join_request (void *cls,
 
   uint8_t data_size = ntohs (join_msg->size);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "origin got a join request...\n");
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "origin receives: '%s'\n", (char *)&join_msg[1]);
 
   char data[] = "Come in!";
@@ -281,7 +280,7 @@ origin_join_request (void *cls,
   join_resp->type = htons (123);
   GNUNET_memcpy (&join_resp[1], data, data_size);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "origin sends: '%s'\n", data);
 
   GNUNET_MULTICAST_join_decision (jh,
@@ -311,7 +310,7 @@ origin_replay_msg (void *cls,
                    uint64_t message_id,
                    uint64_t fragment_offset,
                    uint64_t flags,
-                   struct GNUNET_MULTICAST_ReplayHandle *rh) 
+                   struct GNUNET_MULTICAST_ReplayHandle *rh)
 {
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay msg\n");
@@ -319,8 +318,8 @@ origin_replay_msg (void *cls,
 
 
 static int
-origin_notify (void *cls, 
-               size_t *data_size, 
+origin_notify (void *cls,
+               size_t *data_size,
                void *data)
 {
   struct pingpong_msg *rcv_pp_msg = (struct pingpong_msg*)cls;
@@ -329,11 +328,12 @@ origin_notify (void *cls,
   pp_msg->peer = rcv_pp_msg->peer;
   pp_msg->msg = PONG;
   *data_size = sizeof (struct pingpong_msg);
-  memcpy(data, pp_msg, *data_size); 
+  GNUNET_memcpy(data, pp_msg, *data_size);
+  GNUNET_free (pp_msg);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends pong\n");
 
-  return GNUNET_YES; 
+  return GNUNET_YES;
 }
 
 
@@ -345,7 +345,7 @@ origin_request (void *cls,
 
   req++;
   struct pingpong_msg *pp_msg = (struct pingpong_msg *) req;
-  
+
   if (1 != pp_msg->msg) {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "origin didn't reveice a correct request");
   }
@@ -360,7 +360,7 @@ origin_request (void *cls,
 
 static void
 origin_message (void *cls,
-                const struct GNUNET_MULTICAST_MessageHeader *msg) 
+                const struct GNUNET_MULTICAST_MessageHeader *msg)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin message msg\n");
 }
@@ -386,7 +386,7 @@ multicast_connect (void *cls,
   {
     group_key = GNUNET_CRYPTO_eddsa_key_create ();
     GNUNET_CRYPTO_eddsa_key_get_public (group_key, &group_pub_key);
-  
+
     GNUNET_CRYPTO_hash (&group_pub_key, sizeof (group_pub_key), &group_pub_key_hash);
     origin = GNUNET_MULTICAST_origin_start (cfg,
                                             group_key,
@@ -414,7 +414,7 @@ multicast_connect (void *cls,
   {
     multicast_peer->key = GNUNET_CRYPTO_ecdsa_key_create ();
 
-    sprintf(data, "Hi, I am peer #%u (%s). Can I enter?", 
+    sprintf(data, "Hi, I am peer #%u (%s). Can I enter?",
             multicast_peer->peer,
             GNUNET_i2s (multicast_peers[multicast_peer->peer]->id));
     uint8_t data_size = strlen (data) + 1;
@@ -424,7 +424,7 @@ multicast_connect (void *cls,
     GNUNET_memcpy (&join_msg[1], data, data_size);
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Peer #%u (%s) tries to join multicast group %s\n", 
+                "Peer #%u (%s) tries to join multicast group %s\n",
                 multicast_peer->peer,
                 GNUNET_i2s (multicast_peers[multicast_peer->peer]->id),
                 GNUNET_h2s (&group_pub_key_hash));
@@ -465,12 +465,12 @@ peer_information_cb (void *cls,
   multicast_peers[mc_peer->peer]->id = pinfo->result.id;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Got peer information of %s (%s)\n", 
-              (0 == mc_peer->peer)? "origin" : "member", 
+              "Got peer information of %s (%s)\n",
+              (0 == mc_peer->peer)? "origin" : "member",
               GNUNET_i2s (pinfo->result.id));
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Create peer #%u (%s)\n", 
+              "Create peer #%u (%s)\n",
               mc_peer->peer,
               GNUNET_i2s (multicast_peers[mc_peer->peer]->id));
 
@@ -479,7 +479,7 @@ peer_information_cb (void *cls,
     /* connect to multicast service of members */
     op[mc_peer->peer] =
       GNUNET_TESTBED_service_connect (/* Closure for operation */
-                                      NULL, 
+                                      NULL,
                                       /* The peer whose service to connect to */
                                       peers[mc_peer->peer],
                                       /* The name of the service */
@@ -508,8 +508,8 @@ service_connect (void *cls,
 
   if (NULL == ca_result)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-                "Connection adapter not created for peer #%u (%s)\n", 
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Connection adapter not created for peer #%u (%s)\n",
                 mc_peer->peer,
                 GNUNET_i2s (multicast_peers[mc_peer->peer]->id));
 
@@ -519,8 +519,8 @@ service_connect (void *cls,
 
   if (0 == mc_peer->peer)
   {
-    // Get GNUnet identity of members 
-    for (int i = 0; i<PEERS_REQUESTED; i++) 
+    // Get GNUnet identity of members
+    for (int i = 0; i<PEERS_REQUESTED; i++)
     {
       pi_op[i] = GNUNET_TESTBED_peer_get_information (peers[i],
                                                       GNUNET_TESTBED_PIT_IDENTITY,
@@ -547,7 +547,7 @@ service_connect (void *cls,
  * @param PEERS_REQUESTED size of the 'peers' array
  * @param links_succeeded number of links between peers that were created
  * @param links_failed number of links testbed was unable to establish
- */ 
+ */
 static void
 testbed_master (void *cls,
                 struct GNUNET_TESTBED_RunHandle *h,
@@ -562,7 +562,7 @@ testbed_master (void *cls,
   multicast_peers = GNUNET_new_array (PEERS_REQUESTED, struct MulticastPeerContext*);
 
   // Create test contexts for members
-  for (int i = 0; i<PEERS_REQUESTED; i++) 
+  for (int i = 0; i<PEERS_REQUESTED; i++)
   {
     multicast_peers[i] = GNUNET_new (struct MulticastPeerContext);
     multicast_peers[i]->peer = i;
@@ -604,7 +604,7 @@ main (int argc, char *argv[])
   int ret;
   char const *config_file;
 
-  if (strstr (argv[0], "_line") != NULL) 
+  if (strstr (argv[0], "_line") != NULL)
   {
     config_file = "test_multicast_line.conf";
   }
@@ -612,7 +612,7 @@ main (int argc, char *argv[])
   {
     config_file = "test_multicast_star.conf";
   }
-  else 
+  else
   {
     config_file = "test_multicast_star.conf";
   }
@@ -620,19 +620,19 @@ main (int argc, char *argv[])
   result = GNUNET_SYSERR;
   ret =
     GNUNET_TESTBED_test_run ("test-multicast-multipeer",
-                             config_file, 
+                             config_file,
                              /* number of peers to start */
-                             PEERS_REQUESTED, 
+                             PEERS_REQUESTED,
                              /* Event mask - set to 0 for no event notifications */
-                             0LL, 
+                             0LL,
                              /* Controller event callback */
-                             NULL, 
+                             NULL,
                              /* Closure for controller event callback */
-                             NULL, 
+                             NULL,
                              /* called when testbed setup is complete */
-                             testbed_master, 
+                             testbed_master,
                              /* Closure for the test_master callback */
-                             NULL); 
+                             NULL);
   if ( (GNUNET_OK != ret) || (GNUNET_OK != result) )
     return 1;
   return 0;
diff --git a/src/multicast/test_multicast_star.conf b/src/multicast/test_multicast_star.conf
index ed690d95d..516c0e302 100644
--- a/src/multicast/test_multicast_star.conf
+++ b/src/multicast/test_multicast_star.conf
@@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -25,39 +25,39 @@ NO_IO = YES
 ID_ANNOUNCE_TIME = 5 s
 
 [hostlist]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [nse]
 WORKBITS = 0