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

Fix chan_phone for pre-gcc 3.0 (bug #3214)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-01 23:58:57 +00:00
parent 7abe9e6c16
commit 559cae8751
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_phone.c
View File

@@ -181,6 +181,7 @@ 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;
int start;
time(&UtcTime); time(&UtcTime);
localtime_r(&UtcTime,&tm); localtime_r(&UtcTime,&tm);
@@ -210,7 +211,7 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout)
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]);
int start = IXJ_PHONE_RING_START(cid); start = IXJ_PHONE_RING_START(cid);
if (start == -1) if (start == -1)
return -1; return -1;
@@ -708,13 +709,13 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *context) static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *context)
{ {
struct ast_channel *tmp; struct ast_channel *tmp;
struct phone_codec_data codec;
tmp = ast_channel_alloc(1); tmp = ast_channel_alloc(1);
if (tmp) { if (tmp) {
snprintf(tmp->name, sizeof(tmp->name), "Phone/%s", i->dev + 5); snprintf(tmp->name, sizeof(tmp->name), "Phone/%s", i->dev + 5);
tmp->type = type; tmp->type = type;
tmp->fds[0] = i->fd; tmp->fds[0] = i->fd;
/* XXX Switching formats silently causes kernel panics XXX */ /* XXX Switching formats silently causes kernel panics XXX */
struct phone_codec_data codec;
if (i->mode == MODE_FXS && if (i->mode == MODE_FXS &&
ioctl(i->fd, PHONE_QUERY_CODEC, &codec) == 0) { ioctl(i->fd, PHONE_QUERY_CODEC, &codec) == 0) {
if (codec.type == LINEAR16) if (codec.type == LINEAR16)