delete dummy test println | fix services issue with connect to dmsg

Author: mrpalide

pkg/dmsg/entity_common.go

@@ -295,15 +295,15 @@ func (c *EntityCommon) updateClientEntryLoop(ctx context.Context, done chan stru
 	}
 }
 
-func (c *EntityCommon) entryProtocol(ctx context.Context, pk cipher.PubKey) (string, error) {
+func (c *EntityCommon) entryProtocol(ctx context.Context, pk cipher.PubKey) string {
 	entry, err := c.dc.Entry(ctx, pk)
 	if err != nil {
-		c.log.Debug("Entry not found.")
-		return "", err
+		c.log.WithField("entry", entry).Warn("Entry not found, so return empty as protocol.\n")
+		return ""
 	}
 
 	c.log.WithField("entry", entry).Debug("Entry's protocol fetch.\n")
-	return entry.Protocol, nil
+	return entry.Protocol
 }
 
 func (c *EntityCommon) delEntry(ctx context.Context) (err error) {

pkg/dmsg/server.go

@@ -225,14 +225,8 @@ func (s *Server) handleSession(conn net.Conn) {
 		log.WithError(dSes.Close()).Info("Stopped session.")
 	}()
 	// detect visor protocol for dmsg
-	protocol, err := s.entryProtocol(ctx, dSes.RemotePK())
-	if err != nil {
-		if err := conn.Close(); err != nil {
-			log.WithError(err).Warn("On entryProtocol() failure, close connection resulted in error.")
-		}
-		cancel()
-		return
-	}
+	protocol := s.entryProtocol(ctx, dSes.RemotePK())
+
 	// based on protocol, create smux or yamux stream session
 	if protocol == "smux" {
 		dSes.sm.smux, err = smux.Server(conn, smux.DefaultConfig())

pkg/dmsg/server_session.go

@@ -197,7 +197,6 @@ func (ss *ServerSession) forwardRequest(req StreamRequest) (mStr io.ReadWriteClo
 				Debugf("After forwardRequest failed, the yamux stream is closed.")
 		}
 	}()
-	fmt.Println("here 1")
 	if ss.sm.smux != nil {
 		if mStr, err = ss.sm.smux.OpenStream(); err != nil {
 			return nil, nil, err
@@ -207,24 +206,18 @@ func (ss *ServerSession) forwardRequest(req StreamRequest) (mStr io.ReadWriteClo
 			return nil, nil, err
 		}
 	}
-
-	fmt.Println("here 2")
 	if err = ss.writeObject(mStr, req.raw); err != nil {
 		return nil, nil, err
 	}
-	fmt.Println("here 3")
 	if respObj, err = ss.readObject(mStr); err != nil {
 		return nil, nil, err
 	}
-	fmt.Println("here 4")
 	var resp StreamResponse
 	if resp, err = respObj.ObtainStreamResponse(); err != nil {
 		return nil, nil, err
 	}
-	fmt.Println("here 5")
 	if err = resp.Verify(req); err != nil {
 		return nil, nil, err
 	}
-	fmt.Println("here 6")
 	return mStr, respObj, nil
 }