[asterisk-commits] rmudgett: branch rmudgett/ani r276348 - in /team/rmudgett/ani: ./ addons/ app...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Jul 14 11:01:16 CDT 2010


Author: rmudgett
Date: Wed Jul 14 11:01:03 2010
New Revision: 276348

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276348
Log:
Merged revisions 276344 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/rmudgett/cid

........
  r276344 | rmudgett | 2010-07-14 10:25:04 -0500 (Wed, 14 Jul 2010) | 1 line
  
  Rename XXX_name and XXX_number in preparation for merging.
........

Modified:
    team/rmudgett/ani/   (props changed)
    team/rmudgett/ani/addons/chan_ooh323.c
    team/rmudgett/ani/apps/app_alarmreceiver.c
    team/rmudgett/ani/apps/app_amd.c
    team/rmudgett/ani/apps/app_dial.c
    team/rmudgett/ani/apps/app_disa.c
    team/rmudgett/ani/apps/app_dumpchan.c
    team/rmudgett/ani/apps/app_fax.c
    team/rmudgett/ani/apps/app_followme.c
    team/rmudgett/ani/apps/app_macro.c
    team/rmudgett/ani/apps/app_meetme.c
    team/rmudgett/ani/apps/app_minivm.c
    team/rmudgett/ani/apps/app_osplookup.c
    team/rmudgett/ani/apps/app_parkandannounce.c
    team/rmudgett/ani/apps/app_privacy.c
    team/rmudgett/ani/apps/app_queue.c
    team/rmudgett/ani/apps/app_readexten.c
    team/rmudgett/ani/apps/app_rpt.c
    team/rmudgett/ani/apps/app_setcallerid.c
    team/rmudgett/ani/apps/app_sms.c
    team/rmudgett/ani/apps/app_stack.c
    team/rmudgett/ani/apps/app_talkdetect.c
    team/rmudgett/ani/apps/app_voicemail.c
    team/rmudgett/ani/apps/app_while.c
    team/rmudgett/ani/apps/app_zapateller.c
    team/rmudgett/ani/channels/chan_agent.c
    team/rmudgett/ani/channels/chan_console.c
    team/rmudgett/ani/channels/chan_dahdi.c
    team/rmudgett/ani/channels/chan_gtalk.c
    team/rmudgett/ani/channels/chan_h323.c
    team/rmudgett/ani/channels/chan_iax2.c
    team/rmudgett/ani/channels/chan_jingle.c
    team/rmudgett/ani/channels/chan_local.c
    team/rmudgett/ani/channels/chan_mgcp.c
    team/rmudgett/ani/channels/chan_misdn.c
    team/rmudgett/ani/channels/chan_oss.c
    team/rmudgett/ani/channels/chan_phone.c
    team/rmudgett/ani/channels/chan_sip.c
    team/rmudgett/ani/channels/chan_skinny.c
    team/rmudgett/ani/channels/chan_unistim.c
    team/rmudgett/ani/channels/chan_vpb.cc
    team/rmudgett/ani/channels/sig_analog.c
    team/rmudgett/ani/channels/sig_pri.c
    team/rmudgett/ani/channels/sig_ss7.c
    team/rmudgett/ani/funcs/func_blacklist.c
    team/rmudgett/ani/funcs/func_callerid.c
    team/rmudgett/ani/funcs/func_dialplan.c
    team/rmudgett/ani/include/asterisk/channel.h
    team/rmudgett/ani/main/app.c
    team/rmudgett/ani/main/ccss.c
    team/rmudgett/ani/main/cdr.c
    team/rmudgett/ani/main/cel.c
    team/rmudgett/ani/main/channel.c
    team/rmudgett/ani/main/cli.c
    team/rmudgett/ani/main/features.c
    team/rmudgett/ani/main/file.c
    team/rmudgett/ani/main/manager.c
    team/rmudgett/ani/main/pbx.c
    team/rmudgett/ani/res/res_agi.c
    team/rmudgett/ani/res/snmp/agent.c
    team/rmudgett/ani/tests/test_substitution.c

Propchange: team/rmudgett/ani/
------------------------------------------------------------------------------
--- ani-integrated (original)
+++ ani-integrated Wed Jul 14 11:01:03 2010
@@ -1,1 +1,1 @@
-/team/rmudgett/cid:1-276342
+/team/rmudgett/cid:1-276347

Modified: team/rmudgett/ani/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/addons/chan_ooh323.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/addons/chan_ooh323.c (original)
+++ team/rmudgett/ani/addons/chan_ooh323.c Wed Jul 14 11:01:03 2010
@@ -922,23 +922,23 @@
 	}
 	ast_mutex_lock(&p->lock);
 	ast_set_flag(p, H323_OUTGOING);
-	if (ast->connected.id.XXX_number.valid && ast->connected.id.XXX_number.str) {
+	if (ast->connected.id.number.valid && ast->connected.id.number.str) {
 		free(p->callerid_num);
-		p->callerid_num = strdup(ast->connected.id.XXX_number.str);
-	}
-
-	if (ast->connected.id.XXX_name.valid && ast->connected.id.XXX_name.str) {
+		p->callerid_num = strdup(ast->connected.id.number.str);
+	}
+
+	if (ast->connected.id.name.valid && ast->connected.id.name.str) {
 		free(p->callerid_name);
-		p->callerid_name = strdup(ast->connected.id.XXX_name.str);
-	} else if (ast->connected.id.XXX_number.valid && ast->connected.id.XXX_number.str) {
+		p->callerid_name = strdup(ast->connected.id.name.str);
+	} else if (ast->connected.id.number.valid && ast->connected.id.number.str) {
 		free(p->callerid_name);
-		p->callerid_name = strdup(ast->connected.id.XXX_number.str);
+		p->callerid_name = strdup(ast->connected.id.number.str);
 	} else {
-		ast->connected.id.XXX_name.valid = 1;
-		free(ast->connected.id.XXX_name.str);
-		ast->connected.id.XXX_name.str = strdup(gCallerID);
+		ast->connected.id.name.valid = 1;
+		free(ast->connected.id.name.str);
+		ast->connected.id.name.str = strdup(gCallerID);
 		free(p->callerid_name);
-		p->callerid_name = strdup(ast->connected.id.XXX_name.str);
+		p->callerid_name = strdup(ast->connected.id.name.str);
 	}
 
 	/* Retrieve vars */
@@ -1241,14 +1241,14 @@
 		ast_rtp_instance_change_source(p->rtp);
 		break;
 	case AST_CONTROL_CONNECTED_LINE:
-		if (!ast->connected.id.XXX_name.valid
-			|| ast_strlen_zero(ast->connected.id.XXX_name.str)) {
+		if (!ast->connected.id.name.valid
+			|| ast_strlen_zero(ast->connected.id.name.str)) {
 			break;
 		}
 		if (gH323Debug)
 			ast_log(LOG_DEBUG, "Sending connected line info for %s (%s)\n",
-				callToken, ast->connected.id.XXX_name.str);
-		ooSetANI(callToken, ast->connected.id.XXX_name.str);
+				callToken, ast->connected.id.name.str);
+		ooSetANI(callToken, ast->connected.id.name.str);
 		break;
 
       case AST_CONTROL_T38_PARAMETERS:
@@ -1545,8 +1545,8 @@
 		memset(&update_connected, 0, sizeof(update_connected));
 		update_connected.id.name = 1;
 		ast_party_connected_line_init(&connected);
-		connected.id.XXX_name.valid = 1;
-		connected.id.XXX_name.str = (char *) call->remoteDisplayName;
+		connected.id.name.valid = 1;
+		connected.id.name.str = (char *) call->remoteDisplayName;
 		connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
 		ast_channel_queue_connected_line_update(c, &connected, &update_connected);
 	}
@@ -1601,8 +1601,8 @@
 		memset(&update_connected, 0, sizeof(update_connected));
 		update_connected.id.name = 1;
 		ast_party_connected_line_init(&connected);
-		connected.id.XXX_name.valid = 1;
-		connected.id.XXX_name.str = (char *) call->remoteDisplayName;
+		connected.id.name.valid = 1;
+		connected.id.name.str = (char *) call->remoteDisplayName;
 		connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
 		ast_channel_queue_connected_line_update(c, &connected, &update_connected);
 	}
@@ -1999,8 +1999,8 @@
 				memset(&update_connected, 0, sizeof(update_connected));
 				update_connected.id.name = 1;
 				ast_party_connected_line_init(&connected);
-				connected.id.XXX_name.valid = 1;
-				connected.id.XXX_name.str = (char *) call->remoteDisplayName;
+				connected.id.name.valid = 1;
+				connected.id.name.str = (char *) call->remoteDisplayName;
 				connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
 				ast_channel_queue_connected_line_update(c, &connected, &update_connected);
 			}

Modified: team/rmudgett/ani/apps/app_alarmreceiver.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_alarmreceiver.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_alarmreceiver.c (original)
+++ team/rmudgett/ani/apps/app_alarmreceiver.c Wed Jul 14 11:01:03 2010
@@ -305,7 +305,7 @@
 	
 	/* Extract the caller ID location */
 	ast_copy_string(workstring,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, ""),
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""),
 		sizeof(workstring));
 	ast_shrink_phone_number(workstring);
 	if (ast_strlen_zero(workstring)) {
@@ -313,7 +313,7 @@
 	} else {
 		cl = workstring;
 	}
-	cn = S_COR(chan->caller.id.XXX_name.valid, chan->caller.id.XXX_name.str, "<unknown>");
+	cn = S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, "<unknown>");
 
 	/* Get the current time */
 	t = ast_tvnow();

Modified: team/rmudgett/ani/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_amd.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_amd.c (original)
+++ team/rmudgett/ani/apps/app_amd.c Wed Jul 14 11:01:03 2010
@@ -190,7 +190,7 @@
 
 	ast_verb(3, "AMD: %s %s %s (Fmt: %s)\n", chan->name,
 		S_COR(chan->caller.ani.XXX_number.valid, chan->caller.ani.XXX_number.str, "(N/A)"),
-		S_COR(chan->redirecting.from.XXX_number.valid, chan->redirecting.from.XXX_number.str, "(N/A)"),
+		S_COR(chan->redirecting.from.number.valid, chan->redirecting.from.number.str, "(N/A)"),
 		ast_getformatname(chan->readformat));
 
 	/* Lets parse the arguments. */

Modified: team/rmudgett/ani/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_dial.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_dial.c (original)
+++ team/rmudgett/ani/apps/app_dial.c Wed Jul 14 11:01:03 2010
@@ -767,8 +767,8 @@
 		"DestUniqueID: %s\r\n"
 		"Dialstring: %s\r\n",
 		src->name, dst->name,
-		S_COR(src->caller.id.XXX_number.valid, src->caller.id.XXX_number.str, "<unknown>"),
-		S_COR(src->caller.id.XXX_name.valid, src->caller.id.XXX_name.str, "<unknown>"),
+		S_COR(src->caller.id.number.valid, src->caller.id.number.str, "<unknown>"),
+		S_COR(src->caller.id.name.valid, src->caller.id.name.str, "<unknown>"),
 		src->uniqueid, dst->uniqueid,
 		dialstring ? dialstring : "");
 }
@@ -859,16 +859,16 @@
 		while (ast_channel_trylock(in)) {
 			CHANNEL_DEADLOCK_AVOIDANCE(c);
 		}
-		if (!c->redirecting.from.XXX_number.valid
-			|| ast_strlen_zero(c->redirecting.from.XXX_number.str)) {
+		if (!c->redirecting.from.number.valid
+			|| ast_strlen_zero(c->redirecting.from.number.str)) {
 			/*
 			 * The call was not previously redirected so it is
 			 * now redirected from this number.
 			 */
-			ast_party_number_free(&c->redirecting.from.XXX_number);
-			ast_party_number_init(&c->redirecting.from.XXX_number);
-			c->redirecting.from.XXX_number.valid = 1;
-			c->redirecting.from.XXX_number.str =
+			ast_party_number_free(&c->redirecting.from.number);
+			ast_party_number_init(&c->redirecting.from.number);
+			c->redirecting.from.number.valid = 1;
+			c->redirecting.from.number.str =
 				ast_strdup(S_OR(in->macroexten, in->exten));
 		}
 
@@ -877,8 +877,8 @@
 		if (ast_test_flag64(o, OPT_FORCECLID)) {
 			ast_party_id_free(&c->caller.id);
 			ast_party_id_init(&c->caller.id);
-			c->caller.id.XXX_number.valid = 1;
-			c->caller.id.XXX_number.str = ast_strdup(S_OR(in->macroexten, in->exten));
+			c->caller.id.number.valid = 1;
+			c->caller.id.number.str = ast_strdup(S_OR(in->macroexten, in->exten));
 			ast_string_field_set(c, accountcode, c->accountcode);
 		} else {
 			ast_party_caller_copy(&c->caller, &in->caller);
@@ -1618,9 +1618,9 @@
 	char *l;
 	int silencethreshold;
 
-	if (chan->caller.id.XXX_number.valid
-		&& !ast_strlen_zero(chan->caller.id.XXX_number.str)) {
-		l = ast_strdupa(chan->caller.id.XXX_number.str);
+	if (chan->caller.id.number.valid
+		&& !ast_strlen_zero(chan->caller.id.number.str)) {
+		l = ast_strdupa(chan->caller.id.number.str);
 		ast_shrink_phone_number(l);
 		if (ast_test_flag64(opts, OPT_PRIVACY) ) {
 			ast_verb(3, "Privacy DB is '%s', clid is '%s'\n", opt_args[OPT_ARG_PRIVACY], l);
@@ -2062,8 +2062,8 @@
 		memset(&tc->whentohangup, 0, sizeof(tc->whentohangup));
 
 		/* If the new channel has no callerid, try to guess what it should be */
-		if (!tc->caller.id.XXX_number.valid) {
-			if (chan->connected.id.XXX_number.valid) {
+		if (!tc->caller.id.number.valid) {
+			if (chan->connected.id.number.valid) {
 				struct ast_party_caller caller;
 
 				ast_party_caller_set_init(&caller, &tc->caller);
@@ -2092,14 +2092,14 @@
 				pres = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN;
 			}
 			if (cid_num) {
-				connected.id.XXX_number.valid = 1;
-				connected.id.XXX_number.str = cid_num;
-				connected.id.XXX_number.presentation = pres;
+				connected.id.number.valid = 1;
+				connected.id.number.str = cid_num;
+				connected.id.number.presentation = pres;
 			}
 			if (cid_name) {
-				connected.id.XXX_name.valid = 1;
-				connected.id.XXX_name.str = cid_name;
-				connected.id.XXX_name.presentation = pres;
+				connected.id.name.valid = 1;
+				connected.id.name.str = cid_name;
+				connected.id.name.presentation = pres;
 			}
 			connected.id.tag = cid_tag;
 			ast_channel_set_connected_line(tmp->chan, &connected, NULL);
@@ -2633,7 +2633,7 @@
 
 		if (ast_test_flag64(&opts, OPT_PEER_H)
 			&& ast_exists_extension(peer, peer->context, "h", 1,
-				S_COR(peer->caller.id.XXX_number.valid, peer->caller.id.XXX_number.str, NULL))) {
+				S_COR(peer->caller.id.number.valid, peer->caller.id.number.str, NULL))) {
 			int autoloopflag;
 			int found;
 			int res9;
@@ -2645,7 +2645,7 @@
 
 			while ((res9 = ast_spawn_extension(peer, peer->context, peer->exten,
 				peer->priority,
-				S_COR(peer->caller.id.XXX_number.valid, peer->caller.id.XXX_number.str, NULL),
+				S_COR(peer->caller.id.number.valid, peer->caller.id.number.str, NULL),
 				&found, 1)) == 0) {
 				peer->priority++;
 			}

Modified: team/rmudgett/ani/apps/app_disa.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_disa.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_disa.c (original)
+++ team/rmudgett/ani/apps/app_disa.c Wed Jul 14 11:01:03 2010
@@ -310,9 +310,9 @@
 				if (j == '#') { /* end of extension .. maybe */
 					if (i == 0
 						&& (ast_matchmore_extension(chan, args.context, "#", 1,
-							S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))
+							S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))
 							|| ast_exists_extension(chan, args.context, "#", 1,
-								S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) ) {
+								S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) ) {
 						/* Let the # be the part of, or the entire extension */
 					} else {
 						break;
@@ -343,7 +343,7 @@
 
 			/* if can do some more, do it */
 			if (!ast_matchmore_extension(chan, args.context, exten, 1,
-				S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+				S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 				break;
 			}
 		}
@@ -356,7 +356,7 @@
 		struct ast_flags cdr_flags = { AST_CDR_FLAG_POSTED };
 
 		if (!ast_exists_extension(chan, args.context, exten, 1,
-			S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 			pbx_builtin_setvar_helper(chan, "INVALID_EXTEN", exten);
 			exten[0] = 'i';
 			exten[1] = '\0';
@@ -364,7 +364,7 @@
 		}
 		if (!recheck
 			|| ast_exists_extension(chan, args.context, exten, 1,
-				S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+				S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 			ast_playtones_stop(chan);
 			/* We're authenticated and have a target extension */
 			if (!ast_strlen_zero(args.cid)) {

Modified: team/rmudgett/ani/apps/app_dumpchan.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_dumpchan.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_dumpchan.c (original)
+++ team/rmudgett/ani/apps/app_dumpchan.c Wed Jul 14 11:01:03 2010
@@ -116,10 +116,10 @@
 			c->name,
 			c->tech->type,
 			c->uniqueid,
-			S_COR(c->caller.id.XXX_number.valid, c->caller.id.XXX_number.str, "(N/A)"),
-			S_COR(c->caller.id.XXX_name.valid, c->caller.id.XXX_name.str, "(N/A)"),
+			S_COR(c->caller.id.number.valid, c->caller.id.number.str, "(N/A)"),
+			S_COR(c->caller.id.name.valid, c->caller.id.name.str, "(N/A)"),
 			S_OR(c->dialed.number.str, "(N/A)"),
-			S_COR(c->redirecting.from.XXX_number.valid, c->redirecting.from.XXX_number.str, "(N/A)"),
+			S_COR(c->redirecting.from.number.valid, c->redirecting.from.number.str, "(N/A)"),
 			c->parkinglot,
 			c->language,
 			ast_state2str(c->_state),

Modified: team/rmudgett/ani/apps/app_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_fax.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_fax.c (original)
+++ team/rmudgett/ani/apps/app_fax.c Wed Jul 14 11:01:03 2010
@@ -263,7 +263,7 @@
 		"FileName: %s\r\n",
 		s->chan->name,
 		s->chan->exten,
-		S_COR(s->chan->caller.id.XXX_number.valid, s->chan->caller.id.XXX_number.str, ""),
+		S_COR(s->chan->caller.id.number.valid, s->chan->caller.id.number.str, ""),
 		far_ident,
 		local_ident,
 		pages_transferred,

Modified: team/rmudgett/ani/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_followme.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_followme.c (original)
+++ team/rmudgett/ani/apps/app_followme.c Wed Jul 14 11:01:03 2010
@@ -839,9 +839,9 @@
 			outbound = ast_request("Local", ast_best_codec(caller->nativeformats), caller, dialarg, &dg);
 			if (outbound) {
 				ast_set_callerid(outbound,
-					S_COR(caller->caller.id.XXX_number.valid, caller->caller.id.XXX_number.str, NULL),
-					S_COR(caller->caller.id.XXX_name.valid, caller->caller.id.XXX_name.str, NULL),
-					S_COR(caller->caller.id.XXX_number.valid, caller->caller.id.XXX_number.str, NULL));
+					S_COR(caller->caller.id.number.valid, caller->caller.id.number.str, NULL),
+					S_COR(caller->caller.id.name.valid, caller->caller.id.name.str, NULL),
+					S_COR(caller->caller.id.number.valid, caller->caller.id.number.str, NULL));
 				ast_channel_inherit_variables(tpargs->chan, outbound);
 				ast_channel_datastore_inherit(tpargs->chan, outbound);
 				ast_string_field_set(outbound, language, tpargs->chan->language);

Modified: team/rmudgett/ani/apps/app_macro.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_macro.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_macro.c (original)
+++ team/rmudgett/ani/apps/app_macro.c Wed Jul 14 11:01:03 2010
@@ -299,7 +299,7 @@
 
 	snprintf(fullmacro, sizeof(fullmacro), "macro-%s", macro);
 	if (!ast_exists_extension(chan, fullmacro, "s", 1,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 		if (!ast_context_find(fullmacro)) 
 			ast_log(LOG_WARNING, "No such context '%s' for macro '%s'\n", fullmacro, macro);
 		else
@@ -372,7 +372,7 @@
 	autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP);
 	ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP);
 	while (ast_exists_extension(chan, chan->context, chan->exten, chan->priority,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 		struct ast_context *c;
 		struct ast_exten *e;
 		int foundx;
@@ -389,7 +389,7 @@
 						ast_log(LOG_WARNING, "Unable to lock context?\n");
 					} else {
 						e = find_matching_priority(c, chan->exten, chan->priority,
-							S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL));
+							S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL));
 						if (e) { /* This will only be undefined for pbx_realtime, which is majorly broken. */
 							ast_copy_string(runningapp, ast_get_extension_app(e), sizeof(runningapp));
 							ast_copy_string(runningdata, ast_get_extension_app_data(e), sizeof(runningdata));
@@ -406,7 +406,7 @@
 		pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
 
 		res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority,
-			S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL),
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL),
 			&foundx, 1);
 		if (res) {
 			/* Something bad happened, or a hangup has been requested. */
@@ -552,7 +552,7 @@
 				if (sscanf(offsets, "%30d", &offset) == 1) {
 					if (ast_exists_extension(chan, chan->context, chan->exten,
 						chan->priority + offset + 1,
-						S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+						S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 						chan->priority += offset;
 					}
 				}

Modified: team/rmudgett/ani/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_meetme.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_meetme.c (original)
+++ team/rmudgett/ani/apps/app_meetme.c Wed Jul 14 11:01:03 2010
@@ -1453,8 +1453,8 @@
 			if (!concise) {
 				ast_cli(a->fd, "User #: %-2.2d %12.12s %-20.20s Channel: %s %s %s %s %s %s %02d:%02d:%02d\n",
 					user->user_no,
-					S_COR(user->chan->caller.id.XXX_number.valid, user->chan->caller.id.XXX_number.str, "<unknown>"),
-					S_COR(user->chan->caller.id.XXX_name.valid, user->chan->caller.id.XXX_name.str, "<no name>"),
+					S_COR(user->chan->caller.id.number.valid, user->chan->caller.id.number.str, "<unknown>"),
+					S_COR(user->chan->caller.id.name.valid, user->chan->caller.id.name.str, "<no name>"),
 					user->chan->name,
 					ast_test_flag64(&user->userflags, CONFFLAG_ADMIN) ? "(Admin)" : "",
 					ast_test_flag64(&user->userflags, CONFFLAG_MONITOR) ? "(Listen only)" : "",
@@ -1464,8 +1464,8 @@
 			} else {
 				ast_cli(a->fd, "%d!%s!%s!%s!%s!%s!%s!%s!%d!%02d:%02d:%02d\n",
 					user->user_no,
-					S_COR(user->chan->caller.id.XXX_number.valid, user->chan->caller.id.XXX_number.str, ""),
-					S_COR(user->chan->caller.id.XXX_name.valid, user->chan->caller.id.XXX_name.str, ""),
+					S_COR(user->chan->caller.id.number.valid, user->chan->caller.id.number.str, ""),
+					S_COR(user->chan->caller.id.name.valid, user->chan->caller.id.name.str, ""),
 					user->chan->name,
 					ast_test_flag64(&user->userflags, CONFFLAG_ADMIN) ? "1" : "",
 					ast_test_flag64(&user->userflags, CONFFLAG_MONITOR) ? "1" : "",
@@ -2668,8 +2668,8 @@
 			"CallerIDname: %s\r\n",
 			chan->name, chan->uniqueid, conf->confno,
 			user->user_no,
-			S_COR(user->chan->caller.id.XXX_number.valid, user->chan->caller.id.XXX_number.str, "<unknown>"),
-			S_COR(user->chan->caller.id.XXX_name.valid, user->chan->caller.id.XXX_name.str, "<unknown>")
+			S_COR(user->chan->caller.id.number.valid, user->chan->caller.id.number.str, "<unknown>"),
+			S_COR(user->chan->caller.id.name.valid, user->chan->caller.id.name.str, "<unknown>")
 			);
 		sent_event = 1;
 	}
@@ -3706,8 +3706,8 @@
 				"Duration: %ld\r\n",
 				chan->name, chan->uniqueid, conf->confno,
 				user->user_no,
-				S_COR(user->chan->caller.id.XXX_number.valid, user->chan->caller.id.XXX_number.str, "<unknown>"),
-				S_COR(user->chan->caller.id.XXX_name.valid, user->chan->caller.id.XXX_name.str, "<unknown>"),
+				S_COR(user->chan->caller.id.number.valid, user->chan->caller.id.number.str, "<unknown>"),
+				S_COR(user->chan->caller.id.name.valid, user->chan->caller.id.name.str, "<unknown>"),
 				(long)(now.tv_sec - user->jointime));
 		}
 
@@ -4722,8 +4722,8 @@
 				idText,
 				cnf->confno,
 				user->user_no,
-				S_COR(user->chan->caller.id.XXX_number.valid, user->chan->caller.id.XXX_number.str, "<unknown>"),
-				S_COR(user->chan->caller.id.XXX_name.valid, user->chan->caller.id.XXX_name.str, "<no name>"),
+				S_COR(user->chan->caller.id.number.valid, user->chan->caller.id.number.str, "<unknown>"),
+				S_COR(user->chan->caller.id.name.valid, user->chan->caller.id.name.str, "<no name>"),
 				user->chan->name,
 				ast_test_flag64(&user->userflags, CONFFLAG_ADMIN) ? "Yes" : "No",
 				ast_test_flag64(&user->userflags, CONFFLAG_MONITOR) ? "Listen only" : ast_test_flag64(&user->userflags, CONFFLAG_TALKER) ? "Talk only" : "Talk and listen",

Modified: team/rmudgett/ani/apps/app_minivm.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_minivm.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_minivm.c (original)
+++ team/rmudgett/ani/apps/app_minivm.c Wed Jul 14 11:01:03 2010
@@ -1731,10 +1731,10 @@
 	snprintf(arguments, sizeof(arguments), "%s %s@%s %s %s&", 
 		ast_strlen_zero(vmu->externnotify) ? global_externnotify : vmu->externnotify, 
 		vmu->username, vmu->domain,
-		(chan->caller.id.XXX_name.valid && chan->caller.id.XXX_name.str)
-			? chan->caller.id.XXX_name.str : "",
-		(chan->caller.id.XXX_number.valid && chan->caller.id.XXX_number.str)
-			? chan->caller.id.XXX_number.str : "");
+		(chan->caller.id.name.valid && chan->caller.id.name.str)
+			? chan->caller.id.name.str : "",
+		(chan->caller.id.number.valid && chan->caller.id.number.str)
+			? chan->caller.id.number.str : "");
 
 	ast_debug(1, "Executing: %s\n", arguments);
 	ast_safe_system(arguments);
@@ -1921,8 +1921,8 @@
 		ast_strftime(timebuf, sizeof(timebuf), "%H:%M:%S", &tm);
 
 		ast_callerid_merge(callerid, sizeof(callerid),
-			S_COR(chan->caller.id.XXX_name.valid, chan->caller.id.XXX_name.str, NULL),
-			S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL),
+			S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, NULL),
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL),
 			"Unknown");
 		snprintf(logbuf, sizeof(logbuf),
 			/* "Mailbox:domain:macrocontext:exten:priority:callerchan:callerid:origdate:origtime:duration:durationstatus:accountcode" */
@@ -2127,8 +2127,8 @@
 		ast_channel_unlock(chan);
 		res = notify_new_message(chan, template, vmu, filename, atoi(duration_string),
 			format,
-			S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL),
-			S_COR(chan->caller.id.XXX_name.valid, chan->caller.id.XXX_name.str, NULL));
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL),
+			S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, NULL));
 	}
 
 	pbx_builtin_setvar_helper(chan, "MVM_NOTIFY_STATUS", res == 0 ? "SUCCESS" : "FAILED");
@@ -2290,18 +2290,18 @@
 	if (ast_test_flag(vmu, MVM_OPERATOR)) {
 		if (!ast_strlen_zero(vmu->exit)) {
 			if (ast_exists_extension(chan, vmu->exit, "o", 1,
-				S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+				S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 				strncat(ecodes, "0", sizeof(ecodes) - strlen(ecodes) - 1);
 				ouseexten = 1;
 			}
 		} else if (ast_exists_extension(chan, chan->context, "o", 1,
-			S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 			strncat(ecodes, "0", sizeof(ecodes) - strlen(ecodes) - 1);
 			ouseexten = 1;
 		}
 		else if (!ast_strlen_zero(chan->macrocontext)
 			&& ast_exists_extension(chan, chan->macrocontext, "o", 1,
-				S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+				S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 			strncat(ecodes, "0", sizeof(ecodes) - strlen(ecodes) - 1);
 			ousemacro = 1;
 		}
@@ -2309,15 +2309,15 @@
 
 	if (!ast_strlen_zero(vmu->exit)) {
 		if (ast_exists_extension(chan, vmu->exit, "a", 1,
-			S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 			strncat(ecodes, "*", sizeof(ecodes) -  strlen(ecodes) - 1);
 		}
 	} else if (ast_exists_extension(chan, chan->context, "a", 1,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 		strncat(ecodes, "*", sizeof(ecodes) -  strlen(ecodes) - 1);
 	} else if (!ast_strlen_zero(chan->macrocontext)
 		&& ast_exists_extension(chan, chan->macrocontext, "a", 1,
-			S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 		strncat(ecodes, "*", sizeof(ecodes) -  strlen(ecodes) - 1);
 		ausemacro = 1;
 	}

Modified: team/rmudgett/ani/apps/app_osplookup.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_osplookup.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_osplookup.c (original)
+++ team/rmudgett/ani/apps/app_osplookup.c Wed Jul 14 11:01:03 2010
@@ -2258,7 +2258,7 @@
 	ast_debug(1, "OSPAuth: token size '%zd'\n", strlen(token));
 
 	res = osp_auth(provider, &handle, source,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL),
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL),
 		chan->exten, token, &timelimit);
 	if (res > 0) {
 		status = AST_OSP_SUCCESS;
@@ -2457,7 +2457,7 @@
 	}
 
 	res = osp_lookup(provider, callidtypes, actualsrc, srcdev,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL),
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL),
 		args.exten, snetid, &np, &div, cinfo, &results);
 	if (res > 0) {
 		status = AST_OSP_SUCCESS;

Modified: team/rmudgett/ani/apps/app_parkandannounce.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_parkandannounce.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_parkandannounce.c (original)
+++ team/rmudgett/ani/apps/app_parkandannounce.c Wed Jul 14 11:01:03 2010
@@ -128,9 +128,9 @@
 
 	ast_verb(3, "Return Context: (%s,%s,%d) ID: %s\n", chan->context, chan->exten,
 		chan->priority,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, ""));
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""));
 	if (!ast_exists_extension(chan, chan->context, chan->exten, chan->priority,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 		ast_verb(3, "Warning: Return Context Invalid, call will return to default|s\n");
 	}
 
@@ -150,8 +150,8 @@
 	oh.vars = ast_variable_new("_PARKEDAT", buf, "");
 	dchan = __ast_request_and_dial(dialtech, AST_FORMAT_SLINEAR, chan, args.dial, 30000,
 		&outstate,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL),
-		S_COR(chan->caller.id.XXX_name.valid, chan->caller.id.XXX_name.str, NULL),
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL),
+		S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, NULL),
 		&oh);
 	if (dchan) {
 		if (dchan->_state == AST_STATE_UP) {

Modified: team/rmudgett/ani/apps/app_privacy.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_privacy.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_privacy.c (original)
+++ team/rmudgett/ani/apps/app_privacy.c Wed Jul 14 11:01:03 2010
@@ -96,8 +96,8 @@
 		AST_APP_ARG(checkcontext);
 	);
 
-	if (chan->caller.id.XXX_number.valid
-		&& !ast_strlen_zero(chan->caller.id.XXX_number.str)) {
+	if (chan->caller.id.number.valid
+		&& !ast_strlen_zero(chan->caller.id.number.str)) {
 		ast_verb(3, "CallerID number present: Skipping\n");
 	} else {
 		/*Answer the channel if it is not already*/
@@ -188,9 +188,9 @@
 			 * be passed out to other channels.  This is the point of the
 			 * privacy application.
 			 */
-			chan->caller.id.XXX_name.presentation = AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED;
-			chan->caller.id.XXX_number.presentation = AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED;
-			chan->caller.id.XXX_number.plan = 0;/* Unknown */
+			chan->caller.id.name.presentation = AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED;
+			chan->caller.id.number.presentation = AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED;
+			chan->caller.id.number.plan = 0;/* Unknown */
 
 			ast_set_callerid(chan, phone, "Privacy Manager", NULL);
 

Modified: team/rmudgett/ani/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_queue.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_queue.c (original)
+++ team/rmudgett/ani/apps/app_queue.c Wed Jul 14 11:01:03 2010
@@ -2334,8 +2334,8 @@
 		ast_manager_event(qe->chan, EVENT_FLAG_CALL, "Join",
 			"Channel: %s\r\nCallerIDNum: %s\r\nCallerIDName: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\nUniqueid: %s\r\n",
 			qe->chan->name,
-			S_COR(qe->chan->caller.id.XXX_number.valid, qe->chan->caller.id.XXX_number.str, "unknown"),/* XXX somewhere else it is <unknown> */
-			S_COR(qe->chan->caller.id.XXX_name.valid, qe->chan->caller.id.XXX_name.str, "unknown"),
+			S_COR(qe->chan->caller.id.number.valid, qe->chan->caller.id.number.str, "unknown"),/* XXX somewhere else it is <unknown> */
+			S_COR(qe->chan->caller.id.name.valid, qe->chan->caller.id.name.str, "unknown"),
 			q->name, qe->pos, q->count, qe->chan->uniqueid );
 		ast_debug(1, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
 	}
@@ -2392,7 +2392,7 @@
 
 	/* If the extension is bad, then reset the digits to blank */
 	if (!ast_canmatch_extension(qe->chan, qe->context, qe->digits, 1,
-		S_COR(qe->chan->caller.id.XXX_number.valid, qe->chan->caller.id.XXX_number.str, NULL))) {
+		S_COR(qe->chan->caller.id.number.valid, qe->chan->caller.id.number.str, NULL))) {
 		qe->digits[0] = '\0';
 		return 0;
 	}
@@ -2894,8 +2894,8 @@
 	memset(&tmp->chan->whentohangup, 0, sizeof(tmp->chan->whentohangup));
 
 	/* If the new channel has no callerid, try to guess what it should be */
-	if (!tmp->chan->caller.id.XXX_number.valid) {
-		if (qe->chan->connected.id.XXX_number.valid) {
+	if (!tmp->chan->caller.id.number.valid) {
+		if (qe->chan->connected.id.number.valid) {
 			struct ast_party_caller caller;
 
 			ast_party_caller_set_init(&caller, &tmp->chan->caller);
@@ -2975,8 +2975,8 @@
 			"Uniqueid: %s\r\n"
 			"%s",
 			qe->parent->name, tmp->interface, tmp->member->membername, qe->chan->name, tmp->chan->name,
-			S_COR(tmp->chan->caller.id.XXX_number.valid, tmp->chan->caller.id.XXX_number.str, "unknown"),
-			S_COR(tmp->chan->caller.id.XXX_name.valid, tmp->chan->caller.id.XXX_name.str, "unknown"),
+			S_COR(tmp->chan->caller.id.number.valid, tmp->chan->caller.id.number.str, "unknown"),
+			S_COR(tmp->chan->caller.id.name.valid, tmp->chan->caller.id.name.str, "unknown"),
 			qe->chan->context, qe->chan->exten, qe->chan->priority, qe->chan->uniqueid,
 			qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
 		ast_verb(3, "Called %s\n", tmp->interface);
@@ -3406,16 +3406,16 @@
 						ast_string_field_set(o->chan, accountcode, in->accountcode);
 
 						ast_channel_set_redirecting(o->chan, &original->redirecting, NULL);
-						if (!o->chan->redirecting.from.XXX_number.valid
-							|| ast_strlen_zero(o->chan->redirecting.from.XXX_number.str)) {
+						if (!o->chan->redirecting.from.number.valid
+							|| ast_strlen_zero(o->chan->redirecting.from.number.str)) {
 							/*
 							 * The call was not previously redirected so it is
 							 * now redirected from this number.
 							 */
-							ast_party_number_free(&o->chan->redirecting.from.XXX_number);
-							ast_party_number_init(&o->chan->redirecting.from.XXX_number);
-							o->chan->redirecting.from.XXX_number.valid = 1;
-							o->chan->redirecting.from.XXX_number.str =
+							ast_party_number_free(&o->chan->redirecting.from.number);
+							ast_party_number_init(&o->chan->redirecting.from.number);
+							o->chan->redirecting.from.number.valid = 1;
+							o->chan->redirecting.from.number.str =
 								ast_strdup(S_OR(in->macroexten, in->exten));
 						}
 
@@ -5716,7 +5716,7 @@
 	}
 	ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ENTERQUEUE", "%s|%s|%d",
 		S_OR(args.url, ""),
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, ""),
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""),
 		qe.opos);
 	copy_rules(&qe, args.rule);
 	qe.pr = AST_LIST_FIRST(&qe.qe_rules);
@@ -7027,8 +7027,8 @@
 					"%s"
 					"\r\n",
 					q->name, pos++, qe->chan->name, qe->chan->uniqueid,
-					S_COR(qe->chan->caller.id.XXX_number.valid, qe->chan->caller.id.XXX_number.str, "unknown"),
-					S_COR(qe->chan->caller.id.XXX_name.valid, qe->chan->caller.id.XXX_name.str, "unknown"),
+					S_COR(qe->chan->caller.id.number.valid, qe->chan->caller.id.number.str, "unknown"),
+					S_COR(qe->chan->caller.id.name.valid, qe->chan->caller.id.name.str, "unknown"),
 					(long) (now - qe->start), idText);
 			}
 		}

Modified: team/rmudgett/ani/apps/app_readexten.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_readexten.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_readexten.c (original)
+++ team/rmudgett/ani/apps/app_readexten.c Wed Jul 14 11:01:03 2010
@@ -241,9 +241,9 @@
 
 			exten[x] = res;
 			if (!ast_matchmore_extension(chan, arglist.context, exten, 1 /* priority */,
-				S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+				S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 				if (!ast_exists_extension(chan, arglist.context, exten, 1,
-					S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))
+					S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))
 					&& res == '#') {
 					exten[x] = '\0';
 				}
@@ -255,7 +255,7 @@
 			break;
 
 		if (ast_exists_extension(chan, arglist.context, exten, 1,
-			S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 			ast_debug(3, "User entered valid extension '%s'\n", exten);
 			pbx_builtin_setvar_helper(chan, arglist.variable, exten);
 			status = "OK";
@@ -301,7 +301,7 @@
 		priority_int = atoi(args.priority);
 
 	if (ast_exists_extension(chan, args.context, args.extension, priority_int,
-		S_COR(chan->caller.id.XXX_number.valid, chan->caller.id.XXX_number.str, NULL))) {
+		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
 	    ast_copy_string(buffer, "1", buflen);
 	} else {
 	    ast_copy_string(buffer, "0", buflen);

Modified: team/rmudgett/ani/apps/app_rpt.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_rpt.c?view=diff&rev=276348&r1=276347&r2=276348
==============================================================================
--- team/rmudgett/ani/apps/app_rpt.c (original)
+++ team/rmudgett/ani/apps/app_rpt.c Wed Jul 14 11:01:03 2010
@@ -5454,14 +5454,14 @@
 		if(instr){
 			ast_callerid_parse(instr, &name, &loc);
 			if(loc){
-				mychannel->caller.id.XXX_number.valid = 1;

[... 3610 lines stripped ...]



More information about the asterisk-commits mailing list