kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

more alarms

Browse Source 
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@1051 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Moises Silva
2010-03-05 21:59:00 +00:00
parent 737597eba6
commit d32f7f67a3
2 changed files with 107 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
libs/openzap/mod_openzap/mod_openzap.c
View File

@@ -1447,6 +1447,66 @@ zap_status_t zap_channel_from_event(zap_sigmsg_t *sigmsg, switch_core_session_t
return ZAP_SUCCESS;
}
static ZIO_SIGNAL_CB_FUNCTION(on_common_signal)
{
switch_event_t *event = NULL;
switch (sigmsg->event_id) {
case ZAP_SIGEVENT_ALARM_CLEAR:
case ZAP_SIGEVENT_ALARM_TRAP:
{
if (zap_channel_get_alarms(sigmsg->channel) != ZAP_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "failed to retrieve alarms\n");
return ZAP_FAIL;
}
if (switch_event_create(&event, SWITCH_EVENT_TRAP) != SWITCH_STATUS_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "failed to create alarms events\n");
return ZAP_FAIL;
}
if (sigmsg->event_id == ZAP_SIGEVENT_ALARM_CLEAR) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "condition", "zap-alarm-clear");
} else {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "condition", "zap-alarm-trap");
}
}
break;
default:
return ZAP_SUCCESS;
break;
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_RECOVER)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "recover");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_LOOPBACK)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "loopback");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_YELLOW)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "yellow");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_RED)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "red");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_BLUE)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "blue");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_NOTOPEN)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "notopen");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_AIS)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "ais");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_RAI)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "rai");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_GENERAL)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "general");
}
switch_event_fire(&event);
return ZAP_BREAK;
}
static ZIO_SIGNAL_CB_FUNCTION(on_fxo_signal)
{
@@ -1729,6 +1789,10 @@ static ZIO_SIGNAL_CB_FUNCTION(on_r2_signal)
zap_log(ZAP_LOG_DEBUG, "Got R2 channel sig [%s] in channel %d\n", zap_signal_event2str(sigmsg->event_id), sigmsg->channel->physical_chan_id);
if (on_common_signal(sigmsg) == ZAP_BREAK) {
return ZAP_SUCCESS;
}
switch(sigmsg->event_id) {
/* on_call_disconnect from the R2 side */
case ZAP_SIGEVENT_STOP:
@@ -1824,49 +1888,6 @@ static ZIO_SIGNAL_CB_FUNCTION(on_r2_signal)
return status;
}
static ZIO_SIGNAL_CB_FUNCTION(on_common_signal)
{
switch_event_t *event = NULL;
switch (sigmsg->event_id) {
case ZAP_SIGEVENT_ALARM_CLEAR:
case ZAP_SIGEVENT_ALARM_TRAP:
{
if (zap_channel_get_alarms(sigmsg->channel) != ZAP_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "failed to retrieve alarms\n");
return ZAP_FAIL;
}
if (switch_event_create(&event, SWITCH_EVENT_TRAP) != SWITCH_STATUS_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "failed to create alarms events\n");
return ZAP_FAIL;
}
if (sigmsg->event_id == ZAP_SIGEVENT_ALARM_CLEAR) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "condition", "zap-alarm-clear");
} else {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "condition", "zap-alarm-trap");
}
}
break;
default:
return ZAP_SUCCESS;
break;
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_RED)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "red");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_YELLOW)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "yellow");
}
if (zap_test_alarm_flag(sigmsg->channel, ZAP_ALARM_BLUE)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm", "blue");
}
switch_event_fire(&event);
return ZAP_BREAK;
}
static ZIO_SIGNAL_CB_FUNCTION(on_clear_channel_signal)
{
switch_core_session_t *session = NULL;
@@ -1966,6 +1987,10 @@ static ZIO_SIGNAL_CB_FUNCTION(on_analog_signal)
{
switch_status_t status = SWITCH_STATUS_FALSE;
if (on_common_signal(sigmsg) == ZAP_BREAK) {
return ZAP_SUCCESS;
}
switch (sigmsg->channel->type) {
case ZAP_CHAN_TYPE_FXO:
case ZAP_CHAN_TYPE_EM: