1 files changed, 6 insertions, 12 deletions

diff --git a/src/gnunet/message/msg_hello.go b/src/gnunet/message/msg_hello.go
index fdd9696..4cc8712 100644
--- a/src/gnunet/message/msg_hello.go
+++ b/src/gnunet/message/msg_hello.go
@@ -22,6 +22,7 @@ import (
         "bytes"
         "encoding/binary"
         "fmt"
+        "gnunet/enums"
         "gnunet/util"
         "io"
         "time"
@@ -43,8 +44,8 @@ type HelloAddress struct {
 func NewHelloAddress(a *util.Address) *HelloAddress {
         // use default expiration time, but adjust it if address expires earlier
         exp := util.NewAbsoluteTime(time.Now().Add(HelloAddressExpiration))
-        if exp.Compare(a.Expires) > 0 {
-                exp = a.Expires
+        if exp.Compare(a.Expire) > 0 {
+                exp = a.Expire
         }
         // convert address
         addr := &HelloAddress{
@@ -101,7 +102,7 @@ func ParseHelloAddr(rdr io.Reader) (a *HelloAddress, err error) {
 // Wrap a HelloAddress into a uitl.Address
 func (a *HelloAddress) Wrap() (addr *util.Address) {
         addr = util.NewAddress(a.transport, string(a.address))
-        addr.Expires = a.expires
+        addr.Expire = a.expires
         return
 }
 
@@ -140,8 +141,7 @@ func (a *HelloAddress) Bytes() []byte {
 
 // HelloMsg is a message send by peers to announce their presence
 type HelloMsg struct {
-        MsgSize     uint16       `order:"big"` // total size of message
-        MsgType     uint16       `order:"big"` // HELLO (17)
+        MsgHeader
         FriendsOnly uint32       `order:"big"` // Do not gossip this HELLO message
         Peer        *util.PeerID ``            // peer identifier for addresses
         AddrList    []byte       `size:"*"`    // List of end-point addresses (HelloAddress)
@@ -155,8 +155,7 @@ func NewHelloMsg(peer *util.PeerID) *HelloMsg {
         }
         // return empty HelloMessage
         return &HelloMsg{
-                MsgSize:     40,              // size without 'AddrList'
-                MsgType:     HELLO,           // HELLO (17)
+                MsgHeader:   MsgHeader{40, enums.MSG_HELLO},
                 FriendsOnly: 0,               // not used here
                 Peer:        peer,            // associated peer
                 AddrList:    make([]byte, 0), // list of addresses
@@ -194,8 +193,3 @@ func (m *HelloMsg) SetAddresses(list []*HelloAddress) {
         }
         m.AddrList = wrt.Bytes()
 }
-
-// Header returns the message header in a separate instance.
-func (m *HelloMsg) Header() *Header {
-        return &Header{m.MsgSize, m.MsgType}
-}