[PATCH 2/8] Consolidate port forwarding configuration into a common structure