[GNUnet-SVN] r26646 - in gnunet/src: hello include

[gnunet]

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

Modified:
   gnunet/src/hello/hello.c
   gnunet/src/include/gnunet_hello_lib.h
Log:
change type


Modified: gnunet/src/hello/hello.c
===================================================================
--- gnunet/src/hello/hello.c    2013-03-28 15:14:38 UTC (rev 26645)
+++ gnunet/src/hello/hello.c    2013-03-28 15:24:59 UTC (rev 26646)
@@ -111,11 +111,11 @@
  */
 
 uint16_t
-GNUNET_HELLO_get_type (const struct GNUNET_MessageHeader *h)
+GNUNET_HELLO_get_type (const struct GNUNET_HELLO_Message *h)
 {
-  if (GNUNET_MESSAGE_TYPE_HELLO == ntohs(h->type))
+  if (GNUNET_MESSAGE_TYPE_HELLO == ntohs(h->header.type))
        return GNUNET_MESSAGE_TYPE_HELLO;
-  if (GNUNET_MESSAGE_TYPE_FRIEND_HELLO == ntohs(h->type))
+  if (GNUNET_MESSAGE_TYPE_FRIEND_HELLO == ntohs(h->header.type))
        return GNUNET_MESSAGE_TYPE_FRIEND_HELLO;
   return 0;
 }

Modified: gnunet/src/include/gnunet_hello_lib.h
===================================================================
--- gnunet/src/include/gnunet_hello_lib.h       2013-03-28 15:14:38 UTC (rev 
26645)
+++ gnunet/src/include/gnunet_hello_lib.h       2013-03-28 15:24:59 UTC (rev 
26646)
@@ -83,15 +83,6 @@
 
 
 /**
- * Return HELLO type
- *
- * @param h HELLO Message to test
- * @param GNUNET_MESSAGE_TYPE_HELLO or GNUNET_MESSAGE_TYPE_FRIEND_HELLO or 0 
on error
- */
-uint16_t
-GNUNET_HELLO_get_type (const struct GNUNET_MessageHeader *h);
-
-/**
  * Allocate an address struct.
  *
  * @param peer the peer
@@ -154,6 +145,14 @@
  */
 struct GNUNET_HELLO_Message;
 
+/**
+ * Return HELLO type
+ *
+ * @param h HELLO Message to test
+ * @param GNUNET_MESSAGE_TYPE_HELLO or GNUNET_MESSAGE_TYPE_FRIEND_HELLO or 0 
on error
+ */
+uint16_t
+GNUNET_HELLO_get_type (const struct GNUNET_HELLO_Message *h);
 
 /**
  * Copy the given address information into