pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29565 )

Change subject: osmux: Match remote address in osmux_conn_lookup() ......................................................................

osmux: Match remote address in osmux_conn_lookup()

Depends: libosmo-netif.git I95433b18802f73fa70e758f4aa02128eee940d88 Change-Id: Ia717efa5f68e9412b86ef44a4c42a0715ff0e469 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 14 insertions(+), 2 deletions(-)

Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified

diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index abd4f32..9187007 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -251,7 +251,8 @@ { struct mgcp_endpoint *endp; struct mgcp_conn *conn = NULL; - struct mgcp_conn_rtp * conn_rtp; + struct mgcp_conn_rtp *conn_rtp; + struct osmux_handle *h; int i;

for (i = 0; i < trunk->number_endpoints; i++) { @@ -266,7 +267,18 @@ if (!mgcp_conn_rtp_is_osmux(conn_rtp)) continue;

- /* FIXME: Match remote address! */ + /* Current implementation sets remote address & port for + * the conn based on src address received on the socket + * for the CID, in order to workaround NATs. + * Once the conn is fully established (remote address is + * known), validate the remote address doesn't change: */ + if (conn_rtp->osmux.state == OSMUX_STATE_ENABLED) { + h = osmux_xfrm_input_get_deliver_cb_data(conn_rtp->osmux.in); + if (osmo_sockaddr_cmp(&h->rem_addr, rem_addr) != 0) + continue; + } + /* else: select based on CID only, to learn rem addr in NAT-based scenarios. + * FIXME: This should be configurable, have some sort of "osmux nat (on|off)" */

if (conn_rtp->osmux.local_cid == local_cid) return conn_rtp;