use IP to identify ndoes, select nodes we don't know about, and don't set timing on timeouts

Change-Id: I569e3b4f40cd464d2224b84e47b6a29fcf5d35f3