[asterisk-commits] jpeeler: trunk r112321 - in /trunk: CHANGES channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Apr  1 17:07:30 2008
New Revision: 112321

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112321
Log:
Existing DNS manager lookups extended to check for SRV records.

Modified:
    trunk/CHANGES
    trunk/channels/chan_iax2.c

Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?view=diff&rev=112321&r1=112320&r2=112321
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Tue Apr  1 17:07:30 2008
@@ -30,12 +30,22 @@
 -----------
  * The ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using setvar to cause a given
    audio file to be played upon completion of an attended transfer.
+ * Added DNS manager support to registrations for peers referencing peer entries.
+
+IAX Changes
+-----------
+ * Existing DNS manager lookups extended to check for SRV records.
 
 CLI Changes
 -----------
   * New CLI command, "config reload <file.conf>" which reloads any module that
      references that particular configuration file.  Also added "config list"
      which shows which configuration files are in use.
+
+DNS manager changes
+-------------------
+  * Addresses managed by DNS manager now can check to see if there is a DNS
+    SRV record for a given domain and will use that hostname/port if present.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0  -------------
@@ -194,8 +204,7 @@
      configs/sip.conf.sample for more information on how it is used.
   * Added a new configuration option "authfailureevents" that enables manager events when
     a peer can't authenticate properly. 
-  * Added DNS manager support to registrations, both for peers referencing
-    and not referencing a peer entry.
+  * Added DNS manager support to registrations for peers not referencing a peer entry.
 
 IAX2 changes
 ------------
@@ -535,11 +544,6 @@
      not currently supported.
   * The ResetCDR application now has an 'e' option that re-enables a CDR if it
      has been disabled using the NoCDR application.
-
-DNS manager changes
--------------------
-  * Addresses managed by DNS manager now will check to see if there is a DNS
-    SRV record for a given domain and will use that hostname/port if present.
 
 Miscellaneous New Modules
 -------------------------

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=112321&r1=112320&r2=112321
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Apr  1 17:07:30 2008
@@ -6427,7 +6427,7 @@
 	if (!(reg = ast_calloc(1, sizeof(*reg))))
 		return -1;
 
-	if (ast_dnsmgr_lookup(hostname, &reg->addr, &reg->dnsmgr, NULL) < 0) {
+	if (ast_dnsmgr_lookup(hostname, &reg->addr, &reg->dnsmgr, srvlookup ? "_iax._udp" : NULL) < 0) {
 		ast_free(reg);
 		return -1;
 	}
@@ -10095,7 +10095,7 @@
 					/* Non-dynamic.  Make sure we become that way if we're not */
 					AST_SCHED_DEL(sched, peer->expire);
 					ast_clear_flag(peer, IAX_DYNAMIC);
-					if (ast_dnsmgr_lookup(v->value, &peer->addr, &peer->dnsmgr, NULL))
+					if (ast_dnsmgr_lookup(v->value, &peer->addr, &peer->dnsmgr, srvlookup ? "_iax._udp" : NULL));
 						return peer_unref(peer);
 					if (!peer->addr.sin_port)
 						peer->addr.sin_port = htons(IAX_DEFAULT_PORTNO);