diff --git a/copyparty/multicast.py b/copyparty/multicast.py index 4acb5954..62428a19 100644 --- a/copyparty/multicast.py +++ b/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) diff --git a/copyparty/svchub.py b/copyparty/svchub.py index 6b3a0aef..31024af6 100644 --- a/copyparty/svchub.py +++ b/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: diff --git a/copyparty/util.py b/copyparty/util.py index cc39b4a5..a1392eac 100644 --- a/copyparty/util.py +++ b/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: