.

go/neo/server/storage.go

@@ -372,7 +372,7 @@ func (stor *Storage) ServeLink(ctx context.Context, link *neo.NodeLink) {
 	var serveConn func(context.Context, *neo.Conn)
 	switch nodeInfo.NodeType {
 	case neo.CLIENT:
-		serveConn = stor.ServeClient
+		serveConn = stor.serveClient
 
 	default:
 		// XXX vvv should be reply to peer
@@ -388,7 +388,7 @@ func (stor *Storage) ServeLink(ctx context.Context, link *neo.NodeLink) {
 			break
 		}
 
-		// XXX wrap conn close to happen here, not in ServeClient ?
+		// XXX wrap conn close to happen here, not in serveClient ?
 		go serveConn(ctx, conn)
 	}
 
@@ -396,9 +396,9 @@ func (stor *Storage) ServeLink(ctx context.Context, link *neo.NodeLink) {
 }
 
 
-// ServeClient serves incoming connection on which peer identified itself as client
+// serveClient serves incoming connection on which peer identified itself as client
 // XXX +error return?
-func (stor *Storage) ServeClient(ctx context.Context, conn *neo.Conn) {
+func (stor *Storage) serveClient(ctx context.Context, conn *neo.Conn) {
 	fmt.Printf("stor: %s: serving new client conn\n", conn)
 
 	// rederive ctx to be also cancelled if M tells us StopOperation
@@ -418,6 +418,12 @@ func (stor *Storage) ServeClient(ctx context.Context, conn *neo.Conn) {
 	}()
 
 	for {
+		serveClient1(conn)	// XXX err check
+	}
+}
+
+// serveClient1 serves 1 request from a client
+func (stor *Storage) serveClient1(conn *neo.Conn) error {
 	req, err := conn.Recv()
 	if err != nil {
 		return	// XXX log / err / send error before closing
@@ -475,5 +481,4 @@ func (stor *Storage) ServeClient(ctx context.Context, conn *neo.Conn) {
 	}
 
 	//req.Put(...)
-	}
 }