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 /main/aoc.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 'main/aoc.c')
| -rw-r--r-- | main/aoc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/aoc.c b/main/aoc.c index aaf4647b9..cb3b057cb 100644 --- a/main/aoc.c +++ b/main/aoc.c @@ -1289,7 +1289,7 @@ static void aoc_request_event(const struct ast_aoc_decoded *decoded, struct ast_ { if (chan) { ast_str_append(msg, 0, "Channel: %s\r\n", ast_channel_name(chan)); - ast_str_append(msg, 0, "UniqueID: %s\r\n", chan->uniqueid); + ast_str_append(msg, 0, "UniqueID: %s\r\n", ast_channel_uniqueid(chan)); } if (decoded->request_flag) { @@ -1318,7 +1318,7 @@ static void aoc_s_event(const struct ast_aoc_decoded *decoded, struct ast_channe if (owner) { 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)); } ast_str_append(msg, 0, "NumberRates: %d\r\n", decoded->aoc_s_count); @@ -1391,7 +1391,7 @@ static void aoc_d_event(const struct ast_aoc_decoded *decoded, struct ast_channe if (chan) { ast_str_append(msg, 0, "Channel: %s\r\n", ast_channel_name(chan)); - ast_str_append(msg, 0, "UniqueID: %s\r\n", chan->uniqueid); + ast_str_append(msg, 0, "UniqueID: %s\r\n", ast_channel_uniqueid(chan)); } charge_str = aoc_charge_type_str(decoded->charge_type); @@ -1445,7 +1445,7 @@ static void aoc_e_event(const struct ast_aoc_decoded *decoded, struct ast_channe if (chan) { ast_str_append(msg, 0, "Channel: %s\r\n", ast_channel_name(chan)); - ast_str_append(msg, 0, "UniqueID: %s\r\n", chan->uniqueid); + ast_str_append(msg, 0, "UniqueID: %s\r\n", ast_channel_uniqueid(chan)); } charge_str = "ChargingAssociation"; |