osmocom
/
libosmo-abis
mirror of https://gerrit.osmocom.org/libosmo-abis
11
0
Fork 0
Code Issues Releases Wiki Activity

osmo_ortp.c: fix order of set_connected_mode and set_remote_addr 

In libortp, rtp_session_set_connected_mode() sets a flag that is used in
rtp_session_set_remote_addr().

The name rtp_session_set_remote_addr() is misleading: this function actually
does take a lot of action, including an attempt to connect to the remote
server. Thus the "connected mode" flag needs to be set before this.

Suggested-by: NuRan Wireless <nuranwireless.com>
Change-Id: I92308ddffc376af8d4d65e6b9cbeee222b7bff5e
This commit is contained in:
Neels Hofmeyr 2016-09-05 14:09:56 +02:00
parent 085ab0bb9c
commit c77c2a6aa1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/trau/osmo_ortp.c
View File

@ -392,16 +392,18 @@ int osmo_rtp_socket_connect(struct osmo_rtp_socket *rs, const char *ip, uint16_t
return 0;
}
rc = rtp_session_set_remote_addr(rs->sess, ip, port);
if (rc < 0)
return rc;
/* enable the use of connect() so later getsockname() will
* actually return the IP address that was chosen for the local
* sid of the connection */
rtp_session_set_connected_mode(rs->sess, 1);
rs->flags &= ~OSMO_RTP_F_DISABLED;
/* This call attempts to connect to the remote address, so make sure to
* set all other rtp session configuration before this call. */
rc = rtp_session_set_remote_addr(rs->sess, ip, port);
if (rc < 0)
return rc;
if (rs->flags & OSMO_RTP_F_POLL)
return rc;
else