if ((rparam = routeparam(e_action, PARAM_PREFIX)))
SPRINT(dialinginfo.id, "%s%s", rparam->string_value, e_extdialing);
+ /* process keypad */
+ if ((rparam = routeparam(e_action, PARAM_KEYPAD))) {
+ SCPY(dialinginfo.keypad, dialinginfo.id);
+ dialinginfo.id[0] = '\0';
+ }
+
/* process number complete */
if ((rparam = routeparam(e_action, PARAM_COMPLETE)))
if ((rparam = routeparam(e_action, PARAM_PREFIX)))
e_ruleset = NULL;
e_rule = NULL;
e_action = &action_password;
- e_match_timeout = 0;
+ unsched_timer(&e_match_timeout);
e_match_to_action = NULL;
e_dialinginfo.id[0] = '\0';
e_extdialing = strchr(e_dialinginfo.id, '\0');
/* set timeout */
- e_password_timeout = now+20;
+ schedule_timer(&e_password_timeout, 20, 0);
/* do dialing */
- process_dialing();
+ process_dialing(0);
} else {
/* make call state */
new_state(EPOINT_STATE_IN_OVERLAP);
SCPY(e_dialinginfo.id, last);
e_extdialing = e_dialinginfo.id;
e_action = NULL;
- process_dialing();
+ process_dialing(0);
return;
}
e_extdialing[0] = '\0';
/* do dialing */
SCPY(e_dialinginfo.id, e_ext.last_out[0]);
- e_powerdialing = -1; /* indicates the existence of powerdialing but no redial time given */
+ e_powerdial_on = 1; /* indicates the existence of powerdialing but no redial time given */
e_powercount = 0;
e_action = NULL;
- process_dialing();
+ process_dialing(0);
}
end_trace();
/* set time to callback */
- e_callback = now_d + delay;
+ schedule_timer(&e_callback_timeout, delay, 0);
}
SCPY(e_dialinginfo.id, phone);
e_extdialing = e_dialinginfo.id;
e_action = NULL;
- process_dialing();
+ process_dialing(0);
}
/* do dialing with new ruleset */
e_action = NULL;
- process_dialing();
+ process_dialing(0);
}
/* process dialing goto
e_extdialing = e_dialinginfo.id+strlen(numbering->prefix);
PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s selected a new menu '%s' dialing: %s\n", ea_endpoint->ep_serial, e_ext.number, numb_actions[numbering->action], e_dialinginfo.id);
nesting?:
- process_dialing();
+ process_dialing(0);
return;
}
* depending on the detected prefix, subfunctions above (action_*) will be
* calles.
*/
-void EndpointAppPBX::process_dialing(void)
+void EndpointAppPBX::process_dialing(int timeout)
{
struct port_list *portlist = ea_endpoint->ep_portlist;
struct lcr_msg *message;
struct route_param *rparam;
+ struct timeval current_time;
+
+ /* set if timeout is active, or if timeout value was given due to timeout action */
+ if (e_action_timeout.active)
+ timeout = 1;
//#warning Due to HANG-BUG somewhere here, I added some HANG-BUG-DEBUGGING output that cannot be disabled. after bug has been found, this will be removed.
//PDEBUG(~0, "HANG-BUG-DEBUGGING: entered porcess_dialing\n");
if (!portlist) {
portlist_error:
PDEBUG(DEBUG_EPOINT, "EPOINT(%d): note: dialing call requires exactly one port object to process dialing. this case could happen due to a parked call. we end dialing here.\n", ea_endpoint->ep_serial, e_ext.number);
- e_action_timeout = 0;
- e_match_timeout = 0;
+ unsched_timer(&e_action_timeout);
+ unsched_timer(&e_match_timeout);
return;
}
if (portlist->next) {
new_state(EPOINT_STATE_OUT_DISCONNECT);
message_disconnect_port(portlist, CAUSE_UNSPECIFIED, LOCATION_PRIVATE_LOCAL, "");
set_tone(portlist, "cause_3f");
- e_action_timeout = 0;
- e_match_timeout = 0;
+ unsched_timer(&e_action_timeout);
+ unsched_timer(&e_match_timeout);
goto end;
}
//PDEBUG(~0, "HANG-BUG-DEBUGGING: before action-timeout processing\n");
/* process timeout */
- if (e_action && e_action_timeout) { /* e_action may be NULL, but e_action_timeout may still be set and must be ignored */
- e_action_timeout = 0;
+ if (e_action && timeout) { /* e_action may be NULL, but e_action_timeout may still be set and must be ignored */
+ unsched_timer(&e_action_timeout);
if (e_state == EPOINT_STATE_CONNECT) {
PDEBUG(DEBUG_ROUTE|DEBUG_EPOINT, "EPOINT(%d): action timed out, but we already have connected, so we stop timer and continue.\n", ea_endpoint->ep_serial);
goto end;
if (e_state!=EPOINT_STATE_IN_SETUP
&& e_state!=EPOINT_STATE_IN_OVERLAP) {
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;
+ unsched_timer(&e_match_timeout);
goto end;
}
e_dialinginfo.id[0] = '\0';
e_action = NUMB_ACTION_MENU;
e_menu = 0;
- process_dialing();
- e_match_timeout = 0;
+ process_dialing(0);
+ unsched_timer(&e_match_timeout);
goto end;
}
/* invalid dialing */
}
new_state(EPOINT_STATE_OUT_DISCONNECT);
set_tone(portlist,"cause_1c");
- e_match_timeout = 0;
+ unsched_timer(&e_match_timeout);
goto end;
}
#endif
goto process_action;
}
- if (e_match_timeout && now_d>=e_match_timeout) {
+ gettimeofday(¤t_time, NULL);
+ if (timeout && TIME_SMALLER(&e_match_timeout.timeout, ¤t_time)) {
/* return timeout rule */
PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal '%s' dialing: '%s', timeout in ruleset '%s'\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id, e_ruleset->name);
- e_match_timeout = 0;
+ unsched_timer(&e_match_timeout);
e_action = e_match_to_action;
e_extdialing = e_match_to_extdialing;
trace_header("ROUTING (timeout)", DIRECTION_NONE);
action_timeout:
/* set timeout */
- e_action_timeout = 0;
+ unsched_timer(&e_action_timeout);
if (e_action->timeout) {
- e_action_timeout = now_d + e_action->timeout;
+ schedule_timer(&e_action_timeout, e_action->timeout, 0);
PDEBUG(DEBUG_ROUTE|DEBUG_EPOINT, "EPOINT(%d): action has a timeout of %d secods.\n", ea_endpoint->ep_serial, e_action->timeout);
}