changes for mantis 0002676

6 files changed, 15 insertions, 23 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 63b2ced88..e0d3b3b23 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -242,7 +242,6 @@ 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:
diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c
index be05e027a..db2718f4e 100644
--- a/src/transport/gnunet-service-transport_clients.c
+++ b/src/transport/gnunet-service-transport_clients.c
@@ -978,8 +978,6 @@ 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_validation.c b/src/transport/gnunet-service-transport_validation.c
index dbe5adf4f..a6c0b7f9d 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -1283,11 +1283,11 @@ 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)) ||
+  friend = GNUNET_HELLO_is_friend_only (hm);
+  if (((GNUNET_YES != friend) && (GNUNET_NO != friend)) ||
+                (GNUNET_OK != GNUNET_HELLO_get_id (hm, &vac.pid)) ||
       (GNUNET_OK != GNUNET_HELLO_get_key (hm, &vac.public_key)))
   {
     /* malformed HELLO */
@@ -1298,19 +1298,6 @@ 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 */
-  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);
 
diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c
index e8e087276..a2278f293 100644
--- a/src/transport/plugin_transport_udp_broadcasting.c
+++ b/src/transport/plugin_transport_udp_broadcasting.c
@@ -394,6 +394,17 @@ iface_proc (void *cls, const char *name, int isDefault,
 void
 setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6, struct sockaddr_in *serverAddrv4)
 {
+  const struct GNUNET_MessageHeader *hello;
+  hello = plugin->env->get_our_hello ();
+
+  if (GNUNET_YES == GNUNET_HELLO_is_friend_only((const struct GNUNET_HELLO_Message *) hello))
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         _("Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"));
+    return;
+  }
+
+
   /* create IPv4 broadcast socket */
   plugin->broadcast_ipv4 = GNUNET_NO;
   if (plugin->sockv4 != NULL)
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index eb635615f..9e2a0ff77 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -1149,7 +1149,6 @@ 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 d8fb7d520..8dc4c7a42 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -497,7 +497,6 @@ 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))
     {
@@ -1293,8 +1292,7 @@ GNUNET_TRANSPORT_offer_hello (struct GNUNET_TRANSPORT_Handle *handle,
   if (NULL == handle->client)
     return NULL;
 
-  GNUNET_break ((ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO) ||
-                                                        (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_FRIEND_HELLO));
+  GNUNET_break (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO);
   size = ntohs (hello->size);
   GNUNET_break (size >= sizeof (struct GNUNET_MessageHeader));
   if (GNUNET_OK !=