service/ServiceDiscovery: rework of network connection management