diff options
author | zuul <zuul@gerrit.asterisk.org> | 2017-01-06 10:23:52 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-01-06 10:23:52 -0600 |
commit | ecf49ae69a4d91f811c345aeaf5588fd50aa2ee1 (patch) | |
tree | a8d3e3562953737225a5fd3e240e1d2a174b09b0 | |
parent | bd371967746ac7695e24d3de133b9c9c9468c16f (diff) | |
parent | bcdd282adaae7d47c91172d4e38306fc3b3566c7 (diff) |
Merge "res_rtp_asterisk.c: Initialize ourip passed to ast_find_ourip()." into 13
-rw-r--r-- | res/res_rtp_asterisk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 1ae18fed3..054b0b658 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -4915,9 +4915,11 @@ static void ast_rtp_prop_set(struct ast_rtp_instance *instance, enum ast_rtp_pro ast_sockaddr_set_port(&rtp->rtcp->us, ast_sockaddr_port(&rtp->rtcp->us) + 1); + ast_sockaddr_copy(&local_addr, &rtp->rtcp->us); if (!ast_find_ourip(&local_addr, &rtp->rtcp->us, 0)) { ast_sockaddr_set_port(&local_addr, ast_sockaddr_port(&rtp->rtcp->us)); } else { + /* Failed to get local address reset to use default. */ ast_sockaddr_copy(&local_addr, &rtp->rtcp->us); } |