summaryrefslogtreecommitdiffstats
path: root/apppbx.cpp
diff options
context:
space:
mode:
authorSuper User2008-06-15 14:29:09 +0200
committerSuper User2008-06-15 14:29:09 +0200
commit609582c9ae75f3cd53df8d3b3ff3c303ad5d3d91 (patch)
tree94b3172dc896147c36bb4f7e52f61758933e035b /apppbx.cpp
parentchan_lcr: in lcr_in_information: information.id already contains the (diff)
downloadlcr-609582c9ae75f3cd53df8d3b3ff3c303ad5d3d91.tar.gz
lcr-609582c9ae75f3cd53df8d3b3ff3c303ad5d3d91.tar.xz
lcr-609582c9ae75f3cd53df8d3b3ff3c303ad5d3d91.zip
fixed dialing bug to remote application
modified: action.cpp modified: apppbx.cpp modified: chan_lcr.c modified: mISDN.cpp
Diffstat (limited to 'apppbx.cpp')
-rw-r--r--apppbx.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/apppbx.cpp b/apppbx.cpp
index e491a57..f79cd0e 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -1705,7 +1705,8 @@ void EndpointAppPBX::port_information(struct port_list *portlist, int message_ty
}
if (e_action)
if (e_action->index==ACTION_OUTDIAL
- || e_action->index==ACTION_EXTERNAL)
+ || e_action->index==ACTION_EXTERNAL
+ || e_action->index==ACTION_REMOTE)
{
if (!e_extdialing)
set_tone(portlist, "dialing");
@@ -2886,10 +2887,16 @@ void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type,
set_tone(portlist, "dialtone");
return;
}
- if (e_ext.number[0])
- set_tone(portlist, "dialpbx");
- else
- set_tone(portlist, "dialtone");
+ if (e_dialinginfo.id[0])
+ {
+ set_tone(portlist, "dialing");
+ } else
+ {
+ if (e_ext.number[0])
+ set_tone(portlist, "dialpbx");
+ else
+ set_tone(portlist, "dialtone");
+ }
}
/* join MESSAGE_PROCEEDING */
@@ -3377,7 +3384,7 @@ void EndpointAppPBX::ea_message_join(unsigned int join_id, int message_type, uni
/* JOIN sends OVERLAP message */
case MESSAGE_OVERLAP:
- PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received 'more info available'\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+ PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received 'more info required'\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
if (e_state!=EPOINT_STATE_IN_SETUP
&& e_state!=EPOINT_STATE_IN_OVERLAP)
{