[asterisk-commits] mjordan: trunk r365480 - in /trunk: apps/app_voicemail.c main/pbx.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Mon May  7 13:58:40 2012
New Revision: 365480

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=365480
Log:
Fix channel opaquification slip-up in r365477

Those channels are opaque now...

Modified:
    trunk/apps/app_voicemail.c
    trunk/main/pbx.c

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=365480&r1=365479&r2=365480
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon May  7 13:58:40 2012
@@ -5835,8 +5835,8 @@
 			e[0] = *code;
 			if (strchr(ecodes, e[0]) == NULL
 				&& ast_canmatch_extension(chan,
-					(!ast_strlen_zero(options->exitcontext) ? options->exitcontext : chan->context),
-					e, 1, S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
+					(!ast_strlen_zero(options->exitcontext) ? options->exitcontext : ast_channel_context(chan)),
+					e, 1, S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) {
 				strncat(ecodes, e, sizeof(ecodes) - strlen(ecodes) - 1);
 			}
 		}

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=365480&r1=365479&r2=365480
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Mon May  7 13:58:40 2012
@@ -5263,8 +5263,8 @@
 
 		if (invalid
 			|| (ast_strlen_zero(dst_exten) &&
-				!ast_exists_extension(c, c->context, c->exten, 1,
-				S_COR(c->caller.id.number.valid, c->caller.id.number.str, NULL)))) {
+				!ast_exists_extension(c, ast_channel_context(c), ast_channel_exten(c), 1,
+				S_COR(ast_channel_caller(c)->id.number.valid, ast_channel_caller(c)->id.number.str, NULL)))) {
 			/*!\note
 			 * If there is no match at priority 1, it is not a valid extension anymore.
 			 * Try to continue at "i" (for invalid) or "e" (for exception) or exit if