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

formatting and callingpres support (bug #4787)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-07-25 20:04:46 +00:00
parent 6d7b939467
commit 8223580a4a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
channels/chan_features.c
View File

@@ -3,6 +3,8 @@
* *
* feature Proxy Channel * feature Proxy Channel
* *
* *** Experimental code ****
*
* Copyright (C) 1999, Mark Spencer * Copyright (C) 1999, Mark Spencer
* *
* Mark Spencer <markster@linux-support.net> * Mark Spencer <markster@linux-support.net>
@@ -121,7 +123,7 @@ static inline int indexof(struct feature_pvt *p, struct ast_channel *owner, int
ast_log(LOG_WARNING, "indexof called on NULL owner??\n"); ast_log(LOG_WARNING, "indexof called on NULL owner??\n");
return -1; return -1;
} }
for (x=0;x<3;x++) { for (x=0; x<3; x++) {
if (owner == p->subs[x].owner) if (owner == p->subs[x].owner)
return x; return x;
} }
@@ -163,7 +165,7 @@ static void update_features(struct feature_pvt *p, int index)
{ {
int x; int x;
if (p->subs[index].owner) { if (p->subs[index].owner) {
for (x=0;x<AST_MAX_FDS;x++) { for (x=0; x<AST_MAX_FDS; x++) {
if (index) if (index)
p->subs[index].owner->fds[x] = -1; p->subs[index].owner->fds[x] = -1;
else else
@@ -215,6 +217,7 @@ static int features_answer(struct ast_channel *ast)
struct feature_pvt *p = ast->tech_pvt; struct feature_pvt *p = ast->tech_pvt;
int res = -1; int res = -1;
int x; int x;
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0); x = indexof(p, ast, 0);
if (!x && p->subchan) if (!x && p->subchan)
@@ -246,6 +249,7 @@ static int features_write(struct ast_channel *ast, struct ast_frame *f)
struct feature_pvt *p = ast->tech_pvt; struct feature_pvt *p = ast->tech_pvt;
int res = -1; int res = -1;
int x; int x;
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0); x = indexof(p, ast, 0);
if (!x && p->subchan) if (!x && p->subchan)
@@ -258,10 +262,11 @@ static int features_fixup(struct ast_channel *oldchan, struct ast_channel *newch
{ {
struct feature_pvt *p = newchan->tech_pvt; struct feature_pvt *p = newchan->tech_pvt;
int x; int x;
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
if (p->owner == oldchan) if (p->owner == oldchan)
p->owner = newchan; p->owner = newchan;
for (x=0;x<3;x++) { for (x = 0; x < 3; x++) {
if (p->subs[x].owner == oldchan) if (p->subs[x].owner == oldchan)
p->subs[x].owner = newchan; p->subs[x].owner = newchan;
} }
@@ -274,6 +279,7 @@ static int features_indicate(struct ast_channel *ast, int condition)
struct feature_pvt *p = ast->tech_pvt; struct feature_pvt *p = ast->tech_pvt;
int res = -1; int res = -1;
int x; int x;
/* Queue up a frame representing the indication as a control frame */ /* Queue up a frame representing the indication as a control frame */
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0); x = indexof(p, ast, 0);
@@ -288,6 +294,7 @@ static int features_digit(struct ast_channel *ast, char digit)
struct feature_pvt *p = ast->tech_pvt; struct feature_pvt *p = ast->tech_pvt;
int res = -1; int res = -1;
int x; int x;
/* Queue up a frame representing the indication as a control frame */ /* Queue up a frame representing the indication as a control frame */
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0); x = indexof(p, ast, 0);
@@ -329,6 +336,7 @@ static int features_call(struct ast_channel *ast, char *dest, int timeout)
else else
p->subchan->cid.cid_ani = NULL; p->subchan->cid.cid_ani = NULL;
p->subchan->cid.cid_pres = p->owner->cid.cid_pres;
strncpy(p->subchan->language, p->owner->language, sizeof(p->subchan->language) - 1); strncpy(p->subchan->language, p->owner->language, sizeof(p->subchan->language) - 1);
strncpy(p->subchan->accountcode, p->owner->accountcode, sizeof(p->subchan->accountcode) - 1); strncpy(p->subchan->accountcode, p->owner->accountcode, sizeof(p->subchan->accountcode) - 1);
p->subchan->cdrflags = p->owner->cdrflags; p->subchan->cdrflags = p->owner->cdrflags;
@@ -493,6 +501,7 @@ static struct ast_channel *features_request(const char *type, int format, void *
{ {
struct feature_pvt *p; struct feature_pvt *p;
struct ast_channel *chan = NULL; struct ast_channel *chan = NULL;
p = features_alloc(data, format); p = features_alloc(data, format);
if (p && !p->subs[SUB_REAL].owner) if (p && !p->subs[SUB_REAL].owner)
chan = features_new(p, AST_STATE_DOWN, SUB_REAL); chan = features_new(p, AST_STATE_DOWN, SUB_REAL);