[Asterisk-cvs] asterisk/channels chan_features.c,1.15,1.16
russell at lists.digium.com
russell at lists.digium.com
Mon Jul 25 15:58:03 CDT 2005
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv16525/channels
Modified Files:
chan_features.c
Log Message:
formatting and callingpres support (bug #4787)
Index: chan_features.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_features.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- chan_features.c 24 Jun 2005 02:15:04 -0000 1.15
+++ chan_features.c 25 Jul 2005 20:04:46 -0000 1.16
@@ -3,6 +3,8 @@
*
* feature Proxy Channel
*
+ * *** Experimental code ****
+ *
* Copyright (C) 1999, Mark Spencer
*
* Mark Spencer <markster at linux-support.net>
@@ -121,7 +123,7 @@
ast_log(LOG_WARNING, "indexof called on NULL owner??\n");
return -1;
}
- for (x=0;x<3;x++) {
+ for (x=0; x<3; x++) {
if (owner == p->subs[x].owner)
return x;
}
@@ -163,7 +165,7 @@
{
int x;
if (p->subs[index].owner) {
- for (x=0;x<AST_MAX_FDS;x++) {
+ for (x=0; x<AST_MAX_FDS; x++) {
if (index)
p->subs[index].owner->fds[x] = -1;
else
@@ -215,6 +217,7 @@
struct feature_pvt *p = ast->tech_pvt;
int res = -1;
int x;
+
ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0);
if (!x && p->subchan)
@@ -246,6 +249,7 @@
struct feature_pvt *p = ast->tech_pvt;
int res = -1;
int x;
+
ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0);
if (!x && p->subchan)
@@ -258,10 +262,11 @@
{
struct feature_pvt *p = newchan->tech_pvt;
int x;
+
ast_mutex_lock(&p->lock);
if (p->owner == oldchan)
p->owner = newchan;
- for (x=0;x<3;x++) {
+ for (x = 0; x < 3; x++) {
if (p->subs[x].owner == oldchan)
p->subs[x].owner = newchan;
}
@@ -274,6 +279,7 @@
struct feature_pvt *p = ast->tech_pvt;
int res = -1;
int x;
+
/* Queue up a frame representing the indication as a control frame */
ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0);
@@ -288,6 +294,7 @@
struct feature_pvt *p = ast->tech_pvt;
int res = -1;
int x;
+
/* Queue up a frame representing the indication as a control frame */
ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0);
@@ -329,6 +336,7 @@
else
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->accountcode, p->owner->accountcode, sizeof(p->subchan->accountcode) - 1);
p->subchan->cdrflags = p->owner->cdrflags;
@@ -493,6 +501,7 @@
{
struct feature_pvt *p;
struct ast_channel *chan = NULL;
+
p = features_alloc(data, format);
if (p && !p->subs[SUB_REAL].owner)
chan = features_new(p, AST_STATE_DOWN, SUB_REAL);
More information about the svn-commits
mailing list