kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_phone portability (bug #1788)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3172 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-08 01:50:57 +00:00
parent d3fd49f2cf
commit 8c2bc79b77
1 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
channels/chan_phone.c
View File

@@ -37,6 +37,23 @@
#include <linux/ixjuser.h> #include <linux/ixjuser.h>
#include "DialTone.h" #include "DialTone.h"
#ifdef QTI_PHONEJACK_TJ_PCI /* check for the newer quicknet driver v.3.1.0 which has this symbol */
#define QNDRV_VER 310
#else
#define QNDRV_VER 100
#endif
#if QNDRV_VER > 100
#ifdef __linux__
#define IXJ_PHONE_RING_START(x) ioctl(p->fd, PHONE_RING_START, &x);
#else /* FreeBSD and others */
#define IXJ_PHONE_RING_START(x) ioctl(p->fd, PHONE_RING_START, x);
#endif /* __linux__ */
#else /* older driver */
#define IXJ_PHONE_RING_START(x) ioctl(p->fd, PHONE_RING_START, &x);
#endif
#define DEFAULT_CALLER_ID "Unknown" #define DEFAULT_CALLER_ID "Unknown"
#define PHONE_MAX_BUF 480 #define PHONE_MAX_BUF 480
#define DEFAULT_GAIN 0x100 #define DEFAULT_GAIN 0x100
@@ -158,36 +175,33 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout)
time_t UtcTime; time_t UtcTime;
struct tm tm; struct tm tm;
/* display caller id if present */ time(&UtcTime);
if (ast->callerid) { localtime_r(&UtcTime,&tm);
time(&UtcTime);
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> */ /* the standard format of ast->callerid is: "name" <number>, but not always complete */
if(!ast->callerid || 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 {
char *n, *l; char *n, *l;
char callerid[256] = ""; char callerid[256] = "";
strncpy(callerid, ast->callerid, sizeof(callerid) - 1); strncpy(callerid, ast->callerid, sizeof(callerid) - 1);
ast_callerid_parse(ast->callerid, &n, &l); ast_callerid_parse(callerid, &n, &l);
if (l) { if (l) {
ast_shrink_phone_number(l); ast_shrink_phone_number(l);
if (!ast_isphonenumber(l)) if (!ast_isphonenumber(l))
l = NULL; l = NULL;
}
if (l)
strncpy(cid.number, l, sizeof(cid.number) - 1);
if (n)
strncpy(cid.name, n, sizeof(cid.name) - 1);
} }
if (l)
strncpy(cid.number, l, sizeof(cid.number));
if (n)
strncpy(cid.name, n, sizeof(cid.name));
} }
p = ast->pvt->pvt; p = ast->pvt->pvt;
@@ -196,12 +210,10 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout)
ast_log(LOG_WARNING, "phone_call called on %s, neither down nor reserved\n", ast->name); ast_log(LOG_WARNING, "phone_call called on %s, neither down nor reserved\n", ast->name);
return -1; return -1;
} }
/* When we call, it just works, really, there's no destination... Just
ring the phone and wait for someone to answer */
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Ringing %s on %s (%d)\n", dest, ast->name, ast->fds[0]); ast_log(LOG_DEBUG, "Ringing %s on %s (%d)\n", dest, ast->name, ast->fds[0]);
ioctl(p->fd, PHONE_RING_START,&cid); IXJ_PHONE_RING_START(cid);
ast_setstate(ast, AST_STATE_RINGING); ast_setstate(ast, AST_STATE_RINGING);
ast_queue_control(ast, AST_CONTROL_RINGING); ast_queue_control(ast, AST_CONTROL_RINGING);
return 0; return 0;