summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--action.cpp4
-rw-r--r--extension.c2
-rw-r--r--interface.c10
3 files changed, 9 insertions, 7 deletions
diff --git a/action.cpp b/action.cpp
index 3e0def3..83e4965 100644
--- a/action.cpp
+++ b/action.cpp
@@ -1839,13 +1839,15 @@ void EndpointAppPBX::_action_goto_menu(int mode)
if (e_dialinginfo.id[0])
{
add_trace("dialing", NULL, "%s", e_dialinginfo.id);
- end_trace();
}
if ((rparam = routeparam(e_action, PARAM_SAMPLE)))
{
add_trace("sample", NULL, "%s", rparam->string_value);
end_trace();
set_tone(ea_endpoint->ep_portlist, rparam->string_value);
+ } else
+ {
+ end_trace();
}
/* do dialing with new ruleset */
diff --git a/extension.c b/extension.c
index 0309b33..eaaff7d 100644
--- a/extension.c
+++ b/extension.c
@@ -948,7 +948,7 @@ int write_extension(struct extension *ext, char *number)
fprintf(fp,"# Interface(s) to ring on calls to extension (as named in interface.conf)\n");
fprintf(fp,"# Seperate multiple interfaces by using komma without spaces\n");
- fprintf(fp,"# Example: Int would ring on the interface with the name \"Int\"");
+ fprintf(fp,"# Example: Int would ring on the interface with the name \"Int\"\n");
fprintf(fp,"# Int1,Int2 would ring incoming calls on both interfaces Int1 and Int2.\n");
fprintf(fp,"interfaces %s\n\n",ext->interfaces);
diff --git a/interface.c b/interface.c
index cad3c32..f7f5a3d 100644
--- a/interface.c
+++ b/interface.c
@@ -637,13 +637,13 @@ static int inter_screen(struct interface_screen **ifscreenp, struct interface *i
goto typeerror;
ifscreen->result_type = INFO_NTYPE_INTERNATIONAL;
} else
- if (!strcasecmp(el, "allowed"))
+ if (!strcasecmp(el, "present") || !strcasecmp(el, "presented") || !strcasecmp(el, "allowed") || !strcasecmp(el, "allow"))
{
if (ifscreen->result_present != -1)
goto presenterror;
ifscreen->result_present = INFO_PRESENT_ALLOWED;
} else
- if (!strcasecmp(el, "restrict") || !strcasecmp(el, "restricted"))
+ if (!strcasecmp(el, "restrict") || !strcasecmp(el, "restricted") || !strcasecmp(el, "deny") || !strcasecmp(el, "denied"))
{
if (ifscreen->result_present != -1)
goto presenterror;
@@ -1328,13 +1328,13 @@ void do_screen(int out, char *id, int idsize, int *type, int *present, struct in
}
if (ifmsn)
{
- start_trace(0, interface, numberrize_callerinfo(id, *type), NULL, DIRECTION_IN, 0, 0, "SCREEN (fount in MSN list)");
+ start_trace(0, interface, numberrize_callerinfo(id, *type), NULL, DIRECTION_IN, 0, 0, "SCREEN (found in MSN list)");
add_trace("msn", NULL, "%s", id);
end_trace();
}
if (!ifmsn && msn1) // not in list, first msn given
{
- start_trace(0, interface, numberrize_callerinfo(id, *type), NULL, DIRECTION_IN, 0, 0, "SCREEN (not fount in MSN list)");
+ start_trace(0, interface, numberrize_callerinfo(id, *type), NULL, DIRECTION_IN, 0, 0, "SCREEN (not found in MSN list)");
add_trace("msn", "given", "%s", id);
add_trace("msn", "used", "%s", msn1);
end_trace();
@@ -1367,7 +1367,7 @@ void do_screen(int out, char *id, int idsize, int *type, int *present, struct in
}
if (ifscreen) // match
{
- start_trace(0, interface, numberrize_callerinfo(id, *type), NULL, out?DIRECTION_OUT:DIRECTION_IN, 0, 0, "SCREEN (fount in screen list)");
+ start_trace(0, interface, numberrize_callerinfo(id, *type), NULL, out?DIRECTION_OUT:DIRECTION_IN, 0, 0, "SCREEN (found in screen list)");
switch(*type)
{
case INFO_NTYPE_UNKNOWN: