trace_header("ACTION goto/menu (change to)", DIRECTION_NONE);
add_trace("ruleset", NULL, "%s", e_ruleset->name);
if (e_dialinginfo.id[0])
+ {
add_trace("dialing", NULL, "%s", e_dialinginfo.id);
+ }
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();
}
- end_trace();
/* do dialing with new ruleset */
e_action = NULL;
void EndpointAppPBX::action_hangup_execute(void)
{
struct route_param *rparam;
+ pid_t pid;
char *command = "", isdn_port[10];
- char *argv[7+1]; /* check also number of args below */
+ char *argv[11]; /* check also number of args below */
int i = 0;
/* get script / command */
end_trace();
return;
}
- trace_header("ACTION execute", DIRECTION_NONE);
- add_trace("command", NULL, "%s", command);
- end_trace();
-
- argv[0] = command;
- while(strchr(argv[0], '/'))
- argv[0] = strchr(argv[0], '/')+1;
+ argv[i++] = "/bin/sh";
+ argv[i++] = "-c";
+ argv[i++] = command;
+ argv[i++] = command;
if ((rparam = routeparam(e_action, PARAM_PARAM)))
{
- argv[1] = rparam->string_value;
- i++;
+ argv[i++] = rparam->string_value;
}
- argv[1+i] = e_extdialing;
- argv[2+i] = numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype);
- argv[3+i] = e_callerinfo.extension;
- argv[4+i] = e_callerinfo.name;
+ argv[i++] = e_extdialing;
+ argv[i++] = numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype);
+ argv[i++] = e_callerinfo.extension;
+ argv[i++] = e_callerinfo.name;
SPRINT(isdn_port, "%d", e_callerinfo.isdn_port);
- argv[5+i] = isdn_port;
- argv[6+i] = NULL; /* check also number of args above */
- execve("/bin/sh", argv, environ);
+ argv[i++] = isdn_port;
+ argv[i++] = NULL; /* check also number of args above */
+ switch (pid = fork ()) {
+ case -1:
+ trace_header("ACTION execute (fork failed)", DIRECTION_NONE);
+ end_trace();
+ break;
+ case 0:
+ execve("/bin/sh", argv, environ);
+ break;
+ default:
+ trace_header("ACTION execute", DIRECTION_NONE);
+ add_trace("command", NULL, "%s", command);
+ end_trace();
+ break;
+ }
}
if (e_state!=EPOINT_STATE_IN_SETUP
&& e_state!=EPOINT_STATE_IN_OVERLAP)
{
- PDEBUG(DEBUG_EPOINT, "EPOINT(%d): we are not in incomming setup/overlap state, so we ignore init/dialing process.\n", ea_endpoint->ep_serial, e_rule_nesting);
+ PDEBUG(DEBUG_EPOINT, "EPOINT(%d): we are not in incoming setup/overlap state, so we ignore init/dialing process.\n", ea_endpoint->ep_serial, e_rule_nesting);
e_match_timeout = 0;
goto end;
}
if (e_state!=EPOINT_STATE_IN_SETUP
&& e_state!=EPOINT_STATE_IN_OVERLAP)
{
- PDEBUG(DEBUG_EPOINT, "EPOINT(%d): AFTER init process: we are not in incomming setup/overlap state anymore, so we ignore further dialing process.\n", ea_endpoint->ep_serial, e_rule_nesting);
+ PDEBUG(DEBUG_EPOINT, "EPOINT(%d): AFTER init process: we are not in incoming setup/overlap state anymore, so we ignore further dialing process.\n", ea_endpoint->ep_serial, e_rule_nesting);
goto display_action;
}
}
write_log(e_ext.number, callertext, dialingtext, e_start, e_stop, 0, cause, location);
/* store last received call for reply-list */
- if (e_origin == 1) // outgoing to phone is incomming for user
+ if (e_origin == 1) // outgoing to phone is incoming for user
if (e_callerinfo.id[0] || e_callerinfo.extension[0])
if (e_ext.anon_ignore || e_callerinfo.present!=INFO_PRESENT_RESTRICTED)
{
}
/* store last made call for reply-list */
- if (e_origin == 0) // incomming from phone is outgoing for user
+ if (e_origin == 0) // incoming from phone is outgoing for user
if (e_dialinginfo.id[0])
{
if (!!strcmp(e_dialinginfo.id, e_ext.last_out[0]))