summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in8
-rw-r--r--README2
-rw-r--r--action.cpp6
-rw-r--r--apppbx.cpp2
4 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index 099f47c..6bd502b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,15 +294,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ $(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/README b/README
index 91a00a5..13fd99c 100644
--- a/README
+++ b/README
@@ -542,6 +542,8 @@ Changes after Version 1.7
- Fixed compiler warnings when compiling with gcc 4.3.4.
- Fixed includes to latest mISDNuser structures.
- Fix by Peter: NULL pointer issue in asterisk frame.
+- Fixes a locking bug in chan_lcr. Thanx to WIMPy for that report.
+- Fixed forwarding of sending-complete information.
diff --git a/action.cpp b/action.cpp
index 62f63ed..1da9103 100644
--- a/action.cpp
+++ b/action.cpp
@@ -208,7 +208,7 @@ void EndpointAppPBX::action_dialing_external(void)
memcpy(&redirinfo, &e_redirinfo, sizeof(redirinfo));
memset(&dialinginfo, 0, sizeof(dialinginfo));
dialinginfo.itype = INFO_ITYPE_ISDN;
- dialinginfo.sending_complete = 0;
+// dialinginfo.sending_complete = 0;
SCPY(dialinginfo.id, e_extdialing);
/* process prefix */
@@ -223,8 +223,6 @@ void EndpointAppPBX::action_dialing_external(void)
/* process number complete */
if ((rparam = routeparam(e_action, PARAM_COMPLETE)))
- if ((rparam = routeparam(e_action, PARAM_PREFIX)))
- SCPY(dialinginfo.id, rparam->string_value);
dialinginfo.sending_complete = 1;
/* process number type */
@@ -313,6 +311,8 @@ void EndpointAppPBX::action_dialing_external(void)
/* add or update outgoing call */
trace_header("ACTION extern (calling)", DIRECTION_NONE);
add_trace("number", NULL, dialinginfo.id);
+ if (dialinginfo.sending_complete)
+ add_trace("number", "complete", "yes");
if (dialinginfo.interfaces[0])
add_trace("interfaces", NULL, dialinginfo.interfaces);
end_trace();
diff --git a/apppbx.cpp b/apppbx.cpp
index 56667c2..6836715 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -896,6 +896,7 @@ void EndpointAppPBX::out_setup(void)
release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_OUTOFORDER, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0); /* RELEASE_TYPE, join, port */
return; /* must exit here */
}
+ e_dialinginfo.sending_complete = 1;
if (e_dialinginfo.itype == INFO_ITYPE_VBOX) {
PDEBUG(DEBUG_EPOINT, "EPOINT(%d) dialing directly to VBOX\n", ea_endpoint->ep_serial);
@@ -1213,6 +1214,7 @@ void EndpointAppPBX::out_setup(void)
SCPY(dialinginfo.id, number);
dialinginfo.itype = INFO_ITYPE_ISDN;
dialinginfo.ntype = e_dialinginfo.ntype;
+ dialinginfo.sending_complete = e_dialinginfo.sending_complete;
portlist = ea_endpoint->portlist_new(port->p_serial, port->p_type, mISDNport->earlyb);
if (!portlist) {
PERROR("EPOINT(%d) cannot allocate port_list relation\n", ea_endpoint->ep_serial);