Make PTP DivertingLegInformation3 message behavior closer to the specifications.

*  Wait for a DivertingLegInformation3 message after receiving a
DivertingLegInformation1 message to complete the redirecting-to information
before queuing a redirecting update to the other channel.

*  A DivertingLegInformation2 message should be responded to with a
DivertingLegInformation3 when the COLR is determined.  If the call
could or does experience another redirection, you should manually
determine the COLR to send to the switch by setting REDIRECTING(to-pres)
to the COLR and setting REDIRECTING(to-num) = ${EXTEN}.

*  A DivertingLegInformation2 message must have an original called number
if the redirection count is greater than one.  Since Asterisk does
not keep track of this information, we can only indicate that the
number is not available due to interworking.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@190735 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 10 insertions, 2 deletions

diff --git a/funcs/func_redirecting.c b/funcs/func_redirecting.c
index 4a2d7be26..62c6d7bc9 100644
--- a/funcs/func_redirecting.c
+++ b/funcs/func_redirecting.c
@@ -49,6 +49,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/options.h"
 #include "asterisk/callerid.h"
 
+/*
+ * Do not document the REDIRECTING(pres) datatype.
+ * It has turned out that the from-pres and to-pres values must be kept
+ * separate.  They represent two different parties and there is a case when
+ * they are active at the same time.  The plain pres option will simply
+ * live on as a historical relic.
+ */
 /*** DOCUMENTATION
 	<function name="REDIRECTING" language="en_US">
 		<synopsis>
@@ -62,11 +69,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 					<enum name = "from-num" />
 					<enum name = "from-name" />
 					<enum name = "from-ton" />
+					<enum name = "from-pres" />
 					<enum name = "to-all" />
 					<enum name = "to-num" />
 					<enum name = "to-name" />
 					<enum name = "to-ton" />
-					<enum name = "pres" />
+					<enum name = "to-pres" />
 					<enum name = "reason" />
 					<enum name = "count" />
 				</enumlist>
@@ -323,7 +331,7 @@ static int redirecting_write(struct ast_channel *chan, const char *cmd, char *da
 		case 'i':
 			set_it = ast_channel_set_redirecting;
 			break;
-		
+
 		default:
 			ast_log(LOG_ERROR, "Unknown redirecting option '%s'.\n", option);
 			return 0;