[asterisk-commits] rmudgett: branch rmudgett/misdn_facility r183990 - in /team/rmudgett/misdn_fa...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Mar 24 13:19:31 CDT 2009


Author: rmudgett
Date: Tue Mar 24 13:19:26 2009
New Revision: 183990

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183990
Log:
Merged revisions 183920-183921,183986 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/group/issue8824

........
  r183920 | mmichelson | 2009-03-24 11:06:28 -0500 (Tue, 24 Mar 2009) | 3 lines
  
  Good Morning. This fixes new API calls to be more consistently named.
........
  r183921 | mmichelson | 2009-03-24 11:08:37 -0500 (Tue, 24 Mar 2009) | 3 lines
  
  Get in sync with trunk so I can post a new diff.
........
  r183986 | mmichelson | 2009-03-24 12:21:08 -0500 (Tue, 24 Mar 2009) | 3 lines
  
  Fix an inconsistency in function naming that Richard spotted.
........

Modified:
    team/rmudgett/misdn_facility/   (props changed)
    team/rmudgett/misdn_facility/apps/app_dial.c
    team/rmudgett/misdn_facility/apps/app_directed_pickup.c
    team/rmudgett/misdn_facility/apps/app_queue.c
    team/rmudgett/misdn_facility/channels/chan_agent.c
    team/rmudgett/misdn_facility/channels/chan_iax2.c
    team/rmudgett/misdn_facility/channels/chan_local.c
    team/rmudgett/misdn_facility/channels/chan_misdn.c
    team/rmudgett/misdn_facility/channels/chan_sip.c
    team/rmudgett/misdn_facility/configs/voicemail.conf.sample
    team/rmudgett/misdn_facility/funcs/func_connectedline.c
    team/rmudgett/misdn_facility/funcs/func_redirecting.c
    team/rmudgett/misdn_facility/include/asterisk/channel.h
    team/rmudgett/misdn_facility/main/channel.c
    team/rmudgett/misdn_facility/main/dial.c
    team/rmudgett/misdn_facility/main/features.c

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Tue Mar 24 13:19:26 2009
@@ -1,1 +1,1 @@
-rmudgett at digium.com
+mmichelson at digium.com, rmudgett at digium.com

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
--- automerge-propname (original)
+++ automerge-propname Tue Mar 24 13:19:26 2009
@@ -1,1 +1,1 @@
-misdn-facility
+misdn_facility

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/rmudgett/misdn_facility/
            ('misdn-facility' removed)

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
    misdn_facility = /team/group/issue8824:1-183986

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 24 13:19:26 2009
@@ -1,1 +1,1 @@
-/trunk:1-183882
+/trunk:1-183920

Modified: team/rmudgett/misdn_facility/apps/app_dial.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/apps/app_dial.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/apps/app_dial.c (original)
+++ team/rmudgett/misdn_facility/apps/app_dial.c Tue Mar 24 13:19:26 2009
@@ -754,7 +754,7 @@
 
 		c->cdrflags = in->cdrflags;
 
-		ast_set_redirecting(c, apr);
+		ast_channel_set_redirecting(c, apr);
 		ast_channel_lock(c);
 		while (ast_channel_trylock(in)) {
 			CHANNEL_DEADLOCK_AVOIDANCE(c);
@@ -777,7 +777,7 @@
 		S_REPLACE(in->cid.cid_rdnis, ast_strdup(c->cid.cid_rdnis));
 		ast_channel_unlock(in);
 		ast_channel_unlock(c);
-		ast_redirecting_update(in, apr);
+		ast_channel_update_redirecting(in, apr);
 
 		ast_clear_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE);
 
@@ -838,10 +838,10 @@
 
 		if (!ast_test_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE) && !ast_test_flag64(outgoing, DIAL_NOCONNECTEDLINE)) {
 			ast_channel_lock(outgoing->chan);
-			ast_copy_caller_to_connected(&connected_caller, &outgoing->chan->cid);
+			ast_connected_line_copy_from_caller(&connected_caller, &outgoing->chan->cid);
 			ast_channel_unlock(outgoing->chan);
 			connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-			ast_connected_line_update(in, &connected_caller);
+			ast_channel_update_connected_line(in, &connected_caller);
 			ast_party_connected_line_free(&connected_caller);
 		}
 	}
@@ -892,13 +892,13 @@
 					ast_verb(3, "%s answered %s\n", c->name, in->name);
 					if (!single && !ast_test_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE)) {
 						if (o->connected.id.number) {
-							ast_connected_line_update(in, &o->connected);
+							ast_channel_update_connected_line(in, &o->connected);
 						} else if (!ast_test_flag64(o, DIAL_NOCONNECTEDLINE)) {
 							ast_channel_lock(c);
-							ast_copy_caller_to_connected(&connected_caller, &c->cid);
+							ast_connected_line_copy_from_caller(&connected_caller, &c->cid);
 							ast_channel_unlock(c);
 							connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-							ast_connected_line_update(in, &connected_caller);
+							ast_channel_update_connected_line(in, &connected_caller);
 							ast_party_connected_line_free(&connected_caller);
 						}
 					}
@@ -942,13 +942,13 @@
 						ast_verb(3, "%s answered %s\n", c->name, in->name);
 						if (!single && !ast_test_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE)) {
 							if (o->connected.id.number) {
-								ast_connected_line_update(in, &o->connected);
+								ast_channel_update_connected_line(in, &o->connected);
 							} else if (!ast_test_flag64(o, DIAL_NOCONNECTEDLINE)) {
 								ast_channel_lock(c);
-								ast_copy_caller_to_connected(&connected_caller, &c->cid);
+								ast_connected_line_copy_from_caller(&connected_caller, &c->cid);
 								ast_channel_unlock(c);
 								connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-								ast_connected_line_update(in, &connected_caller);
+								ast_channel_update_connected_line(in, &connected_caller);
 								ast_party_connected_line_free(&connected_caller);
 							}
 						}
@@ -1027,7 +1027,7 @@
 						struct ast_party_connected_line connected;
 						ast_verb(3, "%s connected line has changed. Saving it until answer for %s\n", c->name, in->name);
 						ast_party_connected_line_set_init(&connected, &o->connected);
-						ast_parse_connected_line_data(f->data.ptr, f->datalen, &connected);
+						ast_connected_line_parse_data(f->data.ptr, f->datalen, &connected);
 						ast_party_connected_line_set(&o->connected, &connected);
 						ast_party_connected_line_free(&connected);
 					} else {
@@ -1856,7 +1856,7 @@
 			ast_set_flag64(tmp, DIAL_NOCONNECTEDLINE);
 		}
 		
-		ast_copy_caller_to_connected(&tc->connected, &chan->cid);
+		ast_connected_line_copy_from_caller(&tc->connected, &chan->cid);
 
 		S_REPLACE(tc->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis));
 		ast_party_redirecting_copy(&tc->redirecting, &chan->redirecting);

Modified: team/rmudgett/misdn_facility/apps/app_directed_pickup.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/apps/app_directed_pickup.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/apps/app_directed_pickup.c (original)
+++ team/rmudgett/misdn_facility/apps/app_directed_pickup.c Tue Mar 24 13:19:26 2009
@@ -98,11 +98,11 @@
 
 	connected_caller = target->connected;
 	connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-	ast_connected_line_update(chan, &connected_caller);
+	ast_channel_update_connected_line(chan, &connected_caller);
 
 	ast_party_connected_line_collect_caller(&connected_caller, &chan->cid);
 	connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-	ast_queue_connected_line_update(chan, &connected_caller);
+	ast_channel_queue_connected_line_update(chan, &connected_caller);
 
 	if ((res = ast_answer(chan))) {
 		ast_log(LOG_WARNING, "Unable to answer '%s'\n", chan->name);

Modified: team/rmudgett/misdn_facility/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/apps/app_queue.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/apps/app_queue.c (original)
+++ team/rmudgett/misdn_facility/apps/app_queue.c Tue Mar 24 13:19:26 2009
@@ -2474,7 +2474,7 @@
 
 	tmp->chan->cid.cid_tns = qe->chan->cid.cid_tns;
 
-	ast_copy_caller_to_connected(&tmp->chan->connected, &qe->chan->cid);
+	ast_connected_line_copy_from_caller(&tmp->chan->connected, &qe->chan->cid);
 
 	/* Inherit specially named variables from parent channel */
 	ast_channel_inherit_variables(qe->chan, tmp->chan);
@@ -2833,13 +2833,13 @@
 					ast_verb(3, "%s answered %s\n", o->chan->name, in->name);
 					if (update_connectedline) {
 						if (o->connected.id.number) {
-							ast_connected_line_update(in, &o->connected);
+							ast_channel_update_connected_line(in, &o->connected);
 						} else if (o->update_connectedline) {
 							ast_channel_lock(o->chan);
-							ast_copy_caller_to_connected(&connected_caller, &o->chan->cid);
+							ast_connected_line_copy_from_caller(&connected_caller, &o->chan->cid);
 							ast_channel_unlock(o->chan);
 							connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-							ast_connected_line_update(in, &connected_caller);
+							ast_channel_update_connected_line(in, &connected_caller);
 							ast_party_connected_line_free(&connected_caller);
 						}
 					}
@@ -2892,7 +2892,7 @@
 						ast_string_field_set(o->chan, accountcode, in->accountcode);
 						o->chan->cdrflags = in->cdrflags;
 
-						ast_set_redirecting(o->chan, apr);
+						ast_channel_set_redirecting(o->chan, apr);
 
 						if (o->chan->cid.cid_rdnis)
 							ast_free(o->chan->cid.cid_rdnis);
@@ -2903,7 +2903,7 @@
 						ast_party_caller_copy(&o->chan->cid, &in->cid);
 						ast_party_connected_line_copy(&o->chan->connected, apc);
 
-						ast_redirecting_update(in, apr);
+						ast_channel_update_redirecting(in, apr);
 						if (in->cid.cid_rdnis) {
 							ast_free(in->cid.cid_rdnis);
 						}
@@ -2933,13 +2933,13 @@
 								ast_verb(3, "%s answered %s\n", o->chan->name, in->name);
 								if (update_connectedline) {
 									if (o->connected.id.number) {
-										ast_connected_line_update(in, &o->connected);
+										ast_channel_update_connected_line(in, &o->connected);
 									} else if (o->update_connectedline) {
 										ast_channel_lock(o->chan);
-										ast_copy_caller_to_connected(&connected_caller, &o->chan->cid);
+										ast_connected_line_copy_from_caller(&connected_caller, &o->chan->cid);
 										ast_channel_unlock(o->chan);
 										connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-										ast_connected_line_update(in, &connected_caller);
+										ast_channel_update_connected_line(in, &connected_caller);
 										ast_party_connected_line_free(&connected_caller);
 									}
 								}
@@ -2989,7 +2989,7 @@
 								struct ast_party_connected_line connected;
 								ast_verb(3, "%s connected line has changed. Saving it until answer for %s\n", o->chan->name, in->name);
 								ast_party_connected_line_set_init(&connected, &o->connected);
-								ast_parse_connected_line_data(f->data.ptr, f->datalen, &connected);
+								ast_connected_line_parse_data(f->data.ptr, f->datalen, &connected);
 								ast_party_connected_line_set(&o->connected, &connected);
 								ast_party_connected_line_free(&connected);
 							} else {

Modified: team/rmudgett/misdn_facility/channels/chan_agent.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/channels/chan_agent.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/channels/chan_agent.c (original)
+++ team/rmudgett/misdn_facility/channels/chan_agent.c Tue Mar 24 13:19:26 2009
@@ -758,7 +758,7 @@
 		time(&p->start);
 		/* Call on this agent */
 		ast_verb(3, "outgoing agentcall, to agent '%s', on '%s'\n", p->agent, p->chan->name);
-		ast_set_connected_line(p->chan, &ast->connected);
+		ast_channel_set_connected_line(p->chan, &ast->connected);
 		ast_channel_inherit_variables(ast, p->chan);
 		res = ast_call(p->chan, p->loginchan, 0);
 		CLEANUP(ast,p);

Modified: team/rmudgett/misdn_facility/channels/chan_iax2.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/channels/chan_iax2.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/channels/chan_iax2.c (original)
+++ team/rmudgett/misdn_facility/channels/chan_iax2.c Tue Mar 24 13:19:26 2009
@@ -9965,7 +9965,7 @@
 		ast_party_connected_line_init(&connected);
 		connected.id.number_presentation = iaxs[fr->callno]->calling_pres;
 
-		if (!ast_parse_connected_line_data(f.data.ptr, f.datalen, &connected)) {
+		if (!ast_connected_line_parse_data(f.data.ptr, f.datalen, &connected)) {
 			ast_string_field_set(iaxs[fr->callno], cid_num, connected.id.number);
 			ast_string_field_set(iaxs[fr->callno], cid_name, connected.id.name);
 			iaxs[fr->callno]->calling_pres = connected.id.number_presentation;

Modified: team/rmudgett/misdn_facility/channels/chan_local.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/channels/chan_local.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/channels/chan_local.c (original)
+++ team/rmudgett/misdn_facility/channels/chan_local.c Tue Mar 24 13:19:26 2009
@@ -428,9 +428,9 @@
 		if (the_other_channel) {
 			unsigned char frame_data[1024];
 			if (condition == AST_CONTROL_CONNECTED_LINE) {
-				f.datalen = ast_build_connected_line_data(frame_data, sizeof(frame_data), &this_channel->connected);
+				f.datalen = ast_connected_line_build_data(frame_data, sizeof(frame_data), &this_channel->connected);
 			} else {
-				f.datalen = ast_build_redirecting_data(frame_data, sizeof(frame_data), &this_channel->redirecting);
+				f.datalen = ast_redirecting_build_data(frame_data, sizeof(frame_data), &this_channel->redirecting);
 			}
 			f.subclass = condition;
 			f.data.ptr = frame_data;
@@ -577,8 +577,8 @@
 	}
 	p->chan->cid.cid_tns = p->owner->cid.cid_tns;
 
-	ast_copy_connected_to_caller(&p->chan->cid, &p->owner->connected);
-	ast_copy_caller_to_connected(&p->chan->connected, &p->owner->cid);
+	ast_connected_line_copy_to_caller(&p->chan->cid, &p->owner->connected);
+	ast_connected_line_copy_from_caller(&p->chan->connected, &p->owner->cid);
 
 	ast_string_field_set(p->chan, language, p->owner->language);
 	ast_string_field_set(p->chan, accountcode, p->owner->accountcode);

Modified: team/rmudgett/misdn_facility/channels/chan_misdn.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/channels/chan_misdn.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/channels/chan_misdn.c (original)
+++ team/rmudgett/misdn_facility/channels/chan_misdn.c Tue Mar 24 13:19:26 2009
@@ -6170,7 +6170,7 @@
 	connected.id.number_presentation = misdn_to_ast_pres(id->presentation)
 		| misdn_to_ast_screen(id->screening);
 	connected.source = source;
-	ast_queue_connected_line_update(ast, &connected);
+	ast_channel_queue_connected_line_update(ast, &connected);
 }	/* end misdn_queue_connected_line_update() */
 
 
@@ -6389,7 +6389,7 @@
 	redirecting.reason = misdn_to_ast_reason(redirect->reason);
 	redirecting.count = redirect->count;
 
-	ast_set_redirecting(ast, &redirecting);
+	ast_channel_set_redirecting(ast, &redirecting);
 }	/* end misdn_copy_redirecting_to_ast() */
 
 
@@ -8899,7 +8899,7 @@
 					bc->redirecting.to.number, sizeof(bc->redirecting.to.number));
 
 				misdn_copy_redirecting_to_ast(ch->ast, &bc->redirecting);
-				ast_queue_redirecting_update(ch->ast, &ch->ast->redirecting);
+				ast_channel_queue_redirecting_update(ch->ast, &ch->ast->redirecting);
 			} else {
 				ch->ast->redirecting.reason = misdn_to_ast_reason(bc->redirecting.reason);
 			}
@@ -10469,7 +10469,7 @@
 						break;
 					}	/* end switch */
 					misdn_copy_redirecting_to_ast(ch->ast, &bc->redirecting);
-					ast_queue_redirecting_update(ch->ast, &ch->ast->redirecting);
+					ast_channel_queue_redirecting_update(ch->ast, &ch->ast->redirecting);
 				}
 			}
 			break;

Modified: team/rmudgett/misdn_facility/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/channels/chan_sip.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/channels/chan_sip.c (original)
+++ team/rmudgett/misdn_facility/channels/chan_sip.c Tue Mar 24 13:19:26 2009
@@ -17054,7 +17054,7 @@
 				connected.id.name = (char *) p->cid_name;
 				connected.id.number_presentation = p->callingpres;
 				connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-				ast_queue_connected_line_update(p->owner, &connected);
+				ast_channel_queue_connected_line_update(p->owner, &connected);
 			}
 			ast_queue_control(p->owner, AST_CONTROL_RINGING);
 			if (p->owner->_state != AST_STATE_UP) {
@@ -17079,7 +17079,7 @@
 		if (!req->ignore && p->owner) {
 			struct ast_party_redirecting redirecting = {{0,},};
 			change_redirecting_information(p, req, &redirecting, FALSE);
-			ast_queue_redirecting_update(p->owner, &redirecting);
+			ast_channel_queue_redirecting_update(p->owner, &redirecting);
 		}
 		check_pendings(p);
 		break;
@@ -17096,7 +17096,7 @@
 				connected.id.name = (char *) p->cid_name;
 				connected.id.number_presentation = p->callingpres;
 				connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-				ast_queue_connected_line_update(p->owner, &connected);
+				ast_channel_queue_connected_line_update(p->owner, &connected);
 			}
 		}
 		if (find_sdp(req)) {
@@ -17130,7 +17130,7 @@
 			connected.id.name = (char *) p->cid_name;
 			connected.id.number_presentation = p->callingpres;
 			connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
-			ast_queue_connected_line_update(p->owner, &connected);
+			ast_channel_queue_connected_line_update(p->owner, &connected);
 		}
 
 		/* Parse contact header for continued conversation */
@@ -17156,7 +17156,7 @@
 			if (!reinvite) {
 				struct ast_party_connected_line connected;
 				ast_party_connected_line_collect_caller(&connected, &p->owner->cid);
-				ast_queue_connected_line_update(p->owner, &connected);
+				ast_channel_queue_connected_line_update(p->owner, &connected);
 				ast_queue_control(p->owner, AST_CONTROL_ANSWER);
 				if (sip_cfg.callevents)
 					manager_event(EVENT_FLAG_SYSTEM, "ChannelUpdate",
@@ -17976,7 +17976,7 @@
 					{
 					struct ast_party_redirecting redirecting = {{0,},};
 					change_redirecting_information(p, req, &redirecting, TRUE);
-					ast_set_redirecting(p->owner, &redirecting);
+					ast_channel_set_redirecting(p->owner, &redirecting);
 					}
 					/* Fall through */
 				case 486: /* Busy here */
@@ -19388,7 +19388,7 @@
 				connected.id.name = (char *) p->cid_name;
 				connected.id.number_presentation = p->callingpres;
 				connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-				ast_queue_connected_line_update(p->owner, &connected);
+				ast_channel_queue_connected_line_update(p->owner, &connected);
 			}
 			/* Handle SDP here if we already have an owner */
 			if (find_sdp(req)) {
@@ -19514,7 +19514,7 @@
 			if (c) {
 				/* Pre-lock the call */
 				ast_channel_lock(c);
-				ast_set_redirecting(c, &redirecting);
+				ast_channel_set_redirecting(c, &redirecting);
 			}
 		}
 	} else {
@@ -19530,7 +19530,7 @@
 		c = p->owner;
 		change_redirecting_information(p, req, &redirecting, FALSE); /*Will return immediately if no Diversion header is present */
 		if (c) {
-			ast_set_redirecting(c, &redirecting);
+			ast_channel_set_redirecting(c, &redirecting);
 		}
 	}
 
@@ -19909,15 +19909,15 @@
 		if (target.chan2) {
 			/* Tell each of the other channels to whom they are now connected */
 			ast_channel_lock(current->chan2);
-			ast_copy_caller_to_connected(&connected_caller, &current->chan2->cid);
+			ast_connected_line_copy_from_caller(&connected_caller, &current->chan2->cid);
 			ast_channel_unlock(current->chan2);
 			connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-			ast_connected_line_update(target.chan2, &connected_caller);
+			ast_channel_update_connected_line(target.chan2, &connected_caller);
 			ast_channel_lock(target.chan2);
-			ast_copy_caller_to_connected(&connected_caller, &target.chan2->cid);
+			ast_connected_line_copy_from_caller(&connected_caller, &target.chan2->cid);
 			ast_channel_unlock(target.chan2);
 			connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-			ast_connected_line_update(current->chan2, &connected_caller);
+			ast_channel_update_connected_line(current->chan2, &connected_caller);
 			ast_party_connected_line_free(&connected_caller);
 		} else {
 			/* Notify the first other party that they are connected to someone else assuming that target.chan1
@@ -19928,7 +19928,7 @@
 				ast_channel_unlock(target.chan1);
 				connected_caller = target.chan1->connected;
 				connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-				ast_connected_line_update(current->chan2, &connected_caller);
+				ast_channel_update_connected_line(current->chan2, &connected_caller);
 				ast_party_connected_line_free(&connected_caller);
 			}
 
@@ -19940,7 +19940,7 @@
 
 			ast_party_connected_line_collect_caller(&connected_caller, &target.chan1->cid);
 			connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-			ast_queue_connected_line_update(target.chan1, &connected_caller);
+			ast_channel_queue_connected_line_update(target.chan1, &connected_caller);
 		}
 	}
 	if (targetcall_pvt)

Modified: team/rmudgett/misdn_facility/configs/voicemail.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/configs/voicemail.conf.sample?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/configs/voicemail.conf.sample (original)
+++ team/rmudgett/misdn_facility/configs/voicemail.conf.sample Tue Mar 24 13:19:26 2009
@@ -240,8 +240,10 @@
 ; exitcontext=fromvm    ; Context to go to on user exit such as * or 0
                         ;     The default is the current context.
 ; review=yes 		; Allow sender to review/rerecord their message before saving it [OFF by default
-; operator=yes 		; Allow sender to hit 0 before/after/during  leaving a voicemail to 
-			;     reach an operator  [OFF by default]
+; operator=yes      ; Allow sender to hit 0 before/after/during leaving a voicemail to
+                    ; reach an operator.  This option REQUIRES an 'o' extension in the
+                    ; same context (or in exitcontext, if set), as that is where the
+                    ; 0 key will send you.  [OFF by default]
 ; envelope=no 		; Turn on/off envelope playback before message playback. [ON by default] 
 			;     This does NOT affect option 3,3 from the advanced options menu
 ; delete=yes		; After notification, the voicemail is deleted from the server. [per-mailbox only]

Modified: team/rmudgett/misdn_facility/funcs/func_connectedline.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/funcs/func_connectedline.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/funcs/func_connectedline.c (original)
+++ team/rmudgett/misdn_facility/funcs/func_connectedline.c Tue Mar 24 13:19:26 2009
@@ -131,7 +131,7 @@
 		option = ast_skip_blanks(option + 1);
 		switch (*option) {
 		case 'i':
-			set_it = ast_set_connected_line;
+			set_it = ast_channel_set_connected_line;
 			break;
 		
 		default:
@@ -140,7 +140,7 @@
 		}
 	}
 	else {
-		set_it = ast_connected_line_update;
+		set_it = ast_channel_update_connected_line;
 	}
 
 	ast_channel_lock(chan);

Modified: team/rmudgett/misdn_facility/funcs/func_redirecting.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/funcs/func_redirecting.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/funcs/func_redirecting.c (original)
+++ team/rmudgett/misdn_facility/funcs/func_redirecting.c Tue Mar 24 13:19:26 2009
@@ -321,7 +321,7 @@
 		option = ast_skip_blanks(option + 1);
 		switch (*option) {
 		case 'i':
-			set_it = ast_set_redirecting;
+			set_it = ast_channel_set_redirecting;
 			break;
 		
 		default:
@@ -330,7 +330,7 @@
 		}
 	}
 	else {
-		set_it = ast_redirecting_update;
+		set_it = ast_channel_update_redirecting;
 	}
 
 	ast_channel_lock(chan);

Modified: team/rmudgett/misdn_facility/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/include/asterisk/channel.h?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/include/asterisk/channel.h (original)
+++ team/rmudgett/misdn_facility/include/asterisk/channel.h Tue Mar 24 13:19:26 2009
@@ -2145,7 +2145,7 @@
  *
  * \note Assumes locks are already acquired
  */
-void ast_copy_caller_to_connected(struct ast_party_connected_line *dest, const struct ast_callerid *src);
+void ast_connected_line_copy_from_caller(struct ast_party_connected_line *dest, const struct ast_callerid *src);
 
 /*!
  * \brief Copy the connected line information to the caller information.
@@ -2157,7 +2157,7 @@
  *
  * \note Assumes locks are already acquired
  */
-void ast_copy_connected_to_caller(struct ast_callerid *dest, const struct ast_party_connected_line *src);
+void ast_connected_line_copy_to_caller(struct ast_callerid *dest, const struct ast_party_connected_line *src);
 
 /*!
  * \brief Set the connected line information in the Asterisk channel
@@ -2169,7 +2169,7 @@
  *
  * \note The channel does not need to be locked before calling this function.
  */
-void ast_set_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected);
+void ast_channel_set_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected);
 
 /*!
  * \internal
@@ -2182,7 +2182,7 @@
  * \retval -1 if error
  * \retval Amount of data buffer used
  */
-int ast_build_connected_line_data(unsigned char *data, size_t datalen, const struct ast_party_connected_line *connected);
+int ast_connected_line_build_data(unsigned char *data, size_t datalen, const struct ast_party_connected_line *connected);
 
 /*!
  * \brief Parse connected line indication frame data
@@ -2200,7 +2200,7 @@
  * \note The filled in connected line structure needs to be destroyed by
  * ast_party_connected_line_free() when it is no longer needed.
  */
-int ast_parse_connected_line_data(const unsigned char *data, size_t datalen, struct ast_party_connected_line *connected);
+int ast_connected_line_parse_data(const unsigned char *data, size_t datalen, struct ast_party_connected_line *connected);
 
 /*!
  * \brief Indicate that the connected line information has changed
@@ -2210,7 +2210,7 @@
  *
  * \return Nothing
  */
-void ast_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected);
+void ast_channel_update_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected);
 
 /*!
  * \brief Queue a connected line update frame on a channel
@@ -2220,7 +2220,7 @@
  *
  * \return Nothing
  */
-void ast_queue_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected);
+void ast_channel_queue_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected);
 
 /*!
  * \brief Set the redirecting id information in the Asterisk channel
@@ -2232,7 +2232,7 @@
  *
  * \note The channel does not need to be locked before calling this function.
  */
-void ast_set_redirecting(struct ast_channel *chan, const struct ast_party_redirecting *redirecting);
+void ast_channel_set_redirecting(struct ast_channel *chan, const struct ast_party_redirecting *redirecting);
 
 /*!
  * \brief Build the redirecting id data frame.
@@ -2244,7 +2244,7 @@
  * \retval -1 if error
  * \retval Amount of data buffer used
  */
-int ast_build_redirecting_data(unsigned char *data, size_t datalen, const struct ast_party_redirecting *redirecting);
+int ast_redirecting_build_data(unsigned char *data, size_t datalen, const struct ast_party_redirecting *redirecting);
 
 /*!
  * \brief Parse redirecting indication frame data
@@ -2261,7 +2261,7 @@
  * \note The filled in id structure needs to be destroyed by
  * ast_party_redirecting_free() when it is no longer needed.
  */
-int ast_parse_redirecting_data(const unsigned char *data, size_t datalen, struct ast_party_redirecting *redirecting);
+int ast_redirecting_parse_data(const unsigned char *data, size_t datalen, struct ast_party_redirecting *redirecting);
 
 /*!
  * \brief Indicate that the redirecting id has changed
@@ -2271,7 +2271,7 @@
  *
  * \return Nothing
  */
-void ast_redirecting_update(struct ast_channel *chan, const struct ast_party_redirecting *redirecting);
+void ast_channel_update_redirecting(struct ast_channel *chan, const struct ast_party_redirecting *redirecting);
 
 /*!
  * \brief Queue a redirecting update frame on a channel
@@ -2281,7 +2281,7 @@
  *
  * \return Nothing
  */
-void ast_queue_redirecting_update(struct ast_channel *chan, const struct ast_party_redirecting *redirecting);
+void ast_channel_queue_redirecting_update(struct ast_channel *chan, const struct ast_party_redirecting *redirecting);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

Modified: team/rmudgett/misdn_facility/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/main/channel.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/main/channel.c (original)
+++ team/rmudgett/misdn_facility/main/channel.c Tue Mar 24 13:19:26 2009
@@ -3362,9 +3362,9 @@
 			struct ast_party_connected_line connected;
 
 			ast_party_connected_line_set_init(&connected, &chan->connected);
-			res = ast_parse_connected_line_data(data, datalen, &connected);
+			res = ast_connected_line_parse_data(data, datalen, &connected);
 			if (!res) {
-				ast_set_connected_line(chan, &connected);
+				ast_channel_set_connected_line(chan, &connected);
 			}
 			ast_party_connected_line_free(&connected);
 		}
@@ -3375,9 +3375,9 @@
 			struct ast_party_redirecting redirecting;
 
 			ast_party_redirecting_set_init(&redirecting, &chan->redirecting);
-			res = ast_parse_redirecting_data(data, datalen, &redirecting);
+			res = ast_redirecting_parse_data(data, datalen, &redirecting);
 			if (!res) {
-				ast_set_redirecting(chan, &redirecting);
+				ast_channel_set_redirecting(chan, &redirecting);
 			}
 			ast_party_redirecting_free(&redirecting);
 		}
@@ -3944,7 +3944,7 @@
 	connected.id.number = (char *) cid_num;
 	connected.id.name = (char *) cid_name;
 	connected.id.number_presentation = AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED;
-	ast_set_connected_line(chan, &connected);
+	ast_channel_set_connected_line(chan, &connected);
 
 	if (ast_call(chan, data, 0)) {	/* ast_call failed... */
 		ast_log(LOG_NOTICE, "Unable to call channel %s/%s\n", type, (char *)data);
@@ -5886,7 +5886,7 @@
 	return ast_say_digit_str_full(chan, buf, ints, lang, audiofd, ctrlfd);
 }
 
-void ast_copy_caller_to_connected(struct ast_party_connected_line *dest, const struct ast_callerid *src)
+void ast_connected_line_copy_from_caller(struct ast_party_connected_line *dest, const struct ast_callerid *src)
 {
 #if 1
 	/* Must manually fill in struct ast_party_id until struct ast_callerid goes away */
@@ -5927,7 +5927,7 @@
 #endif
 }
 
-void ast_copy_connected_to_caller(struct ast_callerid *dest, const struct ast_party_connected_line *src)
+void ast_connected_line_copy_to_caller(struct ast_callerid *dest, const struct ast_party_connected_line *src)
 {
 #if 1
 	/* Must manually extract from struct ast_party_id until struct ast_callerid goes away */
@@ -5968,7 +5968,7 @@
 #endif
 }
 
-void ast_set_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected)
+void ast_channel_set_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected)
 {
 	if (&chan->connected == connected) {
 		/* Don't set to self */
@@ -5992,7 +5992,7 @@
 	AST_CONNECTED_LINE_SOURCE
 };
 
-int ast_build_connected_line_data(unsigned char *data, size_t datalen, const struct ast_party_connected_line *connected)
+int ast_connected_line_build_data(unsigned char *data, size_t datalen, const struct ast_party_connected_line *connected)
 {
 	int32_t value;
 	size_t length;
@@ -6058,7 +6058,7 @@
 	return pos;
 }
 
-int ast_parse_connected_line_data(const unsigned char *data, size_t datalen, struct ast_party_connected_line *connected)
+int ast_connected_line_parse_data(const unsigned char *data, size_t datalen, struct ast_party_connected_line *connected)
 {
 	size_t pos;
 	unsigned char ie_len;
@@ -6129,12 +6129,12 @@
 	return 0;
 }
 
-void ast_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected)
+void ast_channel_update_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected)
 {
 	unsigned char data[1024];	/* This should be large enough */
 	size_t datalen;
 
-	datalen = ast_build_connected_line_data(data, sizeof(data), connected);
+	datalen = ast_connected_line_build_data(data, sizeof(data), connected);
 	if (datalen == (size_t) -1) {
 		return;
 	}
@@ -6142,12 +6142,12 @@
 	ast_indicate_data(chan, AST_CONTROL_CONNECTED_LINE, data, datalen);
 }
 
-void ast_queue_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected)
+void ast_channel_queue_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected)
 {
 	unsigned char data[1024];	/* This should be large enough */
 	size_t datalen;
 
-	datalen = ast_build_connected_line_data(data, sizeof(data), connected);
+	datalen = ast_connected_line_build_data(data, sizeof(data), connected);
 	if (datalen == (size_t) -1) {
 		return;
 	}
@@ -6155,7 +6155,7 @@
 	ast_queue_control_data(chan, AST_CONTROL_CONNECTED_LINE, data, datalen);
 }
 
-void ast_set_redirecting(struct ast_channel *chan, const struct ast_party_redirecting *redirecting)
+void ast_channel_set_redirecting(struct ast_channel *chan, const struct ast_party_redirecting *redirecting)
 {
 	if (&chan->redirecting == redirecting) {
 		/* Don't set to self */
@@ -6201,7 +6201,7 @@
 	AST_REDIRECTING_COUNT
 };
 
-int ast_build_redirecting_data(unsigned char *data, size_t datalen, const struct ast_party_redirecting *redirecting)
+int ast_redirecting_build_data(unsigned char *data, size_t datalen, const struct ast_party_redirecting *redirecting)
 {
 	int32_t value;
 	size_t length;
@@ -6319,7 +6319,7 @@
 	return pos;
 }
 
-int ast_parse_redirecting_data(const unsigned char *data, size_t datalen, struct ast_party_redirecting *redirecting)
+int ast_redirecting_parse_data(const unsigned char *data, size_t datalen, struct ast_party_redirecting *redirecting)
 {
 	size_t pos;
 	unsigned char ie_len;
@@ -6432,12 +6432,12 @@
 	return 0;
 }
 
-void ast_redirecting_update(struct ast_channel *chan, const struct ast_party_redirecting *redirecting)
+void ast_channel_update_redirecting(struct ast_channel *chan, const struct ast_party_redirecting *redirecting)
 {
 	unsigned char data[1024];	/* This should be large enough */
 	size_t datalen;
 
-	datalen = ast_build_redirecting_data(data, sizeof(data), redirecting);
+	datalen = ast_redirecting_build_data(data, sizeof(data), redirecting);
 	if (datalen == (size_t) -1) {
 		return;
 	}
@@ -6445,12 +6445,12 @@
 	ast_indicate_data(chan, AST_CONTROL_REDIRECTING, data, datalen);
 }
 
-void ast_queue_redirecting_update(struct ast_channel *chan, const struct ast_party_redirecting *redirecting)
+void ast_channel_queue_redirecting_update(struct ast_channel *chan, const struct ast_party_redirecting *redirecting)
 {
 	unsigned char data[1024];	/* This should be large enough */
 	size_t datalen;
 
-	datalen = ast_build_redirecting_data(data, sizeof(data), redirecting);
+	datalen = ast_redirecting_build_data(data, sizeof(data), redirecting);
 	if (datalen == (size_t) -1) {
 		return;
 	}

Modified: team/rmudgett/misdn_facility/main/dial.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/main/dial.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/main/dial.c (original)
+++ team/rmudgett/misdn_facility/main/dial.c Tue Mar 24 13:19:26 2009
@@ -279,7 +279,7 @@
 
 		channel->owner->cid.cid_tns = chan->cid.cid_tns;
 
-		ast_copy_caller_to_connected(&channel->owner->connected, &chan->cid);
+		ast_connected_line_copy_from_caller(&channel->owner->connected, &chan->cid);
 
 		ast_string_field_set(channel->owner, language, chan->language);
 		ast_string_field_set(channel->owner, accountcode, chan->accountcode);

Modified: team/rmudgett/misdn_facility/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/main/features.c?view=diff&rev=183990&r1=183989&r2=183990
==============================================================================
--- team/rmudgett/misdn_facility/main/features.c (original)
+++ team/rmudgett/misdn_facility/main/features.c Tue Mar 24 13:19:26 2009
@@ -1578,12 +1578,12 @@
 		 * we use the transferer's connected line information here.
 		 */
 		connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-		ast_connected_line_update(xferchan, &connected_line);
+		ast_channel_update_connected_line(xferchan, &connected_line);
 		ast_channel_lock(xferchan);
-		ast_copy_caller_to_connected(&connected_line, &xferchan->cid);
+		ast_connected_line_copy_from_caller(&connected_line, &xferchan->cid);
 		ast_channel_unlock(xferchan);
 		connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-		ast_connected_line_update(newchan, &connected_line);
+		ast_channel_update_connected_line(newchan, &connected_line);
 		ast_party_connected_line_free(&connected_line);
 
 		if (ast_stream_and_wait(newchan, xfersound, ""))
@@ -1688,15 +1688,15 @@
 		}
 
 		ast_channel_lock(newchan);
-		ast_copy_caller_to_connected(&connected_line, &newchan->cid);
+		ast_connected_line_copy_from_caller(&connected_line, &newchan->cid);
 		ast_channel_unlock(newchan);
 		connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-		ast_connected_line_update(xferchan, &connected_line);
+		ast_channel_update_connected_line(xferchan, &connected_line);
 		ast_channel_lock(xferchan);
-		ast_copy_caller_to_connected(&connected_line, &xferchan->cid);
+		ast_connected_line_copy_from_caller(&connected_line, &xferchan->cid);
 		ast_channel_unlock(xferchan);
 		connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
-		ast_connected_line_update(newchan, &connected_line);
+		ast_channel_update_connected_line(newchan, &connected_line);
 
 		ast_party_connected_line_free(&connected_line);
 		
@@ -2240,7 +2240,7 @@
 	pbx_builtin_setvar_helper(chan, "TRANSFERERNAME", caller->name);
 		

[... 21 lines stripped ...]



More information about the asterisk-commits mailing list