[asterisk-commits] rmudgett: branch rmudgett/subaddr r224997 - /team/rmudgett/subaddr/channels/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Oct 20 22:43:00 2009
New Revision: 224997

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224997
Log:
Handle incoming connected line and redirecting to/from subaddresses.

Modified:
    team/rmudgett/subaddr/channels/sig_pri.c

Modified: team/rmudgett/subaddr/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/subaddr/channels/sig_pri.c?view=diff&rev=224997&r1=224996&r2=224997
==============================================================================
--- team/rmudgett/subaddr/channels/sig_pri.c (original)
+++ team/rmudgett/subaddr/channels/sig_pri.c Tue Oct 20 22:43:00 2009
@@ -1200,6 +1200,11 @@
 	if (pri_id->name.valid || pri_id->number.valid) {
 		ast_id->number_presentation = overall_ast_presentation(pri_id);
 	}
+#if defined(HAVE_PRI_SUBADDR)
+	if (pri_id->subaddress.valid) {
+		sig_pri_set_subaddress(&ast_id->subaddress, &pri_id->subaddress);
+	}
+#endif	/* defined(HAVE_PRI_SUBADDR) */
 }
 
 /*!
@@ -1354,6 +1359,12 @@
 				}
 				ast_connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
 
+#if defined(HAVE_PRI_SUBADDR)
+				if (ast_connected.id.subaddress.valid) {
+					ast_party_subaddress_set(&owner->cid.subaddress,
+						&ast_connected.id.subaddress);
+				}
+#endif	/* defined(HAVE_PRI_SUBADDR) */
 				if (caller_id_update) {
 					pri->pvts[chanpos]->callingpres =
 						ast_connected.id.number_presentation;