提交 55240502 authored 作者: James Zhang's avatar James Zhang

freetdm: fixing relay must start after master.

         relay - configuring circuits only when resume is recieved.
	 master - configuring relay after all the others are configured.
上级 dcdb5f18
......@@ -810,6 +810,11 @@ void handle_sng_relay_alarm(Pst *pst, RyMngmt *sta)
break;
/**************************************************************************/
case (LRY_USTA_TCP_CONN_FAILED):
ftdm_log(FTDM_LOG_ERROR,"[RELAY] TCP connection failed \n" );
break;
/**************************************************************************/
default:
ftdm_log(FTDM_LOG_ERROR,"Unknown Relay Alram\n");
break;
......
......@@ -1166,10 +1166,24 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
/**************************************************************************/
case FTDM_CHANNEL_STATE_SUSPENDED: /* circuit has been blocked */
SS7_DEBUG_CHAN(ftdmchan,"SUSPEND: Current flags: ckt=0x%X, blk=0x%X\n",
sngss7_info->ckt_flags,
sngss7_info->blk_flags);
SS7_DEBUG_CHAN(ftdmchan,"SUSPEND: Current flags: ckt=0x%X, blk=0x%X, circuit->flag=0x%X\n",
sngss7_info->ckt_flags, sngss7_info->blk_flags,
sngss7_info->circuit->flags );
if (!(sngss7_info->circuit->flags & SNGSS7_CONFIGURED)) {
if ( !sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_PAUSED)
||(sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_RESUME))) {
if (ftmod_ss7_isup_ckt_config(sngss7_info->circuit->id)) {
SS7_CRITICAL("ISUP CKT %d configuration FAILED!\n", sngss7_info->circuit->id);
*(int*)0=0;
return 1;
} else {
SS7_INFO("ISUP CKT %d configuration DONE!\n", sngss7_info->circuit->id);
}
sngss7_info->circuit->flags |= SNGSS7_CONFIGURED;
}
}
/**********************************************************************/
if (sngss7_test_ckt_flag(sngss7_info, FLAG_INFID_RESUME)) {
......
......@@ -1943,6 +1943,7 @@ ftdm_status_t check_status_of_all_isup_intf(void)
if (ftmod_ss7_isup_intf_sta(sngss7_intf->id, &status)) {
SS7_ERROR("Failed to get status of ISUP intf %d\n", sngss7_intf->id);
sngss7_set_flag(sngss7_intf, SNGSS7_PAUSED);
continue;
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论