]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
chan_iax2: Don't overwrite port found with an SRV lookup.
authorRussell Bryant <russell@russellbryant.com>
Sat, 7 May 2011 23:24:18 +0000 (23:24 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 7 May 2011 23:24:18 +0000 (23:24 +0000)
(closes issue #17291)
Reported by: jcovert
Patches:
      chan_iax2.c.1.8.3-srvlookup-corrected.patch uploaded by jcovert (license 551)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@318055 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index 0df06057aa170acd1e2e6092aadf1681e2ceb789..cbea1434311652bab6f6e3620f0c31d91d679938 100644 (file)
@@ -4555,7 +4555,9 @@ static int create_addr(const char *peername, struct ast_channel *c, struct socka
                        return -1;
                }
                ast_sockaddr_to_sin(&sin_tmp, sin);
-               sin->sin_port = htons(IAX_DEFAULT_PORTNO);
+               if (sin->sin_port == 0) {
+                       sin->sin_port = htons(IAX_DEFAULT_PORTNO);
+               }
                /* use global iax prefs for unknown peer/user */
                /* But move the calling channel's native codec to the top of the preference list */
                memcpy(&ourprefs, &prefs, sizeof(ourprefs));