diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-16 17:38:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-16 17:38:49 +0000 |
commit | 6f6acd8bdacda326f4e966a7b88be0f57fec21a8 (patch) | |
tree | 16db08d19da93f3561a21eac281d7cb16e0579ef /src/fs | |
parent | 0b92336e16fd941ec085c66579486244c6bd83f4 (diff) | |
download | gnunet-6f6acd8bdacda326f4e966a7b88be0f57fec21a8.tar.gz gnunet-6f6acd8bdacda326f4e966a7b88be0f57fec21a8.zip |
-fix bad CMP
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/gnunet-service-fs.c | 8 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cp.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 4a70b518d..7c8833ce8 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -638,8 +638,9 @@ static void | |||
638 | peer_connect_handler (void *cls, | 638 | peer_connect_handler (void *cls, |
639 | const struct GNUNET_PeerIdentity *peer) | 639 | const struct GNUNET_PeerIdentity *peer) |
640 | { | 640 | { |
641 | if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_id, | 641 | if (0 == |
642 | peer)) | 642 | GNUNET_CRYPTO_cmp_peer_identity (&my_id, |
643 | peer)) | ||
643 | return; | 644 | return; |
644 | GSF_peer_connect_handler_ (peer, | 645 | GSF_peer_connect_handler_ (peer, |
645 | &connected_peer_cb, | 646 | &connected_peer_cb, |
@@ -737,6 +738,9 @@ main_init (struct GNUNET_SERVER_Handle *server, | |||
737 | GNUNET_CRYPTO_eddsa_key_get_public (pk, | 738 | GNUNET_CRYPTO_eddsa_key_get_public (pk, |
738 | &my_id.public_key); | 739 | &my_id.public_key); |
739 | 740 | ||
741 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
742 | "I am peer %s\n", | ||
743 | GNUNET_i2s (&my_id)); | ||
740 | GSF_core | 744 | GSF_core |
741 | = GNUNET_CORE_connect (GSF_cfg, NULL, | 745 | = GNUNET_CORE_connect (GSF_cfg, NULL, |
742 | &peer_init_handler, | 746 | &peer_init_handler, |
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index c1c3f01f1..029180c2b 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c | |||
@@ -608,7 +608,8 @@ GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer, | |||
608 | { | 608 | { |
609 | struct GSF_ConnectedPeer *cp; | 609 | struct GSF_ConnectedPeer *cp; |
610 | 610 | ||
611 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s\n", | 611 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
612 | "Connected to peer %s\n", | ||
612 | GNUNET_i2s (peer)); | 613 | GNUNET_i2s (peer)); |
613 | cp = GNUNET_new (struct GSF_ConnectedPeer); | 614 | cp = GNUNET_new (struct GSF_ConnectedPeer); |
614 | cp->ppd.pid = GNUNET_PEER_intern (peer); | 615 | cp->ppd.pid = GNUNET_PEER_intern (peer); |