kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

up 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@470 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale 2008-05-05 15:47:44 +00:00
parent a0ab351bcf
commit f99afcefde
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/freetdm/mod_openzap/mod_openzap.c
View File

@ -115,9 +115,9 @@ typedef struct private_object private_t;
static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_init(switch_core_session_t *session);
static switch_status_t channel_on_hangup(switch_core_session_t *session); static switch_status_t channel_on_hangup(switch_core_session_t *session);
static switch_status_t channel_on_ring(switch_core_session_t *session); static switch_status_t channel_on_routing(switch_core_session_t *session);
static switch_status_t channel_on_loopback(switch_core_session_t *session); static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
static switch_status_t channel_on_transmit(switch_core_session_t *session); static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
switch_caller_profile_t *outbound_profile, switch_caller_profile_t *outbound_profile,
switch_core_session_t **new_session, switch_core_session_t **new_session,
@ -359,8 +359,8 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
switch_set_flag_locked(tech_pvt, TFLAG_IO); switch_set_flag_locked(tech_pvt, TFLAG_IO);
/* Move Channel's State Machine to RING */ /* Move Channel's State Machine to ROUTING */
switch_channel_set_state(channel, CS_RING); switch_channel_set_state(channel, CS_ROUTING);
switch_mutex_lock(globals.mutex); switch_mutex_lock(globals.mutex);
globals.calls++; globals.calls++;
switch_mutex_unlock(globals.mutex); switch_mutex_unlock(globals.mutex);
@ -370,7 +370,7 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t channel_on_ring(switch_core_session_t *session) static switch_status_t channel_on_routing(switch_core_session_t *session)
{ {
switch_channel_t *channel = NULL; switch_channel_t *channel = NULL;
private_t *tech_pvt = NULL; private_t *tech_pvt = NULL;
@ -498,15 +498,15 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t channel_on_loopback(switch_core_session_t *session) static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
{ {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL EXCHANGE_MEDIA\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t channel_on_transmit(switch_core_session_t *session) static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
{ {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL SOFT_EXECUTE\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -823,11 +823,11 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
switch_state_handler_table_t openzap_state_handlers = { switch_state_handler_table_t openzap_state_handlers = {
/*.on_init */ channel_on_init, /*.on_init */ channel_on_init,
/*.on_ring */ channel_on_ring, /*.on_routing */ channel_on_routing,
/*.on_execute */ channel_on_execute, /*.on_execute */ channel_on_execute,
/*.on_hangup */ channel_on_hangup, /*.on_hangup */ channel_on_hangup,
/*.on_loopback */ channel_on_loopback, /*.on_exchange_media */ channel_on_exchange_media,
/*.on_transmit */ channel_on_transmit /*.on_soft_execute */ channel_on_soft_execute
}; };
switch_io_routines_t openzap_io_routines = { switch_io_routines_t openzap_io_routines = {

2
libs/freetdm/src/zap_isdn.c
View File

@ -467,7 +467,7 @@ static __inline__ void state_advance(zap_channel_t *zchan)
//is cast right here? //is cast right here?
ChanID.IntType = 1; /* PRI = 1, BRI = 0 */ ChanID.IntType = 1; /* PRI = 1, BRI = 0 */
ChanID.InfoChanSel = 1; ChanID.InfoChanSel = 1;//2 suggest 3 you tell me
ChanID.ChanMapType = 3; /* B-Chan */ ChanID.ChanMapType = 3; /* B-Chan */
ChanID.ChanSlot = (unsigned char)zchan->chan_id; ChanID.ChanSlot = (unsigned char)zchan->chan_id;
gen->ChanID = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &ChanID); gen->ChanID = Q931AppendIE((L3UCHAR *) gen, (L3UCHAR *) &ChanID);