hnetd: Updated with better service discovery support (especially 1 router case)