.

wcfs/internal/_wcfs.pyx

@@ -23,11 +23,10 @@
 
 # XXX doc
 
-from golang cimport error, refptr
+from golang cimport string, error, refptr
 from golang cimport context
 
 from libcpp cimport nullptr_t, nullptr as nil
-from libcpp.string cimport string
 from libcpp.utility cimport pair
 cdef extern from *:
     ctypedef bint cbool "bool"
@@ -64,6 +63,7 @@ cdef extern from "wcfs_watchlink.h" nogil:
         Oid     foid
         int64_t blk
         Tid     at
+        string  msg
 
 
 cdef extern from "wcfs.h" nogil:
@@ -152,6 +152,11 @@ cdef class PyPinReq:
                 return None
             return at                   # XXX   -> tid bytes
 
+    # wcfs_test.py uses req.msg in several places
+    property msg:
+        def __get__(PyPinReq pypin):
+            return pypin.pinreq.msg
+
 
 # ---- misc ----
 

wcfs/internal/wcfs_watchlink.cpp

@@ -319,7 +319,6 @@ error _WatchLink::recvReq(context::Context ctx, PinReq *prx) {
     if (!ok)
         return io::EOF_;
 
-    //pkt.to_string();
     return _parsePinReq(prx, &pkt);
 }
 
@@ -329,6 +328,7 @@ static error _parsePinReq(PinReq *pin, const rxPkt *pkt) {
     printf("parse pinreq: stream=%lu msg='%s'\n", pkt->stream, &pkt->data[0]);
     pin->stream = pkt->stream;
     string msg = pkt->to_string();
+    pin->msg    = msg;
     printf("'%s'\n", msg.c_str());
     printf("has_prefix: %i\n", strings::has_prefix(msg, "pin "));
 

wcfs/internal/wcfs_watchlink.h

@@ -117,6 +117,8 @@ struct PinReq {
     zodb::Oid   foid;   // request is about this file
     int64_t     blk;    // ----//---- about this block
     zodb::Tid   at;     // pin to this at;  TidHead means unpin to head
+
+    string      msg;    // XXX raw message for tests (TODO kill)
 };