kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Huge callerid rework (might break H.323, others)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3874 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-10-02 00:58:31 +00:00
parent 9b926b1d64
commit 04fc29c8b2
56 changed files with 1003 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
channels/chan_modem_bestdata.c
View File

@@ -201,13 +201,14 @@ static struct ast_frame *bestdata_handle_escape(struct ast_modem_pvt *p, char es
p->gotclid = 1;
if ((!strcmp(name,"O")) || (!strcmp(name,"P"))) name[0] = 0;
if ((!strcmp(nmbr,"O")) || (!strcmp(nmbr,"P"))) nmbr[0] = 0;
if ((name[0]) && (nmbr[0])) snprintf(p->cid,sizeof(p->cid),
"\"%s\" <%s>",name,nmbr);
else if (name[0]) snprintf(p->cid,sizeof(p->cid),
"\"%s\"",name);
else if (nmbr[0]) snprintf(p->cid,sizeof(p->cid),
"%s",nmbr);
if (p->owner) p->owner->callerid = strdup(p->cid);
if (name[0])
strncpy(p->cid_name, name, sizeof(p->cid_name) - 1);
if (nmbr[0])
strncpy(p->cid_num, nmbr, sizeof(p->cid_num) - 1);
if (p->owner) {
p->owner->cid.cid_num = strdup(p->cid_num);
p->owner->cid.cid_name = strdup(p->cid_name);
}
return &p->fr;
case '@': /* response from "OK" in command mode */
if (p->owner)