mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Expand the caller ANI field to an ast_party_id
Expand the ani field in ast_party_caller and ast_party_connected_line to an ast_party_id. This is an extension to the ast_callerid restructuring patch in review: https://reviewboard.asterisk.org/r/702/ Review: https://reviewboard.asterisk.org/r/744/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276393 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3774,7 +3774,7 @@ static void *skinny_newcall(void *data)
|
||||
ast_set_callerid(c,
|
||||
l->hidecallerid ? "" : l->cid_num,
|
||||
l->hidecallerid ? "" : l->cid_name,
|
||||
c->caller.ani ? NULL : l->cid_num);
|
||||
c->caller.ani.number.valid ? NULL : l->cid_num);
|
||||
#if 1 /* XXX This code is probably not necessary */
|
||||
ast_party_number_free(&c->connected.id.number);
|
||||
ast_party_number_init(&c->connected.id.number);
|
||||
@@ -4573,7 +4573,10 @@ static struct ast_channel *skinny_new(struct skinny_line *l, int state, const ch
|
||||
|
||||
/* Don't use ast_set_callerid() here because it will
|
||||
* generate a needless NewCallerID event */
|
||||
tmp->caller.ani = ast_strdup(l->cid_num);
|
||||
if (!ast_strlen_zero(l->cid_num)) {
|
||||
tmp->caller.ani.number.valid = 1;
|
||||
tmp->caller.ani.number.str = ast_strdup(l->cid_num);
|
||||
}
|
||||
|
||||
tmp->priority = 1;
|
||||
tmp->adsicpe = AST_ADSI_UNAVAILABLE;
|
||||
|
Reference in New Issue
Block a user