[GNUnet-SVN] [gnunet] branch master updated (db50aad23 -> ec90e2445)

[gnunet]

This is an automated email from the git hooks/post-receive script.

julius-buenger pushed a change to branch master
in repository gnunet.

    from db50aad23 Merge branch 'master' of gnunet.org:gnunet
     new 1eb0a7b0b fix RPS service: Provide closure for view insertion
     new eb369f2fb RPS: Change cosmetics - fix indentation
     new ec90e2445 RPS service: Use correct file for sub

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/rps/gnunet-service-rps.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 193e44411..2e2fa96a7 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -2150,7 +2150,7 @@ rem_from_list (struct GNUNET_PeerIdentity **peer_list,
  */
 static void
 insert_in_view_op (void *cls,
-               const struct GNUNET_PeerIdentity *peer);
+                   const struct GNUNET_PeerIdentity *peer);
 
 /**
  * Insert PeerID in #view
@@ -2177,7 +2177,7 @@ insert_in_view (struct Sub *sub,
        (GNUNET_SYSERR == online) ) /* peer is not even known */
   {
     (void) issue_peer_online_check (sub, peer);
-    (void) schedule_operation (peer_ctx, insert_in_view_op, NULL);
+    (void) schedule_operation (peer_ctx, insert_in_view_op, sub);
     return GNUNET_NO;
   }
   /* Open channel towards peer to keep connection open */
@@ -2814,6 +2814,25 @@ new_sub (const struct GNUNET_HashCode *hash,
                                "rps",
                                "FILENAME_VALID_PEERS");
   }
+  if (0 != strncmp ("DISABLE", sub->filename_valid_peers, 7))
+  {
+    char *tmp_filename_valid_peers;
+    char str_hash[105];
+    uint32_t len_filename_valid_peers;
+
+    (void) GNUNET_snprintf (str_hash, 105, GNUNET_h2s_full (hash));
+    tmp_filename_valid_peers = GNUNET_strdup (sub->filename_valid_peers);
+    GNUNET_free (sub->filename_valid_peers);
+    len_filename_valid_peers = strlen (tmp_filename_valid_peers) + 105; /* Len 
of full hash + 1 */
+    sub->filename_valid_peers = GNUNET_malloc (len_filename_valid_peers);
+    strncat (sub->filename_valid_peers,
+             tmp_filename_valid_peers,
+             len_filename_valid_peers);
+    strncat (sub->filename_valid_peers,
+             str_hash,
+             len_filename_valid_peers);
+    GNUNET_free (tmp_filename_valid_peers);
+  }
   sub->peer_map = GNUNET_CONTAINER_multipeermap_create (4, GNUNET_NO);
 
   /* Set up the sampler */

-- 
To stop receiving notification emails like this one, please contact
address@hidden