diff options
author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-27 11:18:32 +0000 |
---|---|---|
committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-27 11:18:32 +0000 |
commit | 0131a923014d65e1c7aed90fdc257fa9a6d532ca (patch) | |
tree | 3756e6fc9a54d0d423ef12a209cf813c436e706d /channels/misdn | |
parent | 4c01fe52dbc9ea588a2a145cc628f485d6476114 (diff) |
Merged revisions 46351-46353 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r46351 | crichter | 2006-10-27 11:49:20 +0200 (Fr, 27 Okt 2006) | 9 lines
Merged revisions 46176 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r46176 | crichter | 2006-10-25 10:41:59 +0200 (Mi, 25 Okt 2006) | 1 line
added nttimeout option to configure wether we disconnect calls on NT timeouts or not during an overlapdial session
........
................
r46352 | crichter | 2006-10-27 11:58:44 +0200 (Fr, 27 Okt 2006) | 1 line
fixed not compile issue, which was just introduced
................
r46353 | crichter | 2006-10-27 12:03:23 +0200 (Fr, 27 Okt 2006) | 9 lines
Merged revisions 46350 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r46350 | crichter | 2006-10-27 11:24:01 +0200 (Fr, 27 Okt 2006) | 1 line
fixed a bug which caused chan_misdn to try to allocate 2 times the same channel on high load, which then caused instability of mISDN. removed a useless function from isdn_lib.c
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46354 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
-rw-r--r-- | channels/misdn/chan_misdn_config.h | 1 | ||||
-rw-r--r-- | channels/misdn/isdn_lib.c | 57 | ||||
-rw-r--r-- | channels/misdn/isdn_lib.h | 1 | ||||
-rw-r--r-- | channels/misdn/isdn_msg_parser.c | 2 |
4 files changed, 31 insertions, 30 deletions
diff --git a/channels/misdn/chan_misdn_config.h b/channels/misdn/chan_misdn_config.h index f43f3447c..8869ead50 100644 --- a/channels/misdn/chan_misdn_config.h +++ b/channels/misdn/chan_misdn_config.h @@ -66,6 +66,7 @@ enum misdn_cfg_elements { MISDN_CFG_BNEC_ADAPT, #endif MISDN_CFG_NEED_MORE_INFOS, /* bool */ + MISDN_CFG_NTTIMEOUT, /* bool */ MISDN_CFG_JITTERBUFFER, /* int */ MISDN_CFG_JITTERBUFFER_UPPER_THRESHOLD, /* int */ MISDN_CFG_CALLGROUP, /* ast_group_t */ diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 8c94c5a2e..ce5c118ae 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -649,17 +649,12 @@ static int clean_up_bc(struct misdn_bchannel *bc) cb_log(2, stack->port, "$$$ Cleaning up bc with stid :%x pid:%d\n", bc->b_stid, bc->pid); - manager_bchannel_deactivate(bc); - - manager_ec_disable(bc); + manager_bchannel_deactivate(bc); mISDN_write_frame(stack->midev, buff, bc->layer_id|FLG_MSG_TARGET|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); - /*mISDN_clear_stack(stack->midev, bc->b_stid);*/ - - bc->b_stid = 0; bc_state_change(bc, BCHAN_CLEANED); @@ -1032,6 +1027,7 @@ int setup_bc(struct misdn_bchannel *bc) mISDN_write_frame(midev, buff, bc->layer_id, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); bc_state_change(bc,BCHAN_ERROR); + cb_event(EVENT_BCHAN_ERROR, bc, glob_mgr->user_data); return(-EINVAL); } @@ -1042,6 +1038,7 @@ int setup_bc(struct misdn_bchannel *bc) mISDN_write_frame(midev, buff, bc->layer_id, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); bc_state_change(bc,BCHAN_ERROR); + cb_event(EVENT_BCHAN_ERROR, bc, glob_mgr->user_data); return(-EINVAL); } @@ -1054,6 +1051,8 @@ int setup_bc(struct misdn_bchannel *bc) mISDN_write_frame(midev, buff, bc->layer_id, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); bc_state_change(bc,BCHAN_ERROR); + cb_event(EVENT_BCHAN_ERROR, bc, glob_mgr->user_data); + return (-EINVAL); } manager_bchannel_activate(bc); @@ -1494,7 +1493,7 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_ case EVENT_SETUP_ACKNOWLEDGE: setup_bc(bc); - + case EVENT_SETUP: { @@ -1538,22 +1537,6 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_ return 0; } -static int handle_new_process(struct misdn_stack *stack, iframe_t *frm) -{ - - struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1); - - - if (!bc) { - cb_log(0, stack->port, " --> !! lib: No free channel!\n"); - return -1; - } - - cb_log(7, stack->port, " --> new_process: New L3Id: %x\n",frm->dinfo); - bc->l3_id=frm->dinfo; - return 0; -} - static int handle_cr ( struct misdn_stack *stack, iframe_t *frm) { if (!stack) return -1; @@ -1561,9 +1544,15 @@ static int handle_cr ( struct misdn_stack *stack, iframe_t *frm) switch (frm->prim) { case CC_NEW_CR|INDICATION: cb_log(7, stack->port, " --> lib: NEW_CR Ind with l3id:%x on this port.\n",frm->dinfo); - if (handle_new_process(stack, frm) <0) { + + struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1); + if (!bc) { + cb_log(0, stack->port, " --> !! lib: No free channel!\n"); return -1; } + + cb_log(7, stack->port, " --> new_process: New L3Id: %x\n",frm->dinfo); + bc->l3_id=frm->dinfo; return 1; case CC_NEW_CR|CONFIRM: return 1; @@ -1796,12 +1785,10 @@ handle_event_nt(void *dat, void *arg) case CC_SETUP|INDICATION: { - iframe_t frm; /* fake te frm to add callref to global callreflist */ - frm.dinfo = hh->dinfo; - frm.addr=stack->upper_id; - frm.prim = CC_NEW_CR|INDICATION; - - if (handle_cr(stack, &frm)< 0) { + struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1); + if (!bc) + ERR_NO_CHANNEL: + { msg_t *dmsg; cb_log(4, stack->port, "Patch from MEIDANIS:Sending RELEASE_COMPLETE %x (No free Chan for you..)\n", hh->dinfo); dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST,MT_RELEASE_COMPLETE, hh->dinfo,sizeof(RELEASE_COMPLETE_t), 1); @@ -1809,6 +1796,16 @@ handle_event_nt(void *dat, void *arg) free_msg(msg); return 0; } + + cb_log(7, stack->port, " --> new_process: New L3Id: %x\n",hh->dinfo); + bc->l3_id=hh->dinfo; + + if (bc->channel<=0) { + bc->channel=find_free_chan_in_stack(stack,0,0); + + if (bc->channel<=0) + goto ERR_NO_CHANNEL; + } } break; diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h index 7b9c88dda..5bffadd3d 100644 --- a/channels/misdn/isdn_lib.h +++ b/channels/misdn/isdn_lib.h @@ -114,6 +114,7 @@ enum event_e { EVENT_TONE_GENERATE, EVENT_BCHAN_DATA, EVENT_BCHAN_ACTIVATED, + EVENT_BCHAN_ERROR, EVENT_CLEANUP, EVENT_PROCEEDING, EVENT_PROGRESS, diff --git a/channels/misdn/isdn_msg_parser.c b/channels/misdn/isdn_msg_parser.c index 78f759203..9943ccda3 100644 --- a/channels/misdn/isdn_msg_parser.c +++ b/channels/misdn/isdn_msg_parser.c @@ -1262,6 +1262,7 @@ char EVENT_NEW_CHANNEL_INFO[] = "NEW_CHANNEL"; char EVENT_BCHAN_DATA_INFO[] = "BCHAN_DATA"; char EVENT_BCHAN_ACTIVATED_INFO[] = "BCHAN_ACTIVATED"; char EVENT_TONE_GENERATE_INFO[] = "TONE_GENERATE"; +char EVENT_BCHAN_ERROR_INFO[] = "BCHAN_ERROR"; char * isdn_get_info(struct isdn_msg msgs[], enum event_e event, int nt) { @@ -1278,6 +1279,7 @@ char * isdn_get_info(struct isdn_msg msgs[], enum event_e event, int nt) if (event == EVENT_BCHAN_ACTIVATED) return EVENT_BCHAN_ACTIVATED_INFO; if (event == EVENT_TONE_GENERATE) return EVENT_TONE_GENERATE_INFO; if (event == EVENT_PORT_ALARM) return EVENT_PORT_ALARM_INFO; + if (event == EVENT_BCHAN_ERROR) return EVENT_BCHAN_ERROR_INFO; return NULL; } |