.

wcfs/client/wcfs_watchlink.cpp

@@ -132,7 +132,7 @@ error _WatchLink::_serveRX(context::Context ctx) {
         wlink._rxmu.lock();
         wlink._rxdown = true;   // don't allow new rxtab registers
         wlink._rxmu.unlock();
-        for (auto _ : wlink._rxtab) {
+        for (auto _ : wlink._rxtab) {   // FIXME iterates without lock
             auto rxq = _.second;
             rxq.close();
         }
@@ -143,16 +143,14 @@ error _WatchLink::_serveRX(context::Context ctx) {
     rxPkt  pkt;
 
     while (1) {
-        // NOTE: .close() makes sure .f.read*() will wake up
+        // NOTE: .close() makes sure ._f.read*() will wake up
         tie(l, err) = wlink._readline();
-        if (err == io::EOF_) {  // peer closed its tx
-            // XXX what happens on other errors?
-            wlink.rx_eof.close();
-        }
         if (err != nil) {
-            // XXX place=ok?
-            if (err == io::EOF_)
+            // peer closed its tx
+            if (err == io::EOF_) {
                 err = nil;
+                wlink.rx_eof.close();
+            }
             return E(err);
         }
         trace("C: watch  : rx: \"%s\"", v(l));