Changes to handle new getaddrinfo code.