Now supports waiting for server on an InetSocketAddress