kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix callerid on quicknet stuff (bug #1613)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2985 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-16 17:54:53 +00:00
parent 1feaac6a54
commit 2dfb2d723f
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
channels/chan_phone.c
View File

@@ -22,6 +22,7 @@
#include <asterisk/module.h> #include <asterisk/module.h>
#include <asterisk/pbx.h> #include <asterisk/pbx.h>
#include <asterisk/options.h> #include <asterisk/options.h>
#include <asterisk/utils.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
@@ -35,6 +36,7 @@
#include <linux/ixjuser.h> #include <linux/ixjuser.h>
#include "DialTone.h" #include "DialTone.h"
#define DEFAULT_CALLER_ID "Unknown"
#define PHONE_MAX_BUF 480 #define PHONE_MAX_BUF 480
#define DEFAULT_GAIN 0x100 #define DEFAULT_GAIN 0x100
@@ -151,25 +153,32 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout)
{ {
struct phone_pvt *p; struct phone_pvt *p;
// CID stuff for the phonejack...
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 */
if (ast->callerid) { if (ast->callerid) {
time(&UtcTime); time(&UtcTime);
localtime_r(&UtcTime,&tm); localtime_r(&UtcTime,&tm);
if(&tm != NULL) { if(&tm != NULL) {
sprintf(cid.month, "%02d",(tm.tm_mon + 1)); sprintf(cid.month, "%02d",(tm.tm_mon + 1));
sprintf(cid.day, "%02d", tm.tm_mday); sprintf(cid.day, "%02d", tm.tm_mday);
sprintf(cid.hour, "%02d", tm.tm_hour); sprintf(cid.hour, "%02d", tm.tm_hour);
sprintf(cid.min, "%02d", tm.tm_min); sprintf(cid.min, "%02d", tm.tm_min);
}
/* the format of ast->callerid is always: "name" <number> */
if(ast_strlen_zero(ast->callerid)){
strcpy(cid.name,DEFAULT_CALLER_ID);
cid.number[0]='\0';
} else {
s=strncpy(cid.name,ast->callerid+1,sizeof(cid.name));
(void)strsep(&s,"\"");
s=strncpy(cid.number,strrchr(ast->callerid,'<')+1,sizeof(cid.number));
(void)strsep(&s,">");
} }
strcpy(cid.name, "Unknown");
sprintf(cid.number,"%s",ast->callerid);
} }
p = ast->pvt->pvt; p = ast->pvt->pvt;
@@ -274,7 +283,7 @@ static int phone_setup(struct ast_channel *ast)
if (p->lastinput != AST_FORMAT_ULAW) { if (p->lastinput != AST_FORMAT_ULAW) {
p->lastinput = AST_FORMAT_ULAW; p->lastinput = AST_FORMAT_ULAW;
if (ioctl(p->fd, PHONE_REC_CODEC, ULAW)) { if (ioctl(p->fd, PHONE_REC_CODEC, ULAW)) {
ast_log(LOG_WARNING, "Failed to set codec to signed linear 16\n"); ast_log(LOG_WARNING, "Failed to set codec to uLaw\n");
return -1; return -1;
} }
} }