Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 46350 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@46353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Christian Richter 20 years ago
parent f7a6f0efa2
commit b03054fdfc
4 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File

1
channels/chan_misdn.c
Unescape View File

@ -4265,6 +4265,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
ch->state=MISDN_CLEANING;
}
break;
case EVENT_BCHAN_ERROR:
case EVENT_CLEANUP:
{
stop_bc_tones(ch);

57
channels/misdn/isdn_lib.c
Unescape View File

@ -647,17 +647,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);
@ -1030,6 +1025,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);
}
@ -1040,6 +1036,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);
}
@ -1052,6 +1049,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);
@ -1492,7 +1491,7 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_
case EVENT_SETUP_ACKNOWLEDGE:
setup_bc(bc);
case EVENT_SETUP:
{
@ -1536,22 +1535,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;
@ -1559,9 +1542,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;
@ -1794,12 +1783,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);
@ -1807,6 +1794,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;

1
channels/misdn/isdn_lib.h
Unescape View File

@ -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,

2
channels/misdn/isdn_msg_parser.c
Unescape View File

@ -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;
}

Write Preview
Loading…
Cancel
Save