[asterisk-commits] seanbright: branch group/1.6.1-maintenance r265840 - in /team/group/1.6.1-mai...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed May 26 09:08:41 2010
New Revision: 265840

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=265840
Log:
Merged revisions 265087,265090 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r265087 | mmichelson | 2010-05-21 16:38:14 -0400 (Fri, 21 May 2010) | 7 lines
  
  Be sure to set the sin_family on the proxy when allocating.
  
  (closes issue #17157)
  Reported by: stuarth
................
  r265090 | mmichelson | 2010-05-21 17:08:51 -0400 (Fri, 21 May 2010) | 15 lines
  
  Merged revisions 265089 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r265089 | mmichelson | 2010-05-21 15:59:14 -0500 (Fri, 21 May 2010) | 8 lines
    
    Don't hang up on a queue caller if the file we attempt to play does not exist.
    
    This also fixes a documentation mistake in file.h that made my original attempt
    to correct this problem not work correctly.
    
    (closes issue #17061)
    Reported by: RoadKill
  ........
................

Modified:
    team/group/1.6.1-maintenance/   (props changed)
    team/group/1.6.1-maintenance/apps/app_queue.c
    team/group/1.6.1-maintenance/channels/chan_sip.c
    team/group/1.6.1-maintenance/include/asterisk/file.h

Propchange: team/group/1.6.1-maintenance/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: team/group/1.6.1-maintenance/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/apps/app_queue.c?view=diff&rev=265840&r1=265839&r2=265840
==============================================================================
--- team/group/1.6.1-maintenance/apps/app_queue.c (original)
+++ team/group/1.6.1-maintenance/apps/app_queue.c Wed May 26 09:08:41 2010
@@ -1816,6 +1816,10 @@
 	int res;
 
 	if (ast_strlen_zero(filename)) {
+		return 0;
+	}
+
+	if (!ast_fileexists(filename, NULL, chan->language)) {
 		return 0;
 	}
 

Modified: team/group/1.6.1-maintenance/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/channels/chan_sip.c?view=diff&rev=265840&r1=265839&r2=265840
==============================================================================
--- team/group/1.6.1-maintenance/channels/chan_sip.c (original)
+++ team/group/1.6.1-maintenance/channels/chan_sip.c Wed May 26 09:08:41 2010
@@ -2955,6 +2955,7 @@
 	proxy->force = force;
 	ast_copy_string(proxy->name, name, sizeof(proxy->name));
 	proxy->ip.sin_port = htons(port_str2int(port, STANDARD_SIP_PORT));
+	proxy->ip.sin_family = AF_INET;
 	proxy_update(proxy);
 	return proxy;
 }

Modified: team/group/1.6.1-maintenance/include/asterisk/file.h
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/include/asterisk/file.h?view=diff&rev=265840&r1=265839&r2=265840
==============================================================================
--- team/group/1.6.1-maintenance/include/asterisk/file.h (original)
+++ team/group/1.6.1-maintenance/include/asterisk/file.h Wed May 26 09:08:41 2010
@@ -90,7 +90,7 @@
  * \param fmt the format you wish to check (the extension)
  * \param preflang (the preferred language you wisht to find the file in)
  * See if a given file exists in a given format.  If fmt is NULL,  any format is accepted.
- * \return -1 if file does not exist, non-zero positive otherwise.
+ * \return 0 if file does not exist, non-zero positive otherwise.
  */
 int ast_fileexists(const char *filename, const char *fmt, const char *preflang);