1 files changed, 94 insertions, 1 deletions

diff --git a/src/gnunet/message/msg_dht.go b/src/gnunet/message/msg_dht.go
index 9b73557..bb8fc1a 100644
--- a/src/gnunet/message/msg_dht.go
+++ b/src/gnunet/message/msg_dht.go
@@ -28,6 +28,54 @@ import (
 )
 
 //----------------------------------------------------------------------
+// DHT_CLIENT_PUT
+//----------------------------------------------------------------------
+
+// DHTClientPutMsg is the message for putting values into the DHT
+type DHTClientPutMsg struct {
+        MsgSize   uint16            `order:"big"` // total size of message
+        MsgType   uint16            `order:"big"` // DHT_CLIENT_PUT (142)
+        Type      uint32            `order:"big"` // The type of the data (BLOCK_TYPE_???)
+        Options   uint32            `order:"big"` // Message options (DHT_RO_???)
+        ReplLevel uint32            `order:"big"` // Replication level for this message
+        Expire    util.AbsoluteTime // Expiration time
+        Key       *crypto.HashCode  // The key to be used
+        Data      []byte            `size:"*"` // Block data
+}
+
+// NewDHTClientPutMsg creates a new default DHTClientPutMsg object.
+func NewDHTClientPutMsg(key *crypto.HashCode, btype int, data []byte) *DHTClientPutMsg {
+        if key == nil {
+                key = new(crypto.HashCode)
+        }
+        var size uint16 = 88
+        if data != nil {
+                size += uint16(len(data))
+        }
+        return &DHTClientPutMsg{
+                MsgSize:   size,
+                MsgType:   DHT_CLIENT_PUT,
+                Type:      uint32(btype),
+                Options:   uint32(enums.DHT_RO_NONE),
+                ReplLevel: 1,
+                Expire:    util.AbsoluteTimeNever(),
+                Key:       key,
+                Data:      data,
+        }
+}
+
+// String returns a human-readable representation of the message.
+func (m *DHTClientPutMsg) String() string {
+        return fmt.Sprintf("DHTClientPutMsg{Type=%d,Expire=%s,Options=%d,Repl=%d,Key=%s}",
+                m.Type, m.Expire, m.Options, m.ReplLevel, hex.EncodeToString(m.Key.Bits))
+}
+
+// Header returns the message header in a separate instance.
+func (m *DHTClientPutMsg) Header() *Header {
+        return &Header{m.MsgSize, m.MsgType}
+}
+
+//----------------------------------------------------------------------
 // DHT_CLIENT_GET
 //----------------------------------------------------------------------
 
@@ -102,7 +150,7 @@ type DHTClientResultMsg struct {
 // NewDHTClientResultMsg creates a new default DHTClientResultMsg object.
 func NewDHTClientResultMsg(key *crypto.HashCode) *DHTClientResultMsg {
         if key == nil {
-                key = crypto.NewHashCode()
+                key = crypto.NewHashCode(nil)
         }
         return &DHTClientResultMsg{
                 MsgSize:    64, // empty message size (no data)
@@ -163,3 +211,48 @@ func (m *DHTClientGetStopMsg) String() string {
 func (m *DHTClientGetStopMsg) Header() *Header {
         return &Header{m.MsgSize, m.MsgType}
 }
+
+//----------------------------------------------------------------------
+// DHT_CLIENT_GET_RESULTS_KNOWN
+//----------------------------------------------------------------------
+
+// DHTClientGetResultsKnownMsg is the message for putting values into the DHT
+type DHTClientGetResultsKnownMsg struct {
+        MsgSize  uint16             `order:"big"` // total size of message
+        MsgType  uint16             `order:"big"` // DHT_CLIENT_GET_RESULTS_KNOWN (156)
+        Reserved uint32             `order:"big"` // Reserved for further use
+        Key      *crypto.HashCode   // The key to search for
+        ID       uint64             `order:"big"` // Unique ID identifying this request
+        Known    []*crypto.HashCode `size:"*"`    // list of known results
+}
+
+// NewDHTClientPutMsg creates a new default DHTClientPutMsg object.
+func NewDHTClientGetResultsKnownMsg(key *crypto.HashCode) *DHTClientGetResultsKnownMsg {
+        if key == nil {
+                key = new(crypto.HashCode)
+        }
+        return &DHTClientGetResultsKnownMsg{
+                MsgSize: 80,
+                MsgType: DHT_CLIENT_GET_RESULTS_KNOWN,
+                Key:     key,
+                ID:      0,
+                Known:   make([]*crypto.HashCode, 0),
+        }
+}
+
+// AddKnown adds a known result to the list
+func (m *DHTClientGetResultsKnownMsg) AddKnown(hc *crypto.HashCode) {
+        m.Known = append(m.Known, hc)
+        m.MsgSize += 64
+}
+
+// String returns a human-readable representation of the message.
+func (m *DHTClientGetResultsKnownMsg) String() string {
+        return fmt.Sprintf("DHTClientGetResultsKnownMsg{Id:%d,Key=%s,Num=%d}",
+                m.ID, hex.EncodeToString(m.Key.Bits), len(m.Known))
+}
+
+// Header returns the message header in a separate instance.
+func (m *DHTClientGetResultsKnownMsg) Header() *Header {
+        return &Header{m.MsgSize, m.MsgType}
+}