[asterisk-commits] mmichelson: branch mmichelson/1.4-test r69555 - in /team/mmichelson/1.4-test:...

Fri Jun 15 13:54:14 CDT 2007

Author: mmichelson
Date: Fri Jun 15 13:54:14 2007
New Revision: 69555

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69555
Log:
Merged revisions 69434,69470,69518 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r69434 | qwell | 2007-06-14 17:56:09 -0500 (Thu, 14 Jun 2007) | 1 line

Update to latest versions of sound files.
................
r69470 | qwell | 2007-06-14 18:22:51 -0500 (Thu, 14 Jun 2007) | 12 lines

Merged revisions 69469 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r69469 | qwell | 2007-06-14 18:21:45 -0500 (Thu, 14 Jun 2007) | 4 lines

Fix an issue where the line number in an unterminated comment block error message would show the wrong line number.

"Reported" to me on #asterisk (somebody posted an error message, and I happened to catch it)

........

................
r69518 | russell | 2007-06-15 10:27:34 -0500 (Fri, 15 Jun 2007) | 5 lines

The SLATRUNK_STATUS variable indicated "SUCCESS" for both an answer of the
incoming call on the trunk, or if the trunk reached its ring timeout.
This patch changes the variable to say "RINGTIMEOUT" in that case.
(issue #9973, reported by n00dle, patch by me)

................

Modified:
    team/mmichelson/1.4-test/   (props changed)
    team/mmichelson/1.4-test/apps/app_meetme.c
    team/mmichelson/1.4-test/main/config.c
    team/mmichelson/1.4-test/sounds/Makefile

Propchange: team/mmichelson/1.4-test/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/mmichelson/1.4-test/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 15 13:54:14 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-69392
+/branches/1.4:1-69554

Modified: team/mmichelson/1.4-test/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/1.4-test/apps/app_meetme.c?view=diff&rev=69555&r1=69554&r2=69555
==============================================================================
--- team/mmichelson/1.4-test/apps/app_meetme.c (original)
+++ team/mmichelson/1.4-test/apps/app_meetme.c Fri Jun 15 13:54:14 2007
@@ -296,13 +296,21 @@
 "the argument \"station\" should be just the station name.  If the call was\n"
 "initiated by pressing a line key, then the station name should be preceded\n"
 "by an underscore and the trunk name associated with that line button.\n"
-"For example: \"station1_line1\".";
+"For example: \"station1_line1\"."
+"  On exit, this application will set the variable SLASTATION_STATUS to\n"
+"one of the following values:\n"
+"    FAILURE | CONGESTION | SUCCESS\n"
+"";
 
 static const char *slatrunk_desc =
 "  SLATrunk(trunk):\n"
 "This application should be executed by an SLA trunk on an inbound call.\n"
 "The channel calling this application should correspond to the SLA trunk\n"
-"with the name \"trunk\" that is being passed as an argument.\n";
+"with the name \"trunk\" that is being passed as an argument.\n"
+"  On exit, this application will set the variable SLATRUNK_STATUS to\n"
+"one of the following values:\n"
+"   FAILURE | SUCCESS | UNANSWERED | RINGTIMEOUT\n" 
+"";
 
 #define MAX_CONFNUM 80
 #define MAX_PIN     80
@@ -3725,6 +3733,7 @@
 		time_elapsed = ast_tvdiff_ms(ast_tvnow(), ringing_trunk->ring_begin);
 		time_left = (ringing_trunk->trunk->ring_timeout * 1000) - time_elapsed;
 		if (time_left <= 0) {
+			pbx_builtin_setvar_helper(ringing_trunk->trunk->chan, "SLATRUNK_STATUS", "RINGTIMEOUT");
 			AST_LIST_REMOVE_CURRENT(&sla.ringing_trunks, entry);
 			sla_stop_ringing_trunk(ringing_trunk);
 			res = 1;
@@ -4298,8 +4307,9 @@
 	conf = NULL;
 	trunk->chan = NULL;
 	trunk->on_hold = 0;
-
-	pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "SUCCESS");
+	
+	if (!pbx_builtin_getvar_helper(chan, "SLATRUNK_STATUS"))
+		pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "SUCCESS");
 
 	/* Remove the entry from the list of ringing trunks if it is still there. */
 	ast_mutex_lock(&sla.lock);

Modified: team/mmichelson/1.4-test/main/config.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/1.4-test/main/config.c?view=diff&rev=69555&r1=69554&r2=69555
==============================================================================
--- team/mmichelson/1.4-test/main/config.c (original)
+++ team/mmichelson/1.4-test/main/config.c Fri Jun 15 13:54:14 2007
@@ -921,7 +921,7 @@
 		fclose(f);		
 	} while(0);
 	if (comment) {
-		ast_log(LOG_WARNING,"Unterminated comment detected beginning on line %d\n", nest[comment]);
+		ast_log(LOG_WARNING,"Unterminated comment detected beginning on line %d\n", nest[comment - 1]);
 	}
 #ifdef AST_INCLUDE_GLOB
 					if (!cfg)

Modified: team/mmichelson/1.4-test/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/mmichelson/1.4-test/sounds/Makefile?view=diff&rev=69555&r1=69554&r2=69555
==============================================================================
--- team/mmichelson/1.4-test/sounds/Makefile (original)
+++ team/mmichelson/1.4-test/sounds/Makefile Fri Jun 15 13:54:14 2007
@@ -18,8 +18,8 @@
 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.6
-EXTRA_SOUNDS_VERSION:=1.4.5
+CORE_SOUNDS_VERSION:=1.4.7
+EXTRA_SOUNDS_VERSION:=1.4.6
 SOUNDS_URL:=http://ftp.digium.com/pub/telephony/sounds/releases
 MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
 MCS:=$(subst -FR-,-fr-,$(MCS))


