support for FRIEND_HELLO messages

7 files changed, 34 insertions, 6 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index be0371a6a..63b2ced88 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -242,6 +242,7 @@ GST_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
   switch (type)
   {
   case GNUNET_MESSAGE_TYPE_HELLO:
+  case GNUNET_MESSAGE_TYPE_FRIEND_HELLO:
     GST_validation_handle_hello (message);
     return ret;
   case GNUNET_MESSAGE_TYPE_TRANSPORT_PING:
@@ -630,6 +631,7 @@ key_generation_cb (void *cls,
   long long unsigned int max_fd_cfg;
   int max_fd_rlimit;
   int max_fd;
+  int friend_only;
 
   GST_keygen = NULL;
   if (NULL == pk)
@@ -686,8 +688,11 @@ key_generation_cb (void *cls,
               "Limiting number of sockets to %u: validation %u, neighbors: %u\n",
               max_fd, (max_fd / 3) , (max_fd / 3) * 2);
 
+  friend_only = GNUNET_CONFIGURATION_get_value_yesno(GST_cfg, "topology","FRIENDS-ONLY");
+  if (GNUNET_SYSERR == friend_only)
+        friend_only = GNUNET_NO; /* According to topology defaults */
   /* start subsystems */
-  GST_hello_start (&process_hello_update, NULL);
+  GST_hello_start (friend_only, &process_hello_update, NULL);
   GNUNET_assert (NULL != GST_hello_get());
   GST_blacklist_start (GST_server, GST_cfg, &GST_my_identity);
   GST_ats =
diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c
index db2718f4e..be05e027a 100644
--- a/src/transport/gnunet-service-transport_clients.c
+++ b/src/transport/gnunet-service-transport_clients.c
@@ -978,6 +978,8 @@ GST_clients_start (struct GNUNET_SERVER_Handle *server)
      GNUNET_MESSAGE_TYPE_TRANSPORT_START, sizeof (struct StartMessage)},
     {&clients_handle_hello, NULL,
      GNUNET_MESSAGE_TYPE_HELLO, 0},
+          {&clients_handle_hello, NULL,
+                 GNUNET_MESSAGE_TYPE_FRIEND_HELLO, 0},
     {&clients_handle_send, NULL,
      GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, 0},
     {&clients_handle_request_connect, NULL,
diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c
index 78968ae77..d9f7e2e4e 100644
--- a/src/transport/gnunet-service-transport_hello.c
+++ b/src/transport/gnunet-service-transport_hello.c
@@ -200,15 +200,16 @@ refresh_hello ()
 /**
  * Initialize the HELLO module.
  *
+ * @param friend_only use a friend only hello
  * @param cb function to call whenever our HELLO changes
  * @param cb_cls closure for cb
  */
 void
-GST_hello_start (GST_HelloCallback cb, void *cb_cls)
+GST_hello_start (int friend_only, GST_HelloCallback cb, void *cb_cls)
 {
   hello_cb = cb;
   hello_cb_cls = cb_cls;
-  our_hello = GNUNET_HELLO_create (&GST_my_public_key, NULL, NULL, GNUNET_NO);
+  our_hello = GNUNET_HELLO_create (&GST_my_public_key, NULL, NULL, friend_only);
   GNUNET_assert (NULL != our_hello);
   refresh_hello ();
 }
diff --git a/src/transport/gnunet-service-transport_hello.h b/src/transport/gnunet-service-transport_hello.h
index 9927408d2..2aefbe300 100644
--- a/src/transport/gnunet-service-transport_hello.h
+++ b/src/transport/gnunet-service-transport_hello.h
@@ -46,11 +46,12 @@ typedef void (*GST_HelloCallback) (void *cls,
 /**
  * Initialize the HELLO module.
  *
+ * @param friend_only use a friend only hello
  * @param cb function to call whenever our HELLO changes
  * @param cb_cls closure for cb
  */
 void
-GST_hello_start (GST_HelloCallback cb, void *cb_cls);
+GST_hello_start (int friend_only, GST_HelloCallback cb, void *cb_cls);
 
 
 /**
diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
index f5c57d864..dbe5adf4f 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -1283,6 +1283,9 @@ GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello)
       (const struct GNUNET_HELLO_Message *) hello;
   struct ValidateAddressContext vac;
   struct GNUNET_HELLO_Message *h;
+  int type;
+  int friend;
+
 
   if ((GNUNET_OK != GNUNET_HELLO_get_id (hm, &vac.pid)) ||
       (GNUNET_OK != GNUNET_HELLO_get_key (hm, &vac.public_key)))
@@ -1295,7 +1298,20 @@ GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello)
       memcmp (&GST_my_identity, &vac.pid, sizeof (struct GNUNET_PeerIdentity)))
     return;
   /* Add peer identity without addresses to peerinfo service */
-  h = GNUNET_HELLO_create (&vac.public_key, NULL, NULL, GNUNET_NO);
+  type = ntohs(hello->type);
+  switch (type) {
+                case GNUNET_MESSAGE_TYPE_HELLO:
+                        friend = GNUNET_NO;
+                        break;
+                case GNUNET_MESSAGE_TYPE_FRIEND_HELLO:
+                        friend = GNUNET_YES;
+                        break;
+                default:
+                        GNUNET_break (0);
+                        friend = GNUNET_NO;
+                        break;
+        }
+  h = GNUNET_HELLO_create (&vac.public_key, NULL, NULL, friend);
   GNUNET_PEERINFO_add_peer (GST_peerinfo, h, NULL, NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index e1201eb2b..ecf1efb86 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -1152,6 +1152,7 @@ process_data (void *cls, void *client, const struct GNUNET_MessageHeader *hdr)
 
   switch (ntohs (hdr->type))
   {
+  case GNUNET_MESSAGE_TYPE_FRIEND_HELLO:
   case GNUNET_MESSAGE_TYPE_HELLO:
     if (GNUNET_OK != 
         GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hdr, &tmpsource))
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 8dc4c7a42..d8fb7d520 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -497,6 +497,7 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
   switch (ntohs (msg->type))
   {
   case GNUNET_MESSAGE_TYPE_HELLO:
+  case GNUNET_MESSAGE_TYPE_FRIEND_HELLO:
     if (GNUNET_OK !=
         GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) msg, &me))
     {
@@ -1292,7 +1293,8 @@ GNUNET_TRANSPORT_offer_hello (struct GNUNET_TRANSPORT_Handle *handle,
   if (NULL == handle->client)
     return NULL;
 
-  GNUNET_break (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO);
+  GNUNET_break ((ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO) ||
+                                                        (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_FRIEND_HELLO));
   size = ntohs (hello->size);
   GNUNET_break (size >= sizeof (struct GNUNET_MessageHeader));
   if (GNUNET_OK !=