kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed call parking, added separate paramater to allow/disallow call parking on

Browse Source 
Zaptel interfaces (canpark=yes/no in zapata.conf), added urlbase paramater to
Monitor so that a url can optionally be included in CDR (user field), cleaned up a couple of minor things


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4413 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jim Dixon
2004-12-09 22:39:14 +00:00
parent 9f1a7379cc
commit 998621f76a
6 changed files with 82 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_zap.c
View File

@@ -196,6 +196,8 @@ static int threewaycalling = 0;
static int transfer = 0;
static int canpark = 0;
static int cancallforward = 0;
static float rxgain = 0.0;
@@ -521,6 +523,7 @@ static struct zt_pvt {
int callwaitingcallerid;
int threewaycalling;
int transfer;
int canpark;
int digital;
int outgoing;
int dnd;
@@ -5129,7 +5132,7 @@ static void *ss_thread(void *data)
getforward = 0;
memset(exten, 0, sizeof(exten));
len = 0;
} else if (p->transfer && !strcmp(exten, ast_parking_ext()) &&
} else if ((p->transfer || p->canpark) && !strcmp(exten, ast_parking_ext()) &&
p->subs[SUB_THREEWAY].owner &&
ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) {
/* This is a three way call, the main call being a real channel,
@@ -6596,6 +6599,7 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
tmp->confno = -1;
tmp->propconfno = -1;
}
tmp->canpark = canpark;
tmp->transfer = transfer;
strncpy(tmp->defcontext,context,sizeof(tmp->defcontext)-1);
strncpy(tmp->language, language, sizeof(tmp->language)-1);
@@ -9333,6 +9337,8 @@ static int setup_zap(int reload)
adsi = ast_true(v->value);
} else if (!strcasecmp(v->name, "transfer")) {
transfer = ast_true(v->value);
} else if (!strcasecmp(v->name, "canpark")) {
canpark = ast_true(v->value);
} else if (!strcasecmp(v->name, "echocancelwhenbridged")) {
echocanbridged = ast_true(v->value);
} else if (!strcasecmp(v->name, "busydetect")) {