[asterisk-commits] rmudgett: branch group/issue8824 r167528 - in /team/group/issue8824: funcs/ i...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan  7 13:44:05 2009
New Revision: 167528

URL: http://svn.digium.com/view/asterisk?view=rev&rev=167528
Log:
Merged from:
https://origsvn.digium.com/svn/asterisk/be/branches/C.2...

..........
r167525 | rmudgett | 2009-01-07 13:29:05 -0600 (Wed, 07 Jan 2009) | 6 lines

*  Added AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER_ALERTING support.
*  Added some clarification comments to
enum AST_CONNECTED_LINE_UPDATE_SOURCE values.
*  Deprecated AST_CONNECTED_LINE_UPDATE_SOURCE_DIVERSION since that is
the purpose of the REDIRECTING updates.

Modified:
    team/group/issue8824/funcs/func_connectedline.c
    team/group/issue8824/include/asterisk/callerid.h
    team/group/issue8824/main/callerid.c

Modified: team/group/issue8824/funcs/func_connectedline.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/funcs/func_connectedline.c?view=diff&rev=167528&r1=167527&r2=167528
==============================================================================
--- team/group/issue8824/funcs/func_connectedline.c (original)
+++ team/group/issue8824/funcs/func_connectedline.c Wed Jan  7 13:44:05 2009
@@ -196,9 +196,9 @@
 		"The allowable datatypes are:\n"
 		"\"all\", \"name\", \"num\", \"ton\", \"pres\", and \"source\"\n"
 		"The source datatype can be set to the following:\n"
-		"answer    - Normal Call Answering\n"
-		"diversion - Call Diversion\n"
-		"transfer  - Call Transfer\n",
+		"answer            - Normal Call Answering\n"
+		"transfer_alerting - Call Transfer(Alerting)\n"
+		"transfer_active   - Call Transfer(Active)\n",
 	.read = connectedline_read,
 	.write = connectedline_write,
 };

Modified: team/group/issue8824/include/asterisk/callerid.h
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/include/asterisk/callerid.h?view=diff&rev=167528&r1=167527&r2=167528
==============================================================================
--- team/group/issue8824/include/asterisk/callerid.h (original)
+++ team/group/issue8824/include/asterisk/callerid.h Wed Jan  7 13:44:05 2009
@@ -396,8 +396,9 @@
 enum AST_CONNECTED_LINE_UPDATE_SOURCE {
 	AST_CONNECTED_LINE_UPDATE_SOURCE_UNKNOWN,   /* Update for unknown reason (May be interpreted to mean from answer) */
 	AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER,    /* Update from normal call answering */
-	AST_CONNECTED_LINE_UPDATE_SOURCE_DIVERSION, /* Update from call diversion */
-	AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER   /* Update from call transfer */
+	AST_CONNECTED_LINE_UPDATE_SOURCE_DIVERSION, /* Update from call diversion (Deprecated, use REDIRECTING updates instead.) */
+	AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER,   /* Update from call transfer(active) (Party has already answered) */
+	AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER_ALERTING   /* Update from call transfer(alerting) (Party has not answered yet) */
 };
 
 int ast_connected_line_source_parse(const char *data);

Modified: team/group/issue8824/main/callerid.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/callerid.c?view=diff&rev=167528&r1=167527&r2=167528
==============================================================================
--- team/group/issue8824/main/callerid.c (original)
+++ team/group/issue8824/main/callerid.c Wed Jan  7 13:44:05 2009
@@ -1301,10 +1301,12 @@
 /*! \brief Translation table for connected line update source settings */
 static const struct ast_value_translation connected_line_source_types[] = {
 /* *INDENT-OFF* */
-	{ AST_CONNECTED_LINE_UPDATE_SOURCE_UNKNOWN,   "unknown",   "Unknown" },
-	{ AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER,    "answer",    "Normal Call Answering" },
-	{ AST_CONNECTED_LINE_UPDATE_SOURCE_DIVERSION, "diversion", "Call Diversion" },
-	{ AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER,  "transfer",  "Call Transfer" }
+	{ AST_CONNECTED_LINE_UPDATE_SOURCE_UNKNOWN,           "unknown",           "Unknown" },
+	{ AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER,            "answer",            "Normal Call Answering" },
+	{ AST_CONNECTED_LINE_UPDATE_SOURCE_DIVERSION,         "diversion",         "Call Diversion (Deprecated, use REDIRECTING)" },
+	{ AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER,          "transfer_active",   "Call Transfer(Active)" },
+	{ AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER,          "transfer",          "Call Transfer(Active)" },/* Old name must come after new name. */
+	{ AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER_ALERTING, "transfer_alerting", "Call Transfer(Alerting)" }
 /* *INDENT-ON* */
 };