[asterisk-commits] kmoore: branch kmoore/pjsip_dtls r394644 - in /team/kmoore/pjsip_dtls: ./ res/

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Jul 18 08:17:44 2013
New Revision: 394644

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394644
Log:
Bring up to trunk

Modified:
    team/kmoore/pjsip_dtls/   (props changed)
    team/kmoore/pjsip_dtls/res/res_agi.c

Propchange: team/kmoore/pjsip_dtls/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/kmoore/pjsip_dtls/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 18 08:17:44 2013
@@ -1,1 +1,1 @@
-/trunk:1-394625
+/trunk:1-394643

Modified: team/kmoore/pjsip_dtls/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_dtls/res/res_agi.c?view=diff&rev=394644&r1=394643&r2=394644
==============================================================================
--- team/kmoore/pjsip_dtls/res/res_agi.c (original)
+++ team/kmoore/pjsip_dtls/res/res_agi.c Thu Jul 18 08:17:44 2013
@@ -2162,8 +2162,8 @@
 	}
 
 	if (!(fs = ast_openstream(chan, argv[2], ast_channel_language(chan)))) {
-		ast_agi_send(agi->fd, chan, "200 result=%d endpos=%ld\n", 0, sample_offset);
-		return RESULT_SUCCESS;
+		ast_agi_send(agi->fd, chan, "200 result=-1 endpos=%ld\n", sample_offset);
+		return RESULT_FAILURE;
 	}
 
 	if ((vfs = ast_openvstream(chan, argv[2], ast_channel_language(chan)))) {
@@ -2222,9 +2222,9 @@
 	}
 
 	if (!(fs = ast_openstream(chan, argv[2], ast_channel_language(chan)))) {
-		ast_agi_send(agi->fd, chan, "200 result=%d endpos=%ld\n", 0, sample_offset);
+		ast_agi_send(agi->fd, chan, "200 result=-1 endpos=%ld\n", sample_offset);
 		ast_log(LOG_WARNING, "Unable to open %s\n", argv[2]);
-		return RESULT_SUCCESS;
+		return RESULT_FAILURE;
 	}
 
 	if ((vfs = ast_openvstream(chan, argv[2], ast_channel_language(chan))))