diff options
| -rw-r--r-- | channels/chan_misdn.c | 4 | ||||
| -rw-r--r-- | channels/misdn/isdn_lib.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 4631fa5e6..3eff6a351 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2273,7 +2273,7 @@ static enum ast_bridge_result misdn_bridge (struct ast_channel *c0, } /* trying to make a mISDN_dsp conference */ - chan_misdn_log(1, ch1->bc->port, "I SEND: Making conference with Number:%d\n", (ch1->bc->pid<<1) +1); + chan_misdn_log(1, ch1->bc->port, "I SEND: Making conference with Number:%d\n", ch1->bc->pid +1); misdn_lib_bridge(ch1->bc,ch2->bc); } @@ -2281,7 +2281,7 @@ static enum ast_bridge_result misdn_bridge (struct ast_channel *c0, if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name); - chan_misdn_log(1, ch1->bc->port, "* Makeing Native Bridge between %s and %s\n", ch1->bc->oad, ch2->bc->oad); + chan_misdn_log(1, ch1->bc->port, "* Making Native Bridge between %s and %s\n", ch1->bc->oad, ch2->bc->oad); while(1) { to=-1; diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index a53b573eb..4d6b0a389 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -591,17 +591,16 @@ int clean_up_bc(struct misdn_bchannel *bc) manager_ec_disable(bc); } - if (bc->bc_state == BCHAN_SETUP) - mISDN_write_frame(stack->midev, buff, bc->layer_id|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); - else - mISDN_write_frame(stack->midev, buff, bc->addr|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); + + mISDN_write_frame(stack->midev, buff, bc->layer_id|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); +#if 0 cb_log(3, stack->port, "$$$ CLEARING STACK\n"); - ret=mISDN_clear_stack(stack->midev,bc->b_stid); if (ret<0 && errno) { cb_log(-1,stack->port,"clear stack failed [%s]\n",strerror(errno)); } +#endif bc->b_stid = 0; bc_state_change(bc, BCHAN_CLEANED); |