Change back to using sockaddr_storage rather than sockaddr_in. If