kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-09 09:17:34 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source 
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@568 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale 2008-09-26 17:09:10 +00:00
parent d79352b29c
commit 18abfac317
1 changed files with 80 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -788,7 +788,11 @@ static switch_status_t channel_receive_message_fxs(switch_core_session_t *sessio
} }
break; break;
case SWITCH_MESSAGE_INDICATE_RINGING: case SWITCH_MESSAGE_INDICATE_RINGING:
zap_set_state_locked(tech_pvt->zchan, ZAP_CHANNEL_STATE_RING); if (!(switch_channel_test_flag(channel, CF_OUTBOUND) ||
switch_channel_test_flag(channel, CF_ANSWERED) ||
switch_channel_test_flag(channel, CF_EARLY_MEDIA))) {
zap_set_state_locked(tech_pvt->zchan, ZAP_CHANNEL_STATE_RING);
}
break; break;
default: default:
break; break;
@ -1527,8 +1531,9 @@ static switch_status_t load_config(void)
if ((spans = switch_xml_child(cfg, "analog_spans"))) { if ((spans = switch_xml_child(cfg, "analog_spans"))) {
for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) { for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
char *id = (char *) switch_xml_attr_soft(myspan, "id"); char *id = (char *) switch_xml_attr(myspan, "id");
char *name = (char *) switch_xml_attr(myspan, "name"); char *name = (char *) switch_xml_attr(myspan, "name");
zap_status_t zstatus = ZAP_FAIL;
char *context = "default"; char *context = "default";
char *dialplan = "XML"; char *dialplan = "XML";
char *tonegroup = NULL; char *tonegroup = NULL;
@ -1540,7 +1545,6 @@ static switch_status_t load_config(void)
uint32_t span_id = 0, to = 0, max = 0; uint32_t span_id = 0, to = 0, max = 0;
zap_span_t *span = NULL; zap_span_t *span = NULL;
analog_option_t analog_options = ANALOG_OPTION_NONE; analog_option_t analog_options = ANALOG_OPTION_NONE;
zap_status_t zstatus = ZAP_FAIL;
for (param = switch_xml_child(myspan, "param"); param; param = param->next) { for (param = switch_xml_child(myspan, "param"); param; param = param->next) {
char *var = (char *) switch_xml_attr_soft(param, "name"); char *var = (char *) switch_xml_attr_soft(param, "name");
@ -1567,7 +1571,7 @@ static switch_status_t load_config(void)
} }
} }
if (!id) { if (!id && !name) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n");
continue; continue;
} }
@ -1640,7 +1644,9 @@ static switch_status_t load_config(void)
if ((spans = switch_xml_child(cfg, "analog_em_spans"))) { if ((spans = switch_xml_child(cfg, "analog_em_spans"))) {
for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) { for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
char *id = (char *) switch_xml_attr_soft(myspan, "id"); char *id = (char *) switch_xml_attr(myspan, "id");
char *name = (char *) switch_xml_attr(myspan, "name");
zap_status_t zstatus = ZAP_FAIL;
char *context = "default"; char *context = "default";
char *dialplan = "XML"; char *dialplan = "XML";
char *tonegroup = NULL; char *tonegroup = NULL;
@ -1678,12 +1684,11 @@ static switch_status_t load_config(void)
} }
} }
if (!id) { if (!id && !name) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n");
continue; continue;
} }
span_id = atoi(id);
if (!tonegroup) { if (!tonegroup) {
tonegroup = "us"; tonegroup = "us";
@ -1697,10 +1702,29 @@ static switch_status_t load_config(void)
max = atoi(max_digits); max = atoi(max_digits);
} }
if (zap_span_find(span_id, &span) != ZAP_SUCCESS) {
if (name) {
zstatus = zap_span_find_by_name(name, &span);
} else {
if (switch_is_number(id)) {
span_id = atoi(id);
zstatus = zap_span_find(span_id, &span);
}
if (zstatus != ZAP_SUCCESS) {
zstatus = zap_span_find_by_name(id, &span);
}
}
if (zstatus != ZAP_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "Error finding OpenZAP span %d\n", span_id); zap_log(ZAP_LOG_ERROR, "Error finding OpenZAP span %d\n", span_id);
continue; continue;
} }
if (!span_id) {
span_id = span->span_id;
}
if (zap_configure_span("analog_em", span, on_analog_signal, if (zap_configure_span("analog_em", span, on_analog_signal,
"tonemap", tonegroup, "tonemap", tonegroup,
@ -1734,7 +1758,9 @@ static switch_status_t load_config(void)
if ((spans = switch_xml_child(cfg, "pri_spans"))) { if ((spans = switch_xml_child(cfg, "pri_spans"))) {
for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) { for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
char *id = (char *) switch_xml_attr_soft(myspan, "id"); char *id = (char *) switch_xml_attr(myspan, "id");
char *name = (char *) switch_xml_attr(myspan, "name");
zap_status_t zstatus = ZAP_FAIL;
char *context = "default"; char *context = "default";
char *dialplan = "XML"; char *dialplan = "XML";
//Q921NetUser_t mode = Q931_TE; //Q921NetUser_t mode = Q931_TE;
@ -1764,23 +1790,39 @@ static switch_status_t load_config(void)
dialplan = val; dialplan = val;
} }
} }
if (!id) { if (!id && !name) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n");
continue; continue;
} }
span_id = atoi(id); if (name) {
zstatus = zap_span_find_by_name(name, &span);
} else {
if (switch_is_number(id)) {
span_id = atoi(id);
zstatus = zap_span_find(span_id, &span);
}
if (zstatus != ZAP_SUCCESS) {
zstatus = zap_span_find_by_name(id, &span);
}
}
if (zstatus != ZAP_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "Error finding OpenZAP span %d\n", span_id);
continue;
}
if (!span_id) {
span_id = span->span_id;
}
if (!tonegroup) { if (!tonegroup) {
tonegroup = "us"; tonegroup = "us";
} }
if (zap_span_find(span_id, &span) != ZAP_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "Error finding OpenZAP span %d\n", span_id);
continue;
}
if (zap_configure_span("isdn", span, on_clear_channel_signal, if (zap_configure_span("isdn", span, on_clear_channel_signal,
"mode", mode, "mode", mode,
"dialect", dialect, "dialect", dialect,
@ -1800,7 +1842,9 @@ static switch_status_t load_config(void)
if ((spans = switch_xml_child(cfg, "boost_spans"))) { if ((spans = switch_xml_child(cfg, "boost_spans"))) {
for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) { for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
char *id = (char *) switch_xml_attr_soft(myspan, "id"); char *id = (char *) switch_xml_attr(myspan, "id");
char *name = (char *) switch_xml_attr(myspan, "name");
zap_status_t zstatus = ZAP_FAIL;
char *context = "default"; char *context = "default";
char *dialplan = "XML"; char *dialplan = "XML";
uint32_t span_id = 0; uint32_t span_id = 0;
@ -1832,21 +1876,36 @@ static switch_status_t load_config(void)
} }
} }
if (!id) { if (!id && !name) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param\n");
continue; continue;
} }
span_id = atoi(id);
if (!tonegroup) { if (!tonegroup) {
tonegroup = "us"; tonegroup = "us";
} }
if (zap_span_find(span_id, &span) != ZAP_SUCCESS) { if (name) {
zstatus = zap_span_find_by_name(name, &span);
} else {
if (switch_is_number(id)) {
span_id = atoi(id);
zstatus = zap_span_find(span_id, &span);
}
if (zstatus != ZAP_SUCCESS) {
zstatus = zap_span_find_by_name(id, &span);
}
}
if (zstatus != ZAP_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "Error finding OpenZAP span %d\n", span_id); zap_log(ZAP_LOG_ERROR, "Error finding OpenZAP span %d\n", span_id);
continue; continue;
} }
if (!span_id) {
span_id = span->span_id;
}
if (zap_configure_span("ss7_boost", span, on_clear_channel_signal, if (zap_configure_span("ss7_boost", span, on_clear_channel_signal,
"local_ip", local_ip, "local_ip", local_ip,