deal with no callerid name in all cases. really need to rethink this function
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
9f7b1269b7
commit
4aacf51f4d
|
@ -963,7 +963,11 @@ int setup_incoming_call(call_details_t cd)
|
|||
strncpy(p->context, alias->context, sizeof(p->context)-1);
|
||||
}
|
||||
|
||||
sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164);
|
||||
if (!strlen(p->cd.call_source_aliases))
|
||||
sprintf(p->callerid, "Unknown Name <%s>", p->cd.call_source_e164);
|
||||
else
|
||||
sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164);
|
||||
|
||||
|
||||
} else {
|
||||
/* Either this call is not from the Gatekeeper
|
||||
|
@ -972,7 +976,10 @@ int setup_incoming_call(call_details_t cd)
|
|||
user = find_user(cd.call_source_aliases);
|
||||
|
||||
if (!user) {
|
||||
sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164);
|
||||
if (!strlen(p->cd.call_source_aliases))
|
||||
sprintf(p->callerid, "Unknown Name <%s>", p->cd.call_source_e164);
|
||||
else
|
||||
sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164);
|
||||
if (strlen(p->cd.call_dest_e164)) {
|
||||
strncpy(p->exten, cd.call_dest_e164, sizeof(p->exten)-1);
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue