.

wcfs/client/wcfs_watchlink.cpp

@@ -267,12 +267,13 @@ error _WatchLink::replyReq(context::Context ctx, const PinReq *req, const string
 // sendReq sends client -> server request and returns server reply.
 pair</*reply*/string, error> _WatchLink::sendReq(context::Context ctx, const string &req) {
     _WatchLink& wlink = *this;
-    xerr::Contextf E("%s: sendReq", v(wlink));  // XXX + streamID
+    StreamID stream = wlink._nextReqID();
+    xerr::Contextf E("%s: sendReq .%d", v(wlink), stream);
 
     rxPkt       rx; bool ok;
     chan<rxPkt> rxq;
     error       err;
-    tie(rxq, err) = wlink._sendReq(ctx, req);
+    tie(rxq, err) = wlink._sendReq(ctx, stream, req);
     if (err != nil)
         return make_pair("", E(err));
 
@@ -289,11 +290,8 @@ pair</*reply*/string, error> _WatchLink::sendReq(context::Context ctx, const str
     return make_pair(reply, nil);
 }
 
-tuple</*rxq*/chan<rxPkt>, error> _WatchLink::_sendReq(context::Context ctx, const string &req) {
+tuple</*rxq*/chan<rxPkt>, error> _WatchLink::_sendReq(context::Context ctx, StreamID stream, const string &req) {
     _WatchLink& wlink = *this;
-    // XXX errctx?
-
-    StreamID stream = wlink._nextReqID();
 
     auto rxq = makechan<rxPkt>(1);
     wlink._rxmu.lock();

wcfs/client/wcfs_watchlink.h

@@ -119,7 +119,7 @@ private:
     error _send(StreamID stream, const string &msg);
     error _write(const string &pkt);
     StreamID _nextReqID();
-    tuple<chan<rxPkt>, error> _sendReq(context::Context ctx, const string &req);
+    tuple<chan<rxPkt>, error> _sendReq(context::Context ctx, StreamID stream, const string &req);
 
     friend error _twlinkwrite(WatchLink wlink, const string &pkt);
 };