[svn-commits] rmudgett: branch rmudgett/call_waiting r267182 - in /team/rmudgett/call_waiti...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Jun  2 14:44:07 2010
New Revision: 267182

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

........
  r267138 | russell | 2010-06-02 13:53:38 -0500 (Wed, 02 Jun 2010) | 4 lines
  
  Add a CLI command that blocks until Asterisk has fully booted.
  
  Review: https://reviewboard.asterisk.org/r/684/
........
  r267181 | dvossel | 2010-06-02 14:33:56 -0500 (Wed, 02 Jun 2010) | 2 lines
  
  Update CHANGES and aoc help doc to reflect AOC additions
........

Modified:
    team/rmudgett/call_waiting/CHANGES
    team/rmudgett/call_waiting/doc/advice_of_charge.txt
    team/rmudgett/call_waiting/main/cli.c

Modified: team/rmudgett/call_waiting/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/call_waiting/CHANGES?view=diff&rev=267182&r1=267181&r2=267182
==============================================================================
--- team/rmudgett/call_waiting/CHANGES (original)
+++ team/rmudgett/call_waiting/CHANGES Wed Jun  2 14:44:07 2010
@@ -61,6 +61,8 @@
    the particular peer. The dialstring format is SIP/peer/exten/host_or_IP.
  * Added directmediapermit/directmediadeny to limit which peers can send direct media
    to each other
+ * Added the 'snom_aoc_enabled' option to turn on support for sending Advice of
+   Charge messages to snom phones.
 
 IAX2 Changes
 -----------
@@ -341,6 +343,7 @@
    to eliminate tromboned calls.  A tromboned call goes out an interface and comes
    back into the same interface.  Tromboned calls happen because of call routing,
    call deflection, call forwarding, and call transfer.
+ * Added the ability to send and receive ETSI Advice-Of-Charge messages. 
  * Added the ability to support call waiting calls.  (The SETUP has no B channel
    assigned.)
 
@@ -373,6 +376,8 @@
    'sip show peers'.
  * Added Advice-Of-Charge events (AOC-S, AOC-D, and AOC-E) in the new
    aoc event class.
+ * Added Advice-Of-Charge manager action, AOCMessage, for generating AOC-D and
+   AOC-E messages on a channel.
 
 Channel Event Logging
 ---------------------

Modified: team/rmudgett/call_waiting/doc/advice_of_charge.txt
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/call_waiting/doc/advice_of_charge.txt?view=diff&rev=267182&r1=267181&r2=267182
==============================================================================
--- team/rmudgett/call_waiting/doc/advice_of_charge.txt (original)
+++ team/rmudgett/call_waiting/doc/advice_of_charge.txt Wed Jun  2 14:44:07 2010
@@ -4,10 +4,19 @@
 
 Written by: David Vossel
 Initial version: 04-19-2010
+Email: dvossel at digium.com
 
 This document is designed to give an overview of how to configure and
 generate Advice of Charge along with a detailed explanation of how each
 option works.
+
+--------------------------------------
+|          READ THIS FIRST           |
+--------------------------------------
+PLEASE REPORT ANY ISSUES ENCOUNTERED WHILE USING AOC.  This feature
+has had very little community feedback so far.  If you are using this
+feature please share with us any problems you are having and any
+improvements that could make this feature more useful.  Thank you!
 
 --------------------------------------
 |           Terminology              |

Modified: team/rmudgett/call_waiting/main/cli.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/call_waiting/main/cli.c?view=diff&rev=267182&r1=267181&r2=267182
==============================================================================
--- team/rmudgett/call_waiting/main/cli.c (original)
+++ team/rmudgett/call_waiting/main/cli.c Wed Jun  2 14:44:07 2010
@@ -1557,6 +1557,28 @@
 #undef FORMAT_STRING
 }
 
+static char *handle_cli_wait_fullybooted(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+	switch (cmd) {
+	case CLI_INIT:
+		e->command = "core waitfullybooted";
+		e->usage =
+			"Usage: core waitfullybooted\n"
+			"	Wait until Asterisk has fully booted.\n";
+		return NULL;
+	case CLI_GENERATE:
+		return NULL;
+	}
+
+	while (!ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
+		usleep(100);
+	}
+
+	ast_cli(a->fd, "Asterisk has fully booted.\n");
+
+	return CLI_SUCCESS;
+}
+
 static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
 
 static struct ast_cli_entry cli_cli[] = {
@@ -1600,6 +1622,8 @@
 	AST_CLI_DEFINE(handle_cli_show_permissions, "Show CLI permissions"),
 
 	AST_CLI_DEFINE(handle_cli_check_permissions, "Try a permissions config for a user"),
+
+	AST_CLI_DEFINE(handle_cli_wait_fullybooted, "Wait for Asterisk to be fully booted"),
 };
 
 /*!