]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 232351 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Wed, 2 Dec 2009 17:02:30 +0000 (17:02 +0000)
committerDavid Vossel <dvossel@digium.com>
Wed, 2 Dec 2009 17:02:30 +0000 (17:02 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r232351 | dvossel | 2009-12-02 11:00:15 -0600 (Wed, 02 Dec 2009) | 12 lines

  Merged revisions 232350 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r232350 | dvossel | 2009-12-02 10:59:18 -0600 (Wed, 02 Dec 2009) | 6 lines

    ast_outaddrfor doesn't do htons() on port, looks odd in strace.

    (closes issue #16290)
    Reported by: wdoekes
  ........
................

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

main/acl.c

index 65be13046dc483a18079669be606f95f24945a05..7a431036e7edc1c95eeebcea1e2755ab7fe82e7c 100644 (file)
@@ -473,7 +473,7 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us)
                return -1;
        }
        sin.sin_family = AF_INET;
-       sin.sin_port = 5060;
+       sin.sin_port = htons(5060);
        sin.sin_addr = *them;
        if (connect(s, (struct sockaddr *)&sin, sizeof(sin))) {
                ast_log(LOG_WARNING, "Cannot connect\n");