moved XIAResolver into Xsocket
Merged with Dan's changes