always include connection info

xpra/server/proxy/proxy_instance.py

@@ -219,6 +219,16 @@ def get_window_info(self) -> dict:
         return info
 
 
+    def get_connection_info(self) -> dict:
+        return {
+            "client" : self.client_protocol.get_info(),
+            "server" : self.server_protocol.get_info(),
+            }
+
+    def get_info(self) -> dict:
+        return {"connection" : self.get_connection_info()}
+
+
     ################################################################################
 
     def send_hello(self, challenge_response=None, client_salt=None):

xpra/server/proxy/proxy_instance_process.py

@@ -301,7 +301,9 @@ def do_process_control_packet(self, proto, packet):
             def is_req(mode):
                 return generic_request==mode or caps.boolget("%s_request" % mode)
             if is_req("info"):
-                proto.send_now(("hello", self.get_proxy_info(proto)))
+                info = self.get_proxy_info(proto)
+                info.setdefault("connection", {}).update(self.get_connection_info())
+                proto.send_now(("hello", info))
                 self.timeout_add(5*1000, self.send_disconnect, proto, CLIENT_EXIT_TIMEOUT, "info sent")
                 return
             if is_req("stop"):

xpra/server/proxy/proxy_instance_thread.py

@@ -69,14 +69,3 @@ def start_network_threads(self):
         #no need to start the client protocol,
         #it was started when we processed authentication in the proxy server
         #self.client_protocol.start()
-
-
-    def get_info(self) -> dict:
-        info = {}
-        cinfo = info.setdefault("connection", {})
-        def add_protocol_info(prefix, proto):
-            pinfo = proto.get_info()
-            cinfo[prefix] = pinfo.get("thread", ())
-        add_protocol_info("client", self.client_protocol)
-        add_protocol_info("server", self.server_protocol)
-        return info