Differentiate ports for vsock_tunnel, native_vsock.
This prevents conflicts between vsock_tunnel and native_vsock.
socket_vsock_proxy no longer assumes that the vsock port and tcp port
should be the same in the guest. The flags have been changed to tcp_port
and vsock_port for clarity.
Right now socket_vsock_proxy is always a TCP server and vsock client on
the guest, and a vsock server and TCP client on the host. There's no
structural reason for it to always be like this; the ifdefs could be
replaced with another flag if required to reverse the client/server
relationships.
Test: Ran with -adb_mode=vsock_tunnel
Bug: 121166534
Change-Id: Iaa8bb331dd7cd4bb6a10841cf4588e69feb34c95
2 files changed