kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 52843 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52843 | crichter | 2007-01-30 15:38:08 +0100 (Di, 30 Jan 2007) | 1 line

fixed some possible segfaults. also fixed an very important bug which occurs on high load (when calls are very fast generated)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Christian Richter
2007-02-07 09:22:44 +00:00
parent 27475a306d
commit 1c90803367
2 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
channels/chan_misdn.c
View File

@@ -4156,6 +4156,8 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
strncat(bc->dad,bc->infos_pending, l - strlen(bc->dad));
bc->dad[l-1] = 0;
}
if (!ch->ast) break;
{
int l = sizeof(ch->ast->exten);
strncpy(ch->ast->exten, bc->dad, l);
@@ -4184,11 +4186,12 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
ch->state = MISDN_PROCEEDING;
if (!ch->ast) break;
ast_queue_control(ch->ast, AST_CONTROL_PROCEEDING);
}
break;
case EVENT_PROGRESS:
if (bc->channel)
update_name(ch->ast,bc->port,bc->channel);
@@ -4199,9 +4202,10 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
start_bc_tones(ch);
}
ast_queue_control(ch->ast, AST_CONTROL_PROGRESS);
ch->state=MISDN_PROGRESS;
if (!ch->ast) break;
ast_queue_control(ch->ast, AST_CONTROL_PROGRESS);
}
break;
@@ -4213,6 +4217,8 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
ch->state = MISDN_ALERTING;
if (!ch->ast) break;
ast_queue_control(ch->ast, AST_CONTROL_RINGING);
ast_setstate(ch->ast, AST_STATE_RINGING);
@@ -4235,7 +4241,9 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
{
/*we answer when we've got our very new L3 ID from the NT stack */
misdn_lib_send_event(bc,EVENT_CONNECT_ACKNOWLEDGE);
if (!ch->ast) break;
struct ast_channel *bridged=AST_BRIDGED_P(ch->ast);
stop_indicate(ch);
@@ -4258,8 +4266,10 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
start_bc_tones(ch);
ch->state = MISDN_CONNECTED;
if (!ch->ast) break;
ast_queue_control(ch->ast, AST_CONTROL_ANSWER);
}
break;
@@ -4267,7 +4277,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
/*we might not have an ch->ast ptr here anymore*/
if (ch) {
struct chan_list *holded_ch=find_holded(cl_te, bc);
chan_misdn_log(3,bc->port," --> org:%d nt:%d, inbandavail:%d state:%d\n", ch->orginator, bc->nt, misdn_inband_avail(bc), ch->state);
if ( ch->orginator==ORG_AST && !bc->nt && misdn_inband_avail(bc) && ch->state != MISDN_CONNECTED) {
/* If there's inband information available (e.g. a
@@ -4280,8 +4290,10 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
ch->state=MISDN_DISCONNECTED;
start_bc_tones(ch);
if (ch->ast) ch->ast->hangupcause=bc->cause;
ast_queue_control(ch->ast, AST_CONTROL_BUSY);
if (ch->ast) {
ch->ast->hangupcause=bc->cause;
ast_queue_control(ch->ast, AST_CONTROL_BUSY);
}
ch->need_busy=0;
break;
}
@@ -4398,7 +4410,8 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
frame.src = NULL;
frame.data = bc->bframe ;
ast_queue_frame(ch->ast,&frame);
if (ch->ast)
ast_queue_frame(ch->ast,&frame);
} else {
fd_set wrfs;
struct timeval tv;

37
channels/misdn/isdn_lib.c
View File

@@ -2864,23 +2864,12 @@ static msg_t *fetch_msg(int midev)
{
msg_t *msg=alloc_msg(MAX_MSG_SIZE);
int r;
/* fd_set rdfs; */
if (!msg) {
cb_log(0, 0, "fetch_msg: alloc msg failed !!");
return NULL;
}
#if 0
FD_ZERO(&rdfs);
FD_SET(midev,&rdfs);
mISDN_select(FD_SETSIZE, &rdfs, NULL, NULL, NULL);
//select(FD_SETSIZE, &rdfs, NULL, NULL, NULL);
if (FD_ISSET(midev, &rdfs)) {
#endif
AGAIN:
r=mISDN_read(midev,msg->data,MAX_MSG_SIZE, TIMEOUT_10SEC);
msg->len=r;
@@ -2902,15 +2891,11 @@ static msg_t *fetch_msg(int midev)
cb_log(0,0,"mISDN_read returned :%d error:%s (%d)\n",r,strerror(errno),errno);
}
return msg;
#if 0
} else {
printf ("Select timeout\n");
}
if (!(frm->prim == (DL_DATA|INDICATION) )|| (frm->prim == (PH_DATA|INDICATION)))
cb_log(0,0,"prim: %x dinfo:%x addr:%x msglen:%d frm->len:%d\n",frm->prim, frm->dinfo, frm->addr, msg->len,frm->len );
#endif
return NULL;
return msg;
}
void misdn_lib_isdn_l1watcher(int port)
@@ -3954,8 +3939,6 @@ char *manager_isdn_get_info(enum event_e event)
void manager_bchannel_activate(struct misdn_bchannel *bc)
{
char buf[128];
iframe_t *ifrm;
int ret;
struct misdn_stack *stack=get_stack_by_bc(bc);
@@ -3971,19 +3954,7 @@ void manager_bchannel_activate(struct misdn_bchannel *bc)
mISDN_write_frame(stack->midev, buf, bc->addr | FLG_MSG_DOWN, DL_ESTABLISH | REQUEST, 0,0, NULL, TIMEOUT_1SEC);
ret=mISDN_read(stack->midev,buf,128,TIMEOUT_10SEC);
ifrm=(iframe_t*)buf;
if (ret>0) {
if (ifrm->prim== (DL_ESTABLISH|CONFIRM)) {
cb_log(2,stack->port,"bchan: DL_ESTABLISH|CNF\n");
}
}
return ;
}
@@ -4017,8 +3988,6 @@ void manager_bchannel_deactivate(struct misdn_bchannel * bc)
char buf[128];
mISDN_write_frame(stack->midev, buf, bc->addr | FLG_MSG_DOWN, DL_RELEASE|REQUEST,0,0,NULL, TIMEOUT_1SEC);
mISDN_read(stack->midev, buf, 128, TIMEOUT_1SEC);
clear_ibuffer(bc->astbuf);
bc_state_change(bc,BCHAN_RELEASE);