macos smb: avoid hang on shutdown

copyparty/multicast.py

@@ -286,7 +286,10 @@ class MCast(object):
             # just give it something
             ret = list(self.srv.values())[0]
 
-        if not ret:
+        if ret:
+            t = "new client on {} ({}): {}"
+            self.log(t.format(ret.name, ret.net, cip), 6)
+        else:
             t = "could not map client {} to known subnet; maybe forwarded from another network?"
             self.log(t.format(cip), 3)
 

copyparty/svchub.py

@@ -515,6 +515,7 @@ class SvcHub(object):
 
             if hasattr(self, "smbd"):
                 slp = max(slp, time.time() + 0.5)
+                Daemon(self.kill9, a=(1,))
                 Daemon(self.smbd.stop)
 
             while time.time() < slp:

copyparty/util.py

@@ -960,7 +960,7 @@ def alltrace() -> str:
         else:
             rret += ret
 
-    return "\n".join(rret + bret)
+    return "\n".join(rret + bret) + "\n"
 
 
 def start_stackmon(arg_str: str, nid: int) -> None: