changes for mantis 0002676

1 files changed, 3 insertions, 16 deletions

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);