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

Try to parse callerid properly on /dev/phone (bug #1788)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-06 07:01:37 +00:00
parent 7b7dbfb855
commit e325aa312f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
channels/chan_phone.c
View File

@@ -23,6 +23,7 @@
#include <asterisk/pbx.h> #include <asterisk/pbx.h>
#include <asterisk/options.h> #include <asterisk/options.h>
#include <asterisk/utils.h> #include <asterisk/utils.h>
#include <asterisk/callerid.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
@@ -156,7 +157,6 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout)
PHONE_CID cid; PHONE_CID cid;
time_t UtcTime; time_t UtcTime;
struct tm tm; struct tm tm;
char *s;
/* display caller id if present */ /* display caller id if present */
if (ast->callerid) { if (ast->callerid) {
@@ -170,14 +170,23 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout)
sprintf(cid.min, "%02d", tm.tm_min); sprintf(cid.min, "%02d", tm.tm_min);
} }
/* the format of ast->callerid is always: "name" <number> */ /* the format of ast->callerid is always: "name" <number> */
if(ast_strlen_zero(ast->callerid)){ if(!ast->callerid || ast_strlen_zero(ast->callerid)){
strcpy(cid.name,DEFAULT_CALLER_ID); strcpy(cid.name,DEFAULT_CALLER_ID);
cid.number[0]='\0'; cid.number[0]='\0';
} else { } else {
s=strncpy(cid.name,ast->callerid+1,sizeof(cid.name)); char *n, *l;
(void)strsep(&s,"\""); char callerid[256] = "";
s=strncpy(cid.number,strrchr(ast->callerid,'<')+1,sizeof(cid.number)); strncpy(callerid, ast->callerid, sizeof(callerid) - 1);
(void)strsep(&s,">"); ast_callerid_parse(ast->callerid, &n, &l);
if (l) {
ast_shrink_phone_number(l);
if (!ast_isphonenumber(l))
l = NULL;
}
if (l)
strncpy(cid.number, l, sizeof(cid.number) - 1);
if (n)
strncpy(cid.name, n, sizeof(cid.name) - 1);
} }
} }