1 files changed, 11 insertions, 11 deletions

diff --git a/src/gnunet/service/gns/service.go b/src/gnunet/service/gns/service.go
index 19ddc14..45eb700 100644
--- a/src/gnunet/service/gns/service.go
+++ b/src/gnunet/service/gns/service.go
@@ -62,8 +62,6 @@ func NewService(ctx context.Context, c *core.Core) service.Service {
         srv := &Service{
                 Module: *mod,
         }
-        srv.ProcessFcn = srv.HandleMessage
-
         // set external function references (external services)
         srv.LookupLocal = srv.LookupNamecache
         srv.StoreLocal = srv.StoreNamecache
@@ -98,7 +96,8 @@ func (s *Service) ServeClient(ctx context.Context, id int, mc *service.Connectio
                 logger.Printf(logger.INFO, "[gns:%d:%d] Received request: %v\n", id, reqID, msg)
 
                 // handle message
-                s.HandleMessage(context.WithValue(ctx, "label", fmt.Sprintf(":%d:%d", id, reqID)), msg, mc)
+                valueCtx := context.WithValue(ctx, service.CtxKey("label"), fmt.Sprintf(":%d:%d", id, reqID))
+                s.HandleMessage(valueCtx, nil, msg, mc)
         }
         // close client connection
         mc.Close()
@@ -109,11 +108,11 @@ func (s *Service) ServeClient(ctx context.Context, id int, mc *service.Connectio
 }
 
 // Handle a single incoming message
-func (s *Service) HandleMessage(ctx context.Context, msg message.Message, back transport.Responder) bool {
+func (s *Service) HandleMessage(ctx context.Context, sender *util.PeerID, msg message.Message, back transport.Responder) bool {
         // assemble log label
         label := ""
         if v := ctx.Value("label"); v != nil {
-                label = v.(string)
+                label, _ = v.(string)
         }
         // perform lookup
         switch m := msg.(type) {
@@ -123,7 +122,7 @@ func (s *Service) HandleMessage(ctx context.Context, msg message.Message, back t
                 //----------------------------------------------------------
 
                 // perform lookup on block (locally and remote)
-                go func(m *message.LookupMsg) {
+                go func(m *message.LookupMsg, label string) {
                         logger.Printf(logger.INFO, "[gns%s] Lookup request received.\n", label)
                         resp := message.NewGNSLookupResultMsg(m.ID)
                         defer func() {
@@ -137,7 +136,6 @@ func (s *Service) HandleMessage(ctx context.Context, msg message.Message, back t
                                 logger.Printf(logger.DBG, "[gns%s] Lookup request finished.\n", label)
                         }()
 
-                        label := m.GetName()
                         kind := NewRRTypeList(enums.GNSType(m.Type))
                         recset, err := s.Resolve(ctx, label, m.Zone, kind, int(m.Options), 0)
                         if err != nil {
@@ -163,11 +161,13 @@ func (s *Service) HandleMessage(ctx context.Context, msg message.Message, back t
                                         // is this the record type we are looking for?
                                         if rec.Type == m.Type || enums.GNSType(m.Type) == enums.GNS_TYPE_ANY {
                                                 // add it to the response message
-                                                resp.AddRecord(rec)
+                                                if err := resp.AddRecord(rec); err != nil {
+                                                        logger.Printf(logger.ERROR, "[gns%s] failed: %sv", label, err.Error())
+                                                }
                                         }
                                 }
                         }
-                }(m)
+                }(m, label)
 
         default:
                 //----------------------------------------------------------
@@ -374,7 +374,7 @@ func (s *Service) LookupDHT(ctx context.Context, query blocks.Query) (block bloc
         // send DHT GET request and wait for response
         reqGet := message.NewDHTClientGetMsg(query.Key())
         reqGet.ID = uint64(util.NextID())
-        reqGet.ReplLevel = uint32(enums.DHT_GNS_REPLICATION_LEVEL)
+        reqGet.ReplLevel = uint32(enums.GNS_REPLICATION_LEVEL)
         reqGet.Type = uint32(enums.BLOCK_TYPE_GNS_NAMERECORD)
         reqGet.Options = uint32(enums.DHT_RO_DEMULTIPLEX_EVERYWHERE)
 
@@ -419,7 +419,7 @@ func (s *Service) LookupDHT(ctx context.Context, query blocks.Query) (block bloc
                 }
 
                 // get GNSBlock from message
-                qGNS := query.(*blocks.GNSQuery)
+                qGNS, _ := query.(*blocks.GNSQuery)
                 block = new(blocks.GNSBlock)
                 if err = data.Unmarshal(block, m.Data); err != nil {
                         logger.Printf(logger.ERROR, "[gns] can't read GNS block: %s\n", err.Error())