diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2010-10-14 15:21:42 +0000 |
|---|---|---|
| committer | Paul Belanger <paul.belanger@polybeacon.com> | 2010-10-14 15:21:42 +0000 |
| commit | b1cc567e3f1aee5befefe48665f71178e1305260 (patch) | |
| tree | 1f4585574a95c4cc7b531967b8a4d3c962f247e3 /include | |
| parent | 6b1019418accc376ab3555a8007b723688d37a51 (diff) | |
Merged revisions 291758 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r291758 | pabelanger | 2010-10-14 11:15:12 -0400 (Thu, 14 Oct 2010) | 11 lines
Add the ability for ast_find_ourip to return IPv4, IPv6 or both.
While testing chan_gtalk I noticed jabber was using my IPv6 address
and not IPv4. When using bindaddr=0.0.0.0 it is possible for ast_find_ourip()
to return both IPv6 and IPv4 results. Adding a family parameter gives you
the ablility to choose.
Since jabber/gtalk/h323 do not support IPv6, we should only return IPv4 results.
Review: https://reviewboard.asterisk.org/r/973/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/acl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h index a8c311cb2..86053f431 100644 --- a/include/asterisk/acl.h +++ b/include/asterisk/acl.h @@ -220,10 +220,12 @@ struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original); * \param[out] ourip Our IP address is written here when it is found * \param bindaddr A hint used for finding our IP. See the steps above for * more details + * \param family Only addresses of the given family will be returned. Use 0 + * or AST_SOCKADDR_UNSPEC to get addresses of all families. * \retval 0 Success * \retval -1 Failure */ -int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindaddr); +int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindaddr, int family); /*! * \brief Convert a string to the appropriate COS value |