.

wcfs/client/wcfs_watchlink.cpp

@@ -66,27 +66,6 @@ pair<WatchLink, error> WCFS::_openwatch() {
     return make_pair(wlink, nil);
 }
 
-error _WatchLink::closeWrite() {
-    _WatchLink& wlink = *this;
-    xerr::Contextf E("%s: closeWrite", v(wlink));
-
-    wlink._txclose1.do_([&]() {
-        // ask wcfs to close its tx & rx sides; wcfs.close(tx) wakes up
-        // _serveRX on client (= on us). The connection can be already closed
-        // by wcfs - so ignore errors when sending bye.
-        (void)wlink._send(wlink._nextReqID(), "bye");
-
-        // XXX vvv should be ~ shutdown(TX, wlink._f), however shutdown does
-        // not work for non-socket file descriptors. And even if we dup link
-        // fd, and close only one used for TX, peer's RX will still be blocked
-        // as fds are referring to one file object which stays in opened
-        // state. So just use ^^^ "bye" as "TX closed" message.
-        // wlink._wtx.close();
-    });
-
-    return nil;
-}
-
 // close closes the link.
 error _WatchLink::close() {
     _WatchLink& wlink = *this;
@@ -112,6 +91,28 @@ error _WatchLink::close() {
     return E(err);
 }
 
+// closeWrite closes send half of the link.
+error _WatchLink::closeWrite() {
+    _WatchLink& wlink = *this;
+    xerr::Contextf E("%s: closeWrite", v(wlink));
+
+    wlink._txclose1.do_([&]() {
+        // ask wcfs to close its tx & rx sides; wcfs.close(tx) wakes up
+        // _serveRX on client (= on us). The connection can be already closed
+        // by wcfs - so ignore errors when sending bye.
+        (void)wlink._send(wlink._nextReqID(), "bye");
+
+        // XXX vvv should be ~ shutdown(TX, wlink._f), however shutdown does
+        // not work for non-socket file descriptors. And even if we dup link
+        // fd, and close only one used for TX, peer's RX will still be blocked
+        // as fds are referring to one file object which stays in opened
+        // state. So just use ^^^ "bye" as "TX closed" message.
+        // wlink._wtx.close();
+    });
+
+    return nil;
+}
+
 // _serveRX receives messages from ._f and dispatches them according to streamID.
 error _WatchLink::_serveRX(context::Context ctx) {
     _WatchLink& wlink = *this;