ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 21:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into arnaldo.span_event_refactor

Browse Source 
Conflicts:

	libs/freetdm/src/ftdm_io.c
This commit is contained in:
Arnaldo Pereira
2010-12-22 20:08:05 -02:00
parent 248fe20dcc bc0414a8b5
commit 3e32e6ad7b
21 changed files with 288 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/freetdm/src/ftdm_io.c
+8 -2
View File
@@ -1153,20 +1153,26 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_read_event(ftdm_channel_t *ftdmchan, ftdm
ftdm_span_t *span = ftdmchan->span;
ftdm_assert_return(span->fio != NULL, FTDM_FAIL, "No I/O module attached to this span!\n");
ftdm_channel_lock(ftdmchan);
if (!span->fio->channel_next_event) {
ftdm_log(FTDM_LOG_ERROR, "channel_next_event method not implemented in module %s!", span->fio->name);
return FTDM_NOTIMPL;
status = FTDM_NOTIMPL;
goto done;
}
status = span->fio->channel_next_event(ftdmchan, event);
if (status != FTDM_SUCCESS) {
return status;
goto done;
}
status = ftdm_event_handle_oob(*event);
if (status != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_ERROR, "failed to send SIGEVENT signal to user\n");
}
done:
ftdm_channel_unlock(ftdmchan);
return status;
}