1 files changed, 15 insertions, 10 deletions

diff --git a/src/gnunet/message/message.go b/src/gnunet/message/message.go
index 4dfa8b3..946dd6e 100644
--- a/src/gnunet/message/message.go
+++ b/src/gnunet/message/message.go
@@ -20,6 +20,7 @@ package message
 
 import (
         "errors"
+        "gnunet/enums"
 
         "github.com/bfix/gospel/data"
 )
@@ -33,8 +34,12 @@ var (
 
 // Message is an interface for all GNUnet-specific messages.
 type Message interface {
-        // Header of message
-        Header() *Header
+
+        // Size returns the size of the full message
+        Size() uint16
+
+        // Type returns the message type (defines the layout of the body data)
+        Type() enums.MsgType
 
         // String returns a human-readable message
         String() string
@@ -42,30 +47,30 @@ type Message interface {
 
 //----------------------------------------------------------------------
 
-// Header encapsulates the common part of all GNUnet messages (at the
+// MsgHeader encapsulates the common part of all GNUnet messages (at the
 // beginning of the data).
-type Header struct {
-        MsgSize uint16 `order:"big"`
-        MsgType uint16 `order:"big"`
+type MsgHeader struct {
+        MsgSize uint16        `order:"big"`
+        MsgType enums.MsgType `order:"big"`
 }
 
 // Size returns the total size of the message (header + body)
-func (mh *Header) Size() uint16 {
+func (mh *MsgHeader) Size() uint16 {
         return mh.MsgSize
 }
 
 // Type returns the message type (defines the layout of the body data)
-func (mh *Header) Type() uint16 {
+func (mh *MsgHeader) Type() enums.MsgType {
         return mh.MsgType
 }
 
 // GetMsgHeader returns the header of a message from a byte array (as the
 // serialized form).
-func GetMsgHeader(b []byte) (mh *Header, err error) {
+func GetMsgHeader(b []byte) (mh *MsgHeader, err error) {
         if b == nil || len(b) < 4 {
                 return nil, ErrMsgHeaderTooSmall
         }
-        mh = new(Header)
+        mh = new(MsgHeader)
         err = data.Unmarshal(mh, b)
         return
 }