Simplify UDP vs. TCP handling in service_announce_services