diff options
| author | Terry Wilson <twilson@digium.com> | 2012-02-29 16:52:47 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-02-29 16:52:47 +0000 |
| commit | a9d607a35764d93790172cab1f630e14fb8e043c (patch) | |
| tree | dadea55813cfc525898844c51eec824d468455cb /channels/sig_ss7.c | |
| parent | 0b988da21c1ec856b7b8bad2434bf93498d17cfd (diff) | |
Opaquify ast_channel structs and lists
Review: https://reviewboard.asterisk.org/r/1773/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_ss7.c')
| -rw-r--r-- | channels/sig_ss7.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/sig_ss7.c b/channels/sig_ss7.c index c37cf619c..1a8a12b98 100644 --- a/channels/sig_ss7.c +++ b/channels/sig_ss7.c @@ -1451,7 +1451,7 @@ int sig_ss7_call(struct sig_ss7_chan *p, struct ast_channel *ast, const char *rd } if (!p->hidecallerid) { - l = ast->connected.id.number.valid ? ast->connected.id.number.str : NULL; + l = ast_channel_connected(ast)->id.number.valid ? ast_channel_connected(ast)->id.number.str : NULL; } else { l = NULL; } @@ -1500,10 +1500,10 @@ int sig_ss7_call(struct sig_ss7_chan *p, struct ast_channel *ast, const char *rd } } isup_set_calling(p->ss7call, l ? (l + calling_nai_strip) : NULL, ss7_calling_nai, - p->use_callingpres ? cid_pres2ss7pres(ast->connected.id.number.presentation) : (l ? SS7_PRESENTATION_ALLOWED : SS7_PRESENTATION_RESTRICTED), - p->use_callingpres ? cid_pres2ss7screen(ast->connected.id.number.presentation) : SS7_SCREENING_USER_PROVIDED); + p->use_callingpres ? cid_pres2ss7pres(ast_channel_connected(ast)->id.number.presentation) : (l ? SS7_PRESENTATION_ALLOWED : SS7_PRESENTATION_RESTRICTED), + p->use_callingpres ? cid_pres2ss7screen(ast_channel_connected(ast)->id.number.presentation) : SS7_SCREENING_USER_PROVIDED); - isup_set_oli(p->ss7call, ast->connected.ani2); + isup_set_oli(p->ss7call, ast_channel_connected(ast)->ani2); isup_init_call(p->ss7->ss7, p->ss7call, p->cic, p->dpc); /* Set the charge number if it is set */ |