[GNUnet-SVN] r26648 - in gnunet/src: peerinfo testbed topology

[gnunet]

Author: wachs
Date: 2013-03-28 16:59:34 +0100 (Thu, 28 Mar 2013)
New Revision: 26648

Modified:
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
   gnunet/src/testbed/gnunet-service-testbed_oc.c
   gnunet/src/topology/gnunet-daemon-topology.c
Log:
support for FRIEND_HELLO


Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2013-03-28 15:43:23 UTC 
(rev 26647)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2013-03-28 15:59:34 UTC 
(rev 26648)
@@ -769,6 +769,7 @@
      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)},

Modified: gnunet/src/testbed/gnunet-service-testbed_oc.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_oc.c      2013-03-28 15:43:23 UTC 
(rev 26647)
+++ gnunet/src/testbed/gnunet-service-testbed_oc.c      2013-03-28 15:59:34 UTC 
(rev 26648)
@@ -1514,7 +1514,8 @@
   }
   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);

Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c        2013-03-28 15:43:23 UTC 
(rev 26647)
+++ gnunet/src/topology/gnunet-daemon-topology.c        2013-03-28 15:59:34 UTC 
(rev 26648)
@@ -1274,6 +1274,7 @@
 {
   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;