diff options
| author | Terry Wilson <twilson@digium.com> | 2012-01-24 20:12:09 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-01-24 20:12:09 +0000 |
| commit | 99cae5b7508f30a308afbbacf92ad306a30f68df (patch) | |
| tree | bdca00ce837e60a5f9a16fed06d02f6e77235035 /channels/sig_pri.c | |
| parent | 2144ba5df2813609024964c4c2d9060b30d5cd43 (diff) | |
Opaquify channel stringfields
Continue channel opaque-ification by wrapping all of the stringfields.
Eventually, we will restrict what can actually set these variables, but
the purpose for now is to hide the implementation and keep people from
adding code that directly accesses the channel structure. Semantic
changes will follow afterward.
Review: https://reviewboard.asterisk.org/r/1661/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_pri.c')
| -rw-r--r-- | channels/sig_pri.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 3c0f908ac..f9e658175 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -2217,7 +2217,7 @@ static void sig_pri_mcid_event(struct sig_pri_span *pri, const struct pri_subcmd ast_queue_control(owner, AST_CONTROL_MCID); ast_str_append(&msg, 0, "Channel: %s\r\n", ast_channel_name(owner)); - ast_str_append(&msg, 0, "UniqueID: %s\r\n", owner->uniqueid); + ast_str_append(&msg, 0, "UniqueID: %s\r\n", ast_channel_uniqueid(owner)); sig_pri_event_party_id(&msg, "CallerID", &owner->connected.id); } else { @@ -4228,8 +4228,7 @@ static void sig_pri_handle_subcmds(struct sig_pri_span *pri, int chanpos, int ev ast_party_redirecting_free(&ast_redirecting); /* Request the core to forward to the new number. */ - ast_string_field_set(owner, call_forward, - subcmd->u.rerouting.deflection.to.number.str); + ast_channel_call_forward_set(owner, subcmd->u.rerouting.deflection.to.number.str); /* Wake up the channel. */ ast_queue_frame(owner, &ast_null_frame); @@ -5081,7 +5080,7 @@ static void sig_pri_ami_hold_event(struct ast_channel *chan, int is_held) "Uniqueid: %s\r\n", is_held ? "On" : "Off", ast_channel_name(chan), - chan->uniqueid); + ast_channel_uniqueid(chan)); } #endif /* defined(HAVE_PRI_CALL_HOLD) */ |