diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-11 08:34:03 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-11 08:34:03 +0000 |
| commit | 9f4655a71ad01fee5a47793388009e6ead61359d (patch) | |
| tree | ee3cc8aef59b14080e0ec4bb8dde77ddf49b2533 /channels/chan_misdn.c | |
| parent | 17a09c1bffb1c4c88cc95ab59ce1ac4d1abb5e94 (diff) | |
Merged revisions 44561 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44561 | crichter | 2006-10-06 14:50:25 +0200 (Fr, 06 Okt 2006) | 9 lines
Merged revisions 44334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44334 | crichter | 2006-10-04 17:13:58 +0200 (Mi, 04 Okt 2006) | 1 line
added the option 'reject_cause' to make it possible to set the RELEASE_COMPLETE - cause on the 3. incoming PMP channel, which is automatically rejected because chan_misdn does not support that kind of callwaiting. Therefore chan_misdn supports now 3 incoming channels on a PMP BRI Port. misdn_lib_get_free_bc now gets the info if the requested channel is incoming or outgoing to make the 3. channel possible
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44841 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
| -rw-r--r-- | channels/chan_misdn.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 67c88454c..c76269494 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2941,7 +2941,7 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat if ( port_up>0 ) { - newbc = misdn_lib_get_free_bc(port, robin_channel); + newbc = misdn_lib_get_free_bc(port, robin_channel,0); if (newbc) { chan_misdn_log(4, port, " Success! Found port:%d channel:%d\n", newbc->port, newbc->channel); if (port_up) @@ -2975,7 +2975,7 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat chan_misdn_log(4, port, "portup:%d\n", port_up); if ( port_up>0 ) { - newbc = misdn_lib_get_free_bc(port, 0); + newbc = misdn_lib_get_free_bc(port, 0, 0); if (newbc) break; } @@ -2986,7 +2986,7 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat } else { if (channel) chan_misdn_log(1, port," --> preselected_channel: %d\n",channel); - newbc = misdn_lib_get_free_bc(port, channel); + newbc = misdn_lib_get_free_bc(port, channel, 0); } if (!newbc) { @@ -3836,6 +3836,14 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) } + if (bc->cw) { + chan_misdn_log(0, bc->port, " --> Call Waiting on PMP sending RELEASE_COMPLETE\n"); + int cause; + misdn_cfg_get( bc->port, MISDN_CFG_REJECT_CAUSE, &cause, sizeof(cause)); + bc->out_cause=cause?cause:16; + return RESPONSE_RELEASE_SETUP; + } + print_bearer(bc); { |