diff options
| author | jeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-07-24 17:24:34 +0000 |
|---|---|---|
| committer | jeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-07-24 17:24:34 +0000 |
| commit | c0f7f1412b1dc966f29d4034c52f5d50aeaec543 (patch) | |
| tree | 39de8d9199af3fb206952c267c26ea6139d99433 /channels/h323 | |
| parent | 1d5bd8dd26e6f97c247e9fd36f991396587b8d44 (diff) | |
rollback the last changes. wrong direction
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1211 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323')
| -rwxr-xr-x | channels/h323/chan_h323.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/channels/h323/chan_h323.c b/channels/h323/chan_h323.c index 8804ac51d..017a16436 100755 --- a/channels/h323/chan_h323.c +++ b/channels/h323/chan_h323.c @@ -963,11 +963,7 @@ int setup_incoming_call(call_details_t cd) strncpy(p->context, alias->context, sizeof(p->context)-1); } - 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); - + sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); } else { /* Either this call is not from the Gatekeeper @@ -976,10 +972,7 @@ int setup_incoming_call(call_details_t cd) user = find_user(cd.call_source_aliases); if (!user) { - 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); + 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 { @@ -1016,11 +1009,8 @@ int setup_incoming_call(call_details_t cd) if (strlen(user->callerid)) strncpy(p->callerid, user->callerid, sizeof(p->callerid) - 1); else - 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); - + 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 { |