fixeria
/
lcr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fixed call forwarding after no response. Instread of dialing the old extension 

again, the forwarding number is dialed after timeout.

	modified:   apppbx.cpp
	modified:   apppbx.h
	modified:   socket_server.c
This commit is contained in:
Andreas Eversberg 2010-06-14 18:32:15 +02:00
parent 69ad78e230
commit afff70dcff
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apppbx.cpp
View File

@ -829,7 +829,7 @@ foundif:
* ports will be created and a setup is sent if everything is ok. otherwhise
* the endpoint is destroyed.
*/
void EndpointAppPBX::out_setup(void)
void EndpointAppPBX::out_setup(int cfnr)
{
struct dialing_info dialinginfo;
class Port *port;
@ -938,7 +938,7 @@ void EndpointAppPBX::out_setup(void)
p = e_ext.cfnr;
if (*p) {
/* when cfnr is done, out_setup() will setup the call */
if (e_cfnr_call_timeout.active) {
if (cfnr) {
/* present to forwarded party */
if (e_ext.anon_ignore && e_callerinfo.id[0]) {
e_callerinfo.present = INFO_PRESENT_ALLOWED;
@ -1303,7 +1303,7 @@ int redial_timeout(struct lcr_timer *timer, void *instance, int index)
ea->new_state(EPOINT_STATE_OUT_SETUP);
/* call special setup routine */
ea->out_setup();
ea->out_setup(0);
return 0;
}
@ -1362,7 +1362,7 @@ int cfnr_call_timeout(struct lcr_timer *timer, void *instance, int index)
class EndpointAppPBX *ea = (class EndpointAppPBX *)instance;
PDEBUG(DEBUG_EPOINT, "EPOINT(%d) call-forward-busy time has expired, calling the forwarded number: %s.\n", ea->ea_endpoint->ep_serial, ea->e_ext.cfnr);
ea->out_setup();
ea->out_setup(1);
return 0;
}
@ -1375,7 +1375,7 @@ int callback_timeout(struct lcr_timer *timer, void *instance, int index)
/* epoint is idle, check callback */
PDEBUG(DEBUG_EPOINT, "EPOINT(%d) starting callback.\n", ea->ea_endpoint->ep_serial);
ea->new_state(EPOINT_STATE_OUT_SETUP);
ea->out_setup();
ea->out_setup(0);
}
return 0;
@ -3147,7 +3147,7 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un
new_state(EPOINT_STATE_OUT_SETUP);
/* call special setup routine */
out_setup();
out_setup(0);
}
/* join MESSAGE_mISDNSIGNAL */

2
apppbx.h
View File

@ -229,7 +229,7 @@ class EndpointAppPBX : public EndpointApp
void notify_active(void);
void keypad_function(char digit);
void set_tone(struct port_list *portlist, const char *tone);
void out_setup(void);
void out_setup(int cfnr);
struct mISDNport *hunt_port(char *ifname, int *channel);
char *apply_callerid_display(const char *id, int itype, int ntype, int present, int screen, const char *extension, const char *name);
void auth(int job, int bit_num);

2
socket_server.c
View File

@ -530,7 +530,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg)
apppbx->e_dialinginfo.sending_complete = 1;
apppbx->new_state(PORT_STATE_OUT_SETUP);
apppbx->out_setup();
apppbx->out_setup(0);
return(0);
}