support for FRIEND_HELLO

3 files changed, 4 insertions, 1 deletions

diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 68024a90a..f7a4b5536 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -769,6 +769,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+        {&handle_hello, NULL, GNUNET_MESSAGE_TYPE_FRIEND_HELLO, 0},
     {&handle_hello, NULL, GNUNET_MESSAGE_TYPE_HELLO, 0},
     {&handle_get, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_GET,
      sizeof (struct ListPeerMessage)},
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 7f7695cc2..bc4ab31c7 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -1514,7 +1514,8 @@ GST_handle_remote_overlay_connect (void *cls,
   }
   msg = (const struct GNUNET_TESTBED_RemoteOverlayConnectMessage *) message;
   if ((NULL == msg->hello) ||
-      (GNUNET_MESSAGE_TYPE_HELLO != ntohs (msg->hello->type)))
+      ((GNUNET_MESSAGE_TYPE_HELLO != ntohs (msg->hello->type)) &&
+       (GNUNET_MESSAGE_TYPE_FRIEND_HELLO != ntohs (msg->hello->type))))
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index c36108823..cb43ee261 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -1274,6 +1274,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
   static struct GNUNET_CORE_MessageHandler handlers[] = {
     {&handle_encrypted_hello, GNUNET_MESSAGE_TYPE_HELLO, 0},
+    {&handle_encrypted_hello, GNUNET_MESSAGE_TYPE_FRIEND_HELLO, 0},
     {NULL, 0, 0}
   };
   unsigned long long opt;