From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 14 Jul 2021 15:17:01 +0000 (+0100)
Subject: api: Skeleton support for loose ops, pass ClientId
X-Git-Tag: otter-0.7.2~95
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1f5adabb036f1a1b552b8deebcb10ef7c23eb1ba;p=otter.git

api: Skeleton support for loose ops, pass ClientId

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/daemon/api.rs b/daemon/api.rs
index 41cc8380..073b1e48 100644
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -50,7 +50,7 @@ mod op {
       }
     }
 
-    fn conflict_loose_check(&self, _gpc: &GPiece)
+    fn conflict_loose_check(&self, _gpc: &GPiece, _client: ClientId)
         -> Result<ContinueDespiteConflict, ApiPieceOpError> {
       throw!(Fatal::BadLoose)
     }
@@ -142,7 +142,8 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
 
     if u_gen > q_gen {
       if ! form.loose { throw!(Inapplicable::Conflict); }
-      let ContinueDespiteConflict = form.op.conflict_loose_check(&gpc)?;
+      let ContinueDespiteConflict = form.
+        op.conflict_loose_check(&gpc, client)?;
     }
     trace_dbg!("form.op", player, piece, &form.op, &gpc);
     form.op.check_held(gpc,player)?;