diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-01 17:53:08 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-01 17:53:08 +0000 |
commit | 62c01ac2d8208301c3563db7465056217eedd06b (patch) | |
tree | 8bb7e481848794e991a01f151dcc3c6f65e33b86 /include | |
parent | ba5fa5e9191c1ad614e74bc84b55c3af89d7049e (diff) |
This adds DNS SRV record support to DNS manager. If there is a SRV record for a given domain, the hostname and port listed in the SRV record will be used. If no SRV record exists or a SRV lookup is not attempted, the DNS lookup on the specified domain will be performed as normal. Chan_sip has been modified to take advantage of the new SRV support.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112207 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/dnsmgr.h | 5 | ||||
-rw-r--r-- | include/asterisk/slinfactory.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/asterisk/dnsmgr.h b/include/asterisk/dnsmgr.h index db8be1f3c..2738201f5 100644 --- a/include/asterisk/dnsmgr.h +++ b/include/asterisk/dnsmgr.h @@ -28,6 +28,7 @@ extern "C" { #endif #include "asterisk/network.h" +#include "asterisk/srv.h" /*! * \brief A DNS manager entry @@ -50,7 +51,7 @@ struct ast_dnsmgr_entry; * * \return a DNS manager entry */ -struct ast_dnsmgr_entry *ast_dnsmgr_get(const char *name, struct in_addr *result); +struct ast_dnsmgr_entry *ast_dnsmgr_get(const char *name, struct sockaddr_in *result, const char *service); /*! * \brief Free a DNS manager entry @@ -75,7 +76,7 @@ void ast_dnsmgr_release(struct ast_dnsmgr_entry *entry); * \retval 0 success * \retval non-zero failure */ -int ast_dnsmgr_lookup(const char *name, struct in_addr *result, struct ast_dnsmgr_entry **dnsmgr); +int ast_dnsmgr_lookup(const char *name, struct sockaddr_in *result, struct ast_dnsmgr_entry **dnsmgr, const char *service); /*! * \brief Force a refresh of a dnsmgr entry diff --git a/include/asterisk/slinfactory.h b/include/asterisk/slinfactory.h index 4d3e8eaf8..386cf51ba 100644 --- a/include/asterisk/slinfactory.h +++ b/include/asterisk/slinfactory.h @@ -28,12 +28,10 @@ extern "C" { #endif -#define AST_SLINFACTORY_MAX_HOLD 1280 - struct ast_slinfactory { AST_LIST_HEAD_NOLOCK(, ast_frame) queue; /*!< A list of unaltered frames */ struct ast_trans_pvt *trans; /*!< Translation path that converts fed frames into signed linear */ - short hold[AST_SLINFACTORY_MAX_HOLD]; /*!< Hold for audio that no longer belongs to a frame (ie: if only some samples were taken from a frame) */ + short hold[1280]; /*!< Hold for audio that no longer belongs to a frame (ie: if only some samples were taken from a frame) */ short *offset; /*!< Offset into the hold where audio begins */ size_t holdlen; /*!< Number of samples currently in the hold */ unsigned int size; /*!< Number of samples currently in the factory */ |