Allow dualmode workaround 0x100 aka DUALFIX_DESTNUM to work also with

CALL_PROCEEDING messages for cleaning up unanswered incoming calls.
  (http://lists.suse.com/archive/suse-isdn/2003-Aug/0026.html in German)
Update for `Denmark cellphone' entry in destination database.
This commit is contained in:
Tobias Becker 2003-08-14 12:18:57 +00:00
parent f08ea1b64a
commit c7e208e046
4 changed files with 55 additions and 9 deletions

View File

@ -3,3 +3,5 @@ config.status
.depend
Makefile
policy.h
zone-??-*.cdb
zone-default-x.cdb

View File

@ -1,4 +1,4 @@
V:1.52 Int [04-May-2003 16:00:00]
V:1.53 Int [12-Aug-2003 01:00:00]
#
# This version of country.dat originates from rates4linux:
# $Id$
@ -1418,13 +1418,25 @@ C:+4574, +4573
R:DK
T:_SOEN
N:Dänemark Freephone
E:Denmark freephone
C:+4580
R:DK
T:_DKFF
N:Dänemark Mobilfunk
E:Denmark cellphone
A:Dänemark Mobile
C:+45503, +45502, +45501, +45409, +45408, +45407, +45406, +45405, +45404, +45403, +45402, +45401, +4530, +4528, +4526, +4523, +4522, +4521, +45209, +45208, +45207, +45206, +45205, +45204, +45203, +45202, +45201
C:+452
C:+4530, +4531
C:+4540
C:+4550, +4551
C:+4560, +4561
R:DK
T:_DKMF
# Source (2003-07-07)
# http://www.itst.dk/wimpdoc.asp?page=tema&objno=95024386
N:Dänemark
E:Denmark
C:+45

View File

@ -94,7 +94,7 @@ would be correct.
.B \-i\fIx\fB internS0="value"
Telefon number shorter then
.I value
are considered to be internal numbers one your PABX
are considered to be internal numbers on your PABX.
.TP
.B \-o other={yes|no}
@ -127,8 +127,8 @@ are doing. With \fIx\fR=2 you can increase the debug output - every single
digit will be displayed.
Some setups may require workarounds for reliable logging. These workarounds
are enabled by addition of the following numbers to the dual value. It is
also possible but untested to use the workarounds without dualmode.
are enabled by addition of the following numbers to the dual value. They are
intended for the dualmode but may also be useful without.
In this case, specify only the sum of the following numbers without
1 or 2 for the dual mode.
@ -139,9 +139,12 @@ Enable this when the destination number of an outgoing call
contains the number of the previous call, e.g. calling 222
after calling 111 before results in 111222 for the second call.
This may also help in situations where an unanswered incoming call
causes incorrect logging of the following outgoing call.
.TP
0x200
Enable this when outgoing call are logged without a source number (own MSN).
Enable this when outgoing calls are logged without a source number (own MSN).
.TP
0x400
@ -404,7 +407,7 @@ For changing the ISP a script is called. s. next option 'providerchange'
.B providerchange="path_top_script"
(There is no commandline option for this)
This script is called with 3 parameters, the new provider number
(fron rate-CC.dat) the number, which would be dialed, and the servicename.
(from rate-CC.dat), the number, which would be dialed, and the servicename.
The script should adjust routing, name resolution and so on to
connect to the ISP.
If the script returns non zero, LCR will not be done.

View File

@ -19,6 +19,31 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.124 2003/07/25 22:18:03 tobiasb
* isdnlog-4.65:
* - New values for isdnlog option -2x / dual=x with enable certain
* workarounds for correct logging in dualmode in case of prior
* errors. See `man isdnlog' and isdnlog/processor.c for details.
* - New isdnlog option -U2 / ignoreCOLP=2 for displaying ignored
* COLP information.
* - Improved handling of incomplete D-channel frames.
* - Increased length of number aliases shown immediately by isdnlog.
* Now 127 instead of 32 chars are possible. (Patch by Jochen Erwied.)
* - The zone number for an outgoing call as defined in the rate-file
* is written to the logfile again and used by isdnrep
* - Improved zone summary of isdnrep. Now the real zone numbers as
* defined in the rate-file are shown. The zone number is taken
* from the logfile as mentioned before or computed from the current
* rate-file. Missmatches are indicated with the chars ~,+ and *,
* isdnrep -v ... explains the meanings.
* - Fixed provider summary of isdnrep. Calls should no longer be
* treated wrongly as done via the default (preselected) provider.
* - Fixed the -pmx command line option of isdnrep, where x is the xth
* defined [MSN].
* - `make install' restarts isdnlog after installing the data files.
* - A new version number generates new binaries.
* - `make clean' removes isdnlog/isdnlog/ilp.o when called with ILP=1.
*
* Revision 1.123 2002/03/11 16:18:43 paul
* DM -> EUR; and only test for IIOCNETGPN on i386 systems
*
@ -4830,12 +4855,16 @@ static void processctrl(int card, char *s)
* Hopefully the second line does it right:
* - !call[chan].dialog && call[chan].dialin && call[chan].cause!=-1
* turned out to be to restrictive,
* - !call[chan].dialog turned out to be to generally. |TB|
* - !call[chan].dialog turned out to be to generally.
* - ... && type=SETUP_ACKNOWLEDGE is to restrictrive. In case of
* SETUP with complete called party number, the exchange responds
* with C_PROC instead of S_ACK and C_PROC contains the B-channel.
* This workaround requires the value of DUALFIX_DESTNUM in dualfix,
* which is set with -2.. or dual=.. at command line or parameter file.
* |TB| 2003-08-14
*/
if (!chanused[chan] || (dualfix & DUALFIX_DESTNUM &&
!call[chan].dialog && !call[5].dialin && type==SETUP_ACKNOWLEDGE)) {
!call[chan].dialog && !call[5].dialin)) {
/* nicht --channel, channel muss unveraendert bleiben! */
if (chanused[chan]) { /* catch second line condition */
print_msg(PRT_DEBUG_BUGS, " DEBUG> %s: %s contained channel B%d which is marked as in use -- overwriting anyway.\n", st+4, (type==SETUP_ACKNOWLEDGE)?"S_ACK":"C_PROC", call[5].channel);