Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a12412eec8 | ||
|
|
d681c61357 | ||
|
|
26ced75a26 | ||
|
|
9757b33103 | ||
|
|
f9d5aa3c3a | ||
|
|
88551af7ef | ||
|
|
29ded17c0b | ||
|
|
bbaeec9513 | ||
|
|
48fc219865 | ||
|
|
9ecdbed001 | ||
|
|
3d91cd5e30 | ||
|
|
a30eeee9a8 | ||
|
|
07c4195876 | ||
|
|
40ae2a030a |
434
ChangeLog
Normal file
434
ChangeLog
Normal file
@@ -0,0 +1,434 @@
|
||||
2009-04-18 Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* libpri 1.4.10 released.
|
||||
|
||||
2009-04-02 19:33 +0000 [r726] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* pri_facility.c: Comment changes and some string content
|
||||
corrections.
|
||||
|
||||
2009-03-26 16:01 +0000 [r715] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* libpri.h: Comment changes to note what ISDN message type causes
|
||||
the event.
|
||||
|
||||
2009-03-19 01:39 +0000 [r711] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* pri_facility.c: Added pSS1InfoElement comments in
|
||||
qsig_cf_callrerouting().
|
||||
|
||||
2009-03-13 01:05 +0000 [r705] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* build_tools/make_version: Use the correct branch integrated
|
||||
property when generating the version string. Update the
|
||||
make_version file to the latest Asterisk version with the
|
||||
appropriate libpri required chage.
|
||||
|
||||
2009-03-04 20:31 +0000 [r701] Joshua Colp <jcolp@digium.com>
|
||||
|
||||
* q931.c: Make sure we only have 4 octects on unrestricted 64k data
|
||||
calls. (closes issue #14507) Reported by: jsmith Patches:
|
||||
64k-data.patch uploaded by jsmith (license 15) Tested by: jsmith
|
||||
(closes issue #13118) Reported by: radpeter
|
||||
|
||||
2009-02-02 20:18 +0000 [r687] Leif Madsen <lmadsen@digium.com>
|
||||
|
||||
* libpri.h: Fix a small spelling error. (closes issue #14375)
|
||||
Reported by: jeremy1
|
||||
|
||||
2009-01-27 23:22 +0000 [r680] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c: A couple of last BRI fixes in libpri... don't discard
|
||||
pending iframes when we call the q921_dchannel_up routine, since
|
||||
we need to be able to send the ones that were queued up while the
|
||||
D-channel went down and is being reactivated. Also fix some buggy
|
||||
logic in the frame transmission decision code.
|
||||
|
||||
2009-01-22 21:48 +0000 [r675] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c: Change behavior so that we do not send I-frames when link
|
||||
is down, but instead queue them up until the link comes up and
|
||||
send them out then.
|
||||
|
||||
2009-01-09 Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* libpri 1.4.9 released.
|
||||
|
||||
2009-01-09 17:58 +0000 [r656] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c: Add additional case where T200 expires greater than N200
|
||||
times and we need to release and reacquire the TEI.
|
||||
|
||||
2008-12-23 21:38 +0000 [r653] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c, q931.c: Add some additional debug for Q.921 MDL messages
|
||||
as well as fix a bug in RESTART messages on BRI
|
||||
|
||||
2008-11-22 Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* libpri 1.4.8 released.
|
||||
|
||||
2008-11-22 00:34 +0000 [r645] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c: Fix a number of Q.921 bugs, found doing TBR4 compliance
|
||||
testing, thanks to Tzafrir, Xorcom, and co. (#12861). Thanks!
|
||||
|
||||
2008-10-17 16:13 +0000 [r636] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* pri.c, pri_internal.h, pri_q931.h, q931.c, pri_facility.c,
|
||||
pri_facility.h, libpri.h: Merging in additional Q.SIG features in
|
||||
#13454. Includes Q.SIG physical/logical channel mapping support,
|
||||
extended coding of Q.SIG name operations (calling name), and call
|
||||
rerouting support via added dialplan application.
|
||||
|
||||
2008-08-06 18:20 +0000 [r616] Jason Parker <jparker@digium.com>
|
||||
|
||||
* Makefile: Make install paths use libdir, like libss7
|
||||
|
||||
2008-08-05 Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* libpri 1.4.7 released.
|
||||
|
||||
2008-08-05 22:18 +0000 [r611] Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* pritest.c, pri.c, pri_internal.h, q921.c, q931.c, copy_string.c,
|
||||
prisched.c, pri_q921.h, pri_q931.h, pri_facility.c, /,
|
||||
compiler.h, pridump.c, testprilib.c, pri_timers.h,
|
||||
pri_facility.h, libpri.h: Merged revisions 610 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r610
|
||||
| kpfleming | 2008-08-05 17:16:58 -0500 (Tue, 05 Aug 2008) | 2
|
||||
lines clean up license headers, and explicitly grant additional
|
||||
permissions when used with Asterisk ........
|
||||
|
||||
2008-07-30 15:43 +0000 [r606-607] Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* /: update ignore list
|
||||
|
||||
* Makefile, mkdep (removed): use better version.c creation process,
|
||||
and better dependency tracking process too
|
||||
|
||||
2008-07-29 22:47 +0000 [r598-602] Jason Parker <jparker@digium.com>
|
||||
|
||||
* build_tools/make_version: I believe this is what was meant. (it
|
||||
matches how Asterisk does it)
|
||||
|
||||
* build_tools/make_version: libpri is not libss7 :D
|
||||
|
||||
2008-07-22 22:36 +0000 [r594] Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* pri_internal.h, libpri.h: correct comments to match code
|
||||
|
||||
2008-07-22 Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* Libpri 1.4.6 released.
|
||||
|
||||
2008-07-22 19:43 +0000 [r589] Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* pri.c, pri_internal.h, q931.c, libpri.h: rename API call and
|
||||
option (nothing has been released to use it yet so this should be
|
||||
safe) to be more accurate in describing what it does (closes
|
||||
issue #13042)
|
||||
|
||||
2008-07-11 Jason Parker <jparker@digium.com>
|
||||
|
||||
* Libpri 1.4.5 released.
|
||||
|
||||
2008-07-11 16:44 +0000 [r574-579] Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* /: ignore generated files
|
||||
|
||||
* pri.c, pri_internal.h, q931.c, libpri.h: modify work done for
|
||||
issue #10552, making the support of inband audio after RELEASE a
|
||||
configurable option, since it is causing problems for a number of
|
||||
users (closes issue #13042)
|
||||
|
||||
2008-06-04 17:02 +0000 [r562] Dwayne M. Hubbard <dhubbard@digium.com>
|
||||
|
||||
* q931.c: While working on issue 3450 I noticed that the
|
||||
information channel selection field in the channel identification
|
||||
IE was displayed incorrectly when using 'pri intense debug'. I
|
||||
wanted another pair of eyes to look at the code because
|
||||
everything looked correct until Shaun Ruffell noticed the missing
|
||||
comma in the msg_chan_sel array.
|
||||
|
||||
2008-05-07 19:51 +0000 [r557] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* pri.c, pritest.c, pri_internal.h, pri_q921.h, Makefile, q921.c,
|
||||
q931.c, pri_facility.c, prisched.c, testprilib.c, pri_timers.h,
|
||||
pri_facility.h, libpri.h: Moving trunk changes back into 1.4
|
||||
|
||||
2008-05-07 Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* Libpri 1.4.4 released.
|
||||
|
||||
2008-05-06 16:43 +0000 [r553-555] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c, pri.c: Remove some unnecessary debug messages
|
||||
|
||||
* q931.c: We passed TBR3 layer 2 and layer 3 testing with this
|
||||
commit in for BRI-TE PTMP.
|
||||
|
||||
* q931.c: Final patch to pass certification
|
||||
|
||||
2008-04-22 15:30 +0000 [r546] Russell Bryant <russell@digium.com>
|
||||
|
||||
* Makefile: All versions of libpri have been installed as
|
||||
libpri.so.1.0, even though the API and ABI have changed over
|
||||
time. This patch changes the Makefile to install the library as
|
||||
libpri.so.1.4 to indicate that this is not compatible with
|
||||
previous versions. In the future, this should be changed as we
|
||||
make ABI changes. (closes issue #10376) Reported by: tzafrir
|
||||
Patches: libpri-soname.diff uploaded by tzafrir (license 46) --
|
||||
with very minor changes by me
|
||||
|
||||
2008-03-15 19:57 +0000 [r541-543] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* libpri.h, pri.c: Remove some useless event items
|
||||
|
||||
* q921.c, pri_internal.h: Make sure if we're a bri and in PTMP mode
|
||||
that we release the TEI and try to get a new one with the other
|
||||
end when we lose activity in multiframe mode
|
||||
|
||||
* q921.c, pri.c, pri_q921.h: When we recieve a UA in any TEI
|
||||
established state other than awaiting establishement make sure we
|
||||
drop the TEI and get a new one. For passing tests PC37.2 - PC41.2
|
||||
in Q.921
|
||||
|
||||
2008-03-06 23:43 +0000 [r538-539] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c: Make sure we are sending as command not as response
|
||||
|
||||
* q921.c: Make sure C/R bit is correct
|
||||
|
||||
2008-03-01 23:30 +0000 [r531-535] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c: Remove some (currently) useless code
|
||||
|
||||
* q921.c, pri.c, pri_internal.h: Some more updates to add code for
|
||||
passing PC 27.1 in Q.921
|
||||
|
||||
* q921.c, pri.c: Various coding style cleanups as well as a bug fix
|
||||
for TEI removal
|
||||
|
||||
* q921.c, q931.c, pri.c, pri_internal.h: Initial checkin of code to
|
||||
pass Q.921 PC25 and PC26
|
||||
|
||||
* q921.c: Add support for responding to TEI requests (Q.921 PC23.x)
|
||||
|
||||
2008-02-18 20:31 +0000 [r525] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c, libpri.h: Improve transmission, receiving, and dumping of
|
||||
bearer capability IE (#11593)
|
||||
|
||||
2008-01-16 18:06 +0000 [r518] Jason Parker <jparker@digium.com>
|
||||
|
||||
* Makefile, /: Add logging for 'make update' command (also fixes
|
||||
updates in some places). Issue #11766, initial patch by jmls.
|
||||
|
||||
2007-12-26 17:35 +0000 [r505] Russell Bryant <russell@digium.com>
|
||||
|
||||
* libpri.h: Remove unnecessary usage of the extern keyword.
|
||||
|
||||
2007-12-06 22:16 +0000 [r494-496] Russell Bryant <russell@digium.com>
|
||||
|
||||
* q921.c, q931.c, pri_facility.c, pri.c: Change malloc+memset to
|
||||
calloc. Also, handle allocation failures early to reduce
|
||||
indentation. (closes issue #11469) Reported by: eliel Patches:
|
||||
pri.c.patch uploaded by eliel (license 64) q931.c.patch uploaded
|
||||
by eliel (license 64) q921.c.patch uploaded by eliel (license 64)
|
||||
pri_facility.c.patch uploaded by eliel (license 64)
|
||||
|
||||
* pri.c: Change a use of malloc+memset to calloc. Also, reduce
|
||||
indentation of a function by doing the check for memory
|
||||
allocation failure at the beginning.
|
||||
|
||||
* pri.c: Change the table used to hold the default timers to be
|
||||
global and const, instead of allocating it on the stack each time
|
||||
the function is called.
|
||||
|
||||
2007-12-05 00:20 +0000 [r491-493] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c: Improve the parameter name to better reflect its use
|
||||
|
||||
* q921.c, q931.c: More PTMP fixes. Stand by, more changes to come
|
||||
|
||||
* q921.c, q931.c, testprilib.c: More magic to make BRI CPE PTMP
|
||||
work
|
||||
|
||||
2007-11-21 22:30 +0000 [r486-487] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c: Make sure we loop BRI call references for one byte CREFs
|
||||
instead of two
|
||||
|
||||
* q921.c, q931.c, libpri.h, pri.c, pritest.c, pri_internal.h: Add
|
||||
BRI support to libpri
|
||||
|
||||
2007-10-13 16:00 +0000 [r473] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c: Make sure that we only output the message handling debug
|
||||
when we're actually debugging
|
||||
|
||||
2007-09-25 21:56 +0000 [r469] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c: Fix user-user IE order in setup message (#10705)
|
||||
|
||||
2007-06-20 15:18 +0000 [r428-430] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* Makefile: Revert that back to how it was
|
||||
|
||||
* Makefile, q921.c, q931.c, prisched.c, testprilib.c, pri_timers.h,
|
||||
libpri.h, pri.c, pri_internal.h, pri_q921.h: Patch to add PTMP
|
||||
mode (BRI support)
|
||||
|
||||
2007-06-06 21:59 +0000 [r417-425] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c, pri_facility.c, pri_facility.h, pri.c, pri_internal.h:
|
||||
Preliminary patch plus mods for Q.SIG Path Replacement (Q.SIG
|
||||
version of 2BCT) #7778
|
||||
|
||||
2007-05-25 17:36 +0000 [r413] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c, pri_facility.c, pri_facility.h, libpri.h: Commit path for
|
||||
ROSE-12 and ROSE-13 support (#9076)
|
||||
|
||||
2006-11-03 18:16 +0000 [r382] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q921.c: Remove pointless recursion. (#8281)
|
||||
|
||||
2008-05-07 19:51 +0000 [r557] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* pri.c, pritest.c, pri_internal.h, pri_q921.h, Makefile, q921.c,
|
||||
q931.c, pri_facility.c, prisched.c, testprilib.c, pri_timers.h,
|
||||
pri_facility.h, libpri.h: Moving trunk changes back into 1.4
|
||||
|
||||
2008-05-02 20:21 +0000 [r552] Brett Bryant <bbryant@digium.com>
|
||||
|
||||
* Makefile, build_tools (added), build_tools/make_version (added),
|
||||
build_tools/make_version_c (added), libpri.h: Add new API call
|
||||
(pri_get_version) to show the current version of the branch for
|
||||
support purposes.
|
||||
|
||||
2008-04-16 00:21 +0000 [r544] Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* q921.c: fix the indentation in this function so that it is
|
||||
actually possible to read it and understand the logic and flow
|
||||
|
||||
2008-02-21 16:38 +0000 [r528] Joshua Colp <jcolp@digium.com>
|
||||
|
||||
* q931.c: If inband audio is being provided with a disconnect
|
||||
message let the audio be heard before releasing the channel.
|
||||
(closes issue #10552) Reported by: paravoid Patches:
|
||||
disconnect-audio.diff uploaded by paravoid (license 200)
|
||||
|
||||
2008-02-18 20:31 +0000 [r524] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c, libpri.h: Improve transmission, receiving, and dumping of
|
||||
bearer capability IE (#11593)
|
||||
|
||||
2008-01-11 16:34 +0000 [r514] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c, /: Merged revisions 513 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r513
|
||||
| mattf | 2008-01-11 10:33:52 -0600 (Fri, 11 Jan 2008) | 1 line
|
||||
We should not be parsing further into the bearer capability IE if
|
||||
the length does not confirm that there actually is data present
|
||||
........
|
||||
|
||||
2007-12-13 Russell Bryant <russell@digium.com>
|
||||
|
||||
* libpri 1.4.3 released.
|
||||
|
||||
2007-10-22 15:10 +0000 [r479] Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* pri_internal.h, /: Merged revisions 478 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r478
|
||||
| kpfleming | 2007-10-22 10:09:27 -0500 (Mon, 22 Oct 2007) | 3
|
||||
lines we need to include stddef.h for 'size_t' ........
|
||||
|
||||
2007-10-16 Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* libpri 1.4.2 released.
|
||||
|
||||
2007-10-05 16:45 +0000 [r470] Jason Parker <jparker@digium.com>
|
||||
|
||||
* libpri.h: Fix an incorrect pri_event structure definition. Issue
|
||||
10832, patch by flefoll
|
||||
|
||||
2007-09-25 21:37 +0000 [r468] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c: Fix user-user IE order in setup message (#10705)
|
||||
|
||||
2007-09-14 21:32 +0000 [r465] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c, libpri.h: Fix for #10189. Make sure we properly report
|
||||
the user layer 1 for H.223 and H.245
|
||||
|
||||
2007-09-06 15:11 +0000 [r462] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* pri.c, pri_facility.c, /: Merged revisions 460 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r460
|
||||
| mattf | 2007-09-06 10:06:42 -0500 (Thu, 06 Sep 2007) | 1 line
|
||||
TBCT now works. It should work for NI2, 4E, and 5E. This code was
|
||||
tested on NI2. ........
|
||||
|
||||
2007-08-27 19:21 +0000 [r446] Jason Parker <jparker@digium.com>
|
||||
|
||||
* Makefile, /: Merged revisions 445 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r445
|
||||
| qwell | 2007-08-27 14:20:23 -0500 (Mon, 27 Aug 2007) | 2 lines
|
||||
Make sure we build both the static and shared modules with -fPIC.
|
||||
........
|
||||
|
||||
2007-08-06 19:58 +0000 [r441] Jason Parker <jparker@digium.com>
|
||||
|
||||
* Makefile: Allow setting CC to something with a space, such as
|
||||
`make CC="gcc -m32"` Issue 10253.
|
||||
|
||||
2007-07-09 Russell Bryant <russell@digium.com>
|
||||
|
||||
* libpri 1.4.1 released.
|
||||
|
||||
2007-06-19 18:23 +0000 [r427] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c, /: Merged revisions 426 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r426
|
||||
| mattf | 2007-06-19 13:22:33 -0500 (Tue, 19 Jun 2007) | 1 line
|
||||
Try to send pending facility messages if we receive alerting (for
|
||||
when we don't get proceeding) (#9651) ........
|
||||
|
||||
2007-06-06 21:58 +0000 [r416-424] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* pri_facility.c, /: Merged revisions 423 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r423
|
||||
| mattf | 2007-06-06 16:57:15 -0500 (Wed, 06 Jun 2007) | 1 line
|
||||
Oops, that should not be on one line ........
|
||||
|
||||
* pri_facility.c, /: Merged revisions 415 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r415
|
||||
| mattf | 2007-06-06 08:20:05 -0500 (Wed, 06 Jun 2007) | 2 lines
|
||||
Make sure we only send the NFE when we are talking QSIG ........
|
||||
|
||||
2007-01-22 22:29 +0000 [r390] Matthew Fredrickson <creslin@digium.com>
|
||||
|
||||
* q931.c, /: Merged revisions 389 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r389
|
||||
| mattf | 2007-01-22 16:20:59 -0600 (Mon, 22 Jan 2007) | 2 lines
|
||||
Make sure we send DISCONNECT if we reached the active state and a
|
||||
call is disconnected, regardless of cause code. ........
|
||||
|
||||
2006-12-30 19:17 +0000 [r386] Joshua Colp <jcolp@digium.com>
|
||||
|
||||
* Makefile, /: Merged revisions 385 via svnmerge from
|
||||
https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r385
|
||||
| file | 2006-12-30 14:16:17 -0500 (Sat, 30 Dec 2006) | 2 lines
|
||||
Specify full path to restorecon instead of assuming it will be
|
||||
available from what is in $PATH. (issue #8670 reported by djflux)
|
||||
........
|
||||
|
||||
2006-12-23 Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* libpri 1.4.0 released.
|
||||
|
||||
2006-09-20 Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* libpri 1.4.0-beta1 released.
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -f ${1}/.version ]; then
|
||||
cat ${1}/.version
|
||||
cat ${1}/.version
|
||||
elif [ -d .svn ]; then
|
||||
PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/libpri/::' | sed -e 's:/: :g'`
|
||||
BRANCH=0
|
||||
@@ -10,63 +10,70 @@ elif [ -d .svn ]; then
|
||||
|
||||
REV=`svnversion -c ${1} | cut -d: -f2`
|
||||
|
||||
BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
|
||||
INTEGRATED=`LANG=C svn pg automerge-propname ${1}`
|
||||
if [ -z "${INTEGRATED}" ] ; then
|
||||
INTEGRATED=svnmerge-integrated
|
||||
fi
|
||||
|
||||
if [ "${PARTS}" = "trunk" ] ; then
|
||||
echo SVN-trunk-r${REV}
|
||||
exit 0
|
||||
fi
|
||||
BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
|
||||
|
||||
if [ "${PARTS}" = "trunk" ] ; then
|
||||
echo SVN-trunk-r${REV}
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for PART in $PARTS ; do
|
||||
if [ ${TAG} != 0 ] ; then
|
||||
if [ "${PART}" = "autotag_for_be" ] ; then
|
||||
continue
|
||||
fi
|
||||
if [ "${PART}" = "autotag_for_sx00i" ] ; then
|
||||
continue
|
||||
fi
|
||||
RESULT="${PART}"
|
||||
break
|
||||
fi
|
||||
|
||||
if [ ${BRANCH} != 0 ] ; then
|
||||
if [ -z ${RESULT} ] ; then
|
||||
RESULT="${PART}"
|
||||
else
|
||||
RESULT="${RESULT}-${PART}"
|
||||
if [ ${TAG} != 0 ] ; then
|
||||
if [ "${PART}" = "autotag_for_be" ] ; then
|
||||
continue
|
||||
fi
|
||||
if [ "${PART}" = "autotag_for_sx00i" ] ; then
|
||||
continue
|
||||
fi
|
||||
RESULT="${PART}"
|
||||
break
|
||||
fi
|
||||
break
|
||||
fi
|
||||
|
||||
if [ ${TEAM} != 0 ] ; then
|
||||
if [ -z ${RESULT} ] ; then
|
||||
RESULT="${PART}"
|
||||
else
|
||||
RESULT="${RESULT}-${PART}"
|
||||
if [ ${BRANCH} != 0 ] ; then
|
||||
if [ -z "${RESULT}" ] ; then
|
||||
RESULT="${PART}"
|
||||
else
|
||||
RESULT="${RESULT}-${PART}"
|
||||
fi
|
||||
break
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
|
||||
if [ "${PART}" = "branches" ] ; then
|
||||
BRANCH=1
|
||||
RESULT="branch"
|
||||
continue
|
||||
fi
|
||||
if [ ${TEAM} != 0 ] ; then
|
||||
if [ -z "${RESULT}" ] ; then
|
||||
RESULT="${PART}"
|
||||
else
|
||||
RESULT="${RESULT}-${PART}"
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
|
||||
if [ "${PART}" = "tags" ] ; then
|
||||
TAG=1
|
||||
continue
|
||||
fi
|
||||
if [ "${PART}" = "branches" ] ; then
|
||||
BRANCH=1
|
||||
RESULT="branch"
|
||||
continue
|
||||
fi
|
||||
|
||||
if [ "${PART}" = "team" ] ; then
|
||||
TEAM=1
|
||||
continue
|
||||
fi
|
||||
if [ "${PART}" = "tags" ] ; then
|
||||
TAG=1
|
||||
continue
|
||||
fi
|
||||
|
||||
if [ "${PART}" = "team" ] ; then
|
||||
TEAM=1
|
||||
continue
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ${TAG} != 0 ] ; then
|
||||
echo ${RESULT}
|
||||
echo ${RESULT}
|
||||
else
|
||||
echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
|
||||
echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
|
||||
fi
|
||||
else
|
||||
echo "UNKNOWN__and_probably_unsupported"
|
||||
fi
|
||||
|
||||
26
libpri.h
26
libpri.h
@@ -64,23 +64,23 @@
|
||||
|
||||
/* PRI D-Channel Events */
|
||||
#define PRI_EVENT_DCHAN_UP 1 /* D-channel is up */
|
||||
#define PRI_EVENT_DCHAN_DOWN 2 /* D-channel is down */
|
||||
#define PRI_EVENT_DCHAN_DOWN 2 /* D-channel is down */
|
||||
#define PRI_EVENT_RESTART 3 /* B-channel is restarted */
|
||||
#define PRI_EVENT_CONFIG_ERR 4 /* Configuration Error Detected */
|
||||
#define PRI_EVENT_RING 5 /* Incoming call */
|
||||
#define PRI_EVENT_HANGUP 6 /* Call got hung up */
|
||||
#define PRI_EVENT_RINGING 7 /* Call is ringing (alerting) */
|
||||
#define PRI_EVENT_ANSWER 8 /* Call has been answered */
|
||||
#define PRI_EVENT_RING 5 /* Incoming call (SETUP) */
|
||||
#define PRI_EVENT_HANGUP 6 /* Call got hung up (RELEASE/RELEASE_COMPLETE/other) */
|
||||
#define PRI_EVENT_RINGING 7 /* Call is ringing (ALERTING) */
|
||||
#define PRI_EVENT_ANSWER 8 /* Call has been answered (CONNECT) */
|
||||
#define PRI_EVENT_HANGUP_ACK 9 /* Call hangup has been acknowledged */
|
||||
#define PRI_EVENT_RESTART_ACK 10 /* Restart complete on a given channel */
|
||||
#define PRI_EVENT_RESTART_ACK 10 /* Restart complete on a given channel (RESTART_ACKNOWLEDGE) */
|
||||
#define PRI_EVENT_FACNAME 11 /* Caller*ID Name received on Facility */
|
||||
#define PRI_EVENT_INFO_RECEIVED 12 /* Additional info (keypad) received */
|
||||
#define PRI_EVENT_PROCEEDING 13 /* When we get CALL_PROCEEDING or PROGRESS */
|
||||
#define PRI_EVENT_INFO_RECEIVED 12 /* Additional info (digits) received (INFORMATION) */
|
||||
#define PRI_EVENT_PROCEEDING 13 /* When we get CALL_PROCEEDING */
|
||||
#define PRI_EVENT_SETUP_ACK 14 /* When we get SETUP_ACKNOWLEDGE */
|
||||
#define PRI_EVENT_HANGUP_REQ 15 /* Requesting the higher layer to hangup */
|
||||
#define PRI_EVENT_NOTIFY 16 /* Notification received */
|
||||
#define PRI_EVENT_PROGRESS 17 /* When we get CALL_PROCEEDING or PROGRESS */
|
||||
#define PRI_EVENT_KEYPAD_DIGIT 18 /* When we receive during ACTIVE state */
|
||||
#define PRI_EVENT_HANGUP_REQ 15 /* Requesting the higher layer to hangup (DISCONNECT) */
|
||||
#define PRI_EVENT_NOTIFY 16 /* Notification received (NOTIFY) */
|
||||
#define PRI_EVENT_PROGRESS 17 /* When we get PROGRESS */
|
||||
#define PRI_EVENT_KEYPAD_DIGIT 18 /* When we receive during ACTIVE state (INFORMATION) */
|
||||
|
||||
/* Simple states */
|
||||
#define PRI_STATE_DOWN 0
|
||||
@@ -595,7 +595,7 @@ int pri_setup(struct pri *pri, q931_call *call, struct pri_sr *req);
|
||||
/* Set a call has a call indpendent signalling connection (i.e. no bchan) */
|
||||
int pri_sr_set_connection_call_independent(struct pri_sr *req);
|
||||
|
||||
/* Send an MWI indication to a remote location. If activate is non zero, activates, if zero, decativates */
|
||||
/* Send an MWI indication to a remote location. If activate is non zero, activates, if zero, deactivates */
|
||||
int pri_mwi_activate(struct pri *pri, q931_call *c, char *caller, int callerplan, char *callername, int callerpres, char *called, int calledplan);
|
||||
|
||||
/* Send an MWI deactivate request to a remote location */
|
||||
|
||||
@@ -1289,15 +1289,15 @@ int qsig_cf_callrerouting(struct pri *pri, q931_call *c, const char* dest, const
|
||||
/* pSS1InfoElement */
|
||||
ASN1_ADD_SIMPLE(comp, (ASN1_APPLICATION | ASN1_TAG_0 ), buffer, i);
|
||||
ASN1_PUSH(compstk, compsp, comp);
|
||||
buffer[i++] = (0x04); /* add BC */
|
||||
buffer[i++] = (0x03);
|
||||
buffer[i++] = (0x80);
|
||||
buffer[i++] = (0x90);
|
||||
buffer[i++] = (0xa3);
|
||||
buffer[i++] = (0x95);
|
||||
buffer[i++] = (0x32);
|
||||
buffer[i++] = (0x01);
|
||||
buffer[i++] = (0x81);
|
||||
buffer[i++] = (0x04); /* Bearer Capability IE */
|
||||
buffer[i++] = (0x03); /* len */
|
||||
buffer[i++] = (0x80); /* ETSI Standard, Speech */
|
||||
buffer[i++] = (0x90); /* circuit mode, 64kbit/s */
|
||||
buffer[i++] = (0xa3); /* level1 protocol, a-law */
|
||||
buffer[i++] = (0x95); /* locking shift to codeset 5 (national use) */
|
||||
buffer[i++] = (0x32); /* Unknown ie */
|
||||
buffer[i++] = (0x01); /* Unknown ie len */
|
||||
buffer[i++] = (0x81); /* Unknown ie body */
|
||||
ASN1_FIXUP(compstk, compsp, buffer, i);
|
||||
|
||||
/* lastReroutingNr [1]*/
|
||||
@@ -1425,7 +1425,6 @@ int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
|
||||
|
||||
/* Channel 1 */
|
||||
buffer[i++] = (ASN1_CONTEXT_SPECIFIC | Q932_PROTOCOL_EXTENSIONS);
|
||||
/* Interpretation component */
|
||||
|
||||
ASN1_ADD_SIMPLE(comp, COMP_TYPE_NFE, buffer, i);
|
||||
ASN1_PUSH(compstk, compsp, comp);
|
||||
@@ -1433,6 +1432,7 @@ int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
|
||||
ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_2), buffer, i, 0);
|
||||
ASN1_FIXUP(compstk, compsp, buffer, i);
|
||||
|
||||
/* Interpretation component */
|
||||
ASN1_ADD_BYTECOMP(comp, COMP_TYPE_INTERPRETATION, buffer, i, 2); /* reject - to get feedback from QSIG switch */
|
||||
|
||||
ASN1_ADD_SIMPLE(comp, COMP_TYPE_INVOKE, buffer, i);
|
||||
@@ -1447,15 +1447,22 @@ int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
|
||||
|
||||
ASN1_ADD_SIMPLE(comp, (ASN1_SEQUENCE | ASN1_CONSTRUCTOR), buffer, i);
|
||||
ASN1_PUSH(compstk, compsp, comp);
|
||||
buffer[i++] = (0x0a);
|
||||
buffer[i++] = (0x01);
|
||||
buffer[i++] = (0x00);
|
||||
buffer[i++] = (0x81);
|
||||
buffer[i++] = (0x00);
|
||||
buffer[i++] = (0x0a);
|
||||
buffer[i++] = (0x01);
|
||||
buffer[i++] = (0x01);
|
||||
buffer[i++] = (0x0a);/* Enumeration endDesignation */
|
||||
buffer[i++] = (0x01);/* Len */
|
||||
buffer[i++] = (0x00);/* primaryEnd */
|
||||
buffer[i++] = (0x81);/* redirectionNumber = presentationRestricted */
|
||||
buffer[i++] = (0x00);/* Len */
|
||||
buffer[i++] = (0x0a);/* Enumeration callStatus */
|
||||
buffer[i++] = (0x01);/* Len */
|
||||
buffer[i++] = (0x01);/* alerting */
|
||||
|
||||
/*
|
||||
* Where does this element come from? It is not in Q.SIG ECMA-178.
|
||||
* We send this but we will not accept it.
|
||||
* This seems to be a cut and paste error from eect_initiate_transfer().
|
||||
*/
|
||||
ASN1_ADD_WORDCOMP(comp, ASN1_INTEGER, buffer, i, call_reference);
|
||||
|
||||
ASN1_FIXUP(compstk, compsp, buffer, i);
|
||||
ASN1_FIXUP(compstk, compsp, buffer, i);
|
||||
|
||||
@@ -1480,7 +1487,6 @@ int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
|
||||
compsp = 0;
|
||||
|
||||
buffer2[i++] = (ASN1_CONTEXT_SPECIFIC | Q932_PROTOCOL_EXTENSIONS);
|
||||
/* Interpretation component */
|
||||
|
||||
ASN1_ADD_SIMPLE(comp, COMP_TYPE_NFE, buffer2, i);
|
||||
ASN1_PUSH(compstk, compsp, comp);
|
||||
@@ -1488,6 +1494,7 @@ int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
|
||||
ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_2), buffer2, i, 0);
|
||||
ASN1_FIXUP(compstk, compsp, buffer2, i);
|
||||
|
||||
/* Interpretation component */
|
||||
ASN1_ADD_BYTECOMP(comp, COMP_TYPE_INTERPRETATION, buffer2, i, 2); /* reject */
|
||||
|
||||
ASN1_ADD_SIMPLE(comp, COMP_TYPE_INVOKE, buffer2, i);
|
||||
@@ -1502,15 +1509,22 @@ int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
|
||||
|
||||
ASN1_ADD_SIMPLE(comp, (ASN1_SEQUENCE | ASN1_CONSTRUCTOR), buffer2, i);
|
||||
ASN1_PUSH(compstk, compsp, comp);
|
||||
buffer2[i++] = (0x0a);
|
||||
buffer2[i++] = (0x01);
|
||||
buffer2[i++] = (0x01);
|
||||
buffer2[i++] = (0x81);
|
||||
buffer2[i++] = (0x00);
|
||||
buffer2[i++] = (0x0a);
|
||||
buffer2[i++] = (0x01);
|
||||
buffer2[i++] = (0x01);
|
||||
buffer2[i++] = (0x0a);/* Enumeration endDesignation */
|
||||
buffer2[i++] = (0x01);/* Len */
|
||||
buffer2[i++] = (0x01);/* secondaryEnd */
|
||||
buffer2[i++] = (0x81);/* redirectionNumber = presentationRestricted */
|
||||
buffer2[i++] = (0x00);/* Len */
|
||||
buffer2[i++] = (0x0a);/* Enumeration callStatus */
|
||||
buffer2[i++] = (0x01);/* Len */
|
||||
buffer2[i++] = (0x01);/* alerting */
|
||||
|
||||
/*
|
||||
* Where does this element come from? It is not in Q.SIG ECMA-178.
|
||||
* We send this but we will not accept it.
|
||||
* This seems to be a cut and paste error from eect_initiate_transfer().
|
||||
*/
|
||||
ASN1_ADD_WORDCOMP(comp, ASN1_INTEGER, buffer2, i, call_reference);
|
||||
|
||||
ASN1_FIXUP(compstk, compsp, buffer2, i);
|
||||
ASN1_FIXUP(compstk, compsp, buffer2, i);
|
||||
|
||||
@@ -2267,7 +2281,7 @@ int rose_reject_decode(struct pri *pri, q931_call *call, q931_ie *ie, unsigned c
|
||||
|
||||
return 0;
|
||||
} else {
|
||||
pri_message(pri, "Unable to handle return result on switchtype %d!\n", pri->switchtype);
|
||||
pri_message(pri, "Unable to handle reject on switchtype %d!\n", pri->switchtype);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -2330,8 +2344,7 @@ int rose_return_error_decode(struct pri *pri, q931_call *call, q931_ie *ie, unsi
|
||||
|
||||
return 0;
|
||||
} else {
|
||||
pri_message(pri, "Unable to handle return result on switchtype %d!\n", pri->switchtype);
|
||||
return -1;
|
||||
pri_message(pri, "Unable to handle return error on switchtype %d!\n", pri->switchtype);
|
||||
}
|
||||
|
||||
} while(0);
|
||||
|
||||
104
q921.c
104
q921.c
@@ -268,12 +268,31 @@ static void reschedule_t203(struct pri *pri)
|
||||
pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
|
||||
}
|
||||
|
||||
static void q921_send_queued_iframes(struct pri *pri)
|
||||
{
|
||||
struct q921_frame *f;
|
||||
|
||||
f = pri->txqueue;
|
||||
while(f && (pri->windowlen < pri->window)) {
|
||||
if (!f->transmitted) {
|
||||
/* Send it now... */
|
||||
if (pri->debug & PRI_DEBUG_Q921_DUMP)
|
||||
pri_message(pri, "-- Finally transmitting %d, since window opened up (%d)\n", f->h.n_s, pri->windowlen);
|
||||
f->transmitted++;
|
||||
pri->windowlen++;
|
||||
f->h.n_r = pri->v_r;
|
||||
f->h.p_f = 0;
|
||||
q921_transmit(pri, (q921_h *)(&f->h), f->len);
|
||||
}
|
||||
f = f->next;
|
||||
}
|
||||
}
|
||||
|
||||
static pri_event *q921_ack_rx(struct pri *pri, int ack, int send_untransmitted_frames)
|
||||
{
|
||||
int x;
|
||||
int cnt=0;
|
||||
pri_event *ev;
|
||||
struct q921_frame *f;
|
||||
/* Make sure the ACK was within our window */
|
||||
for (x=pri->v_a; (x != pri->v_s) && (x != ack); Q921_INC(x));
|
||||
if (x != ack) {
|
||||
@@ -309,20 +328,7 @@ static pri_event *q921_ack_rx(struct pri *pri, int ack, int send_untransmitted_f
|
||||
if (!pri->busy && send_untransmitted_frames) {
|
||||
pri->retrans = 0;
|
||||
/* Search for something to send */
|
||||
f = pri->txqueue;
|
||||
while(f && (pri->windowlen < pri->window)) {
|
||||
if (!f->transmitted) {
|
||||
/* Send it now... */
|
||||
if (pri->debug & PRI_DEBUG_Q921_DUMP)
|
||||
pri_message(pri, "-- Finally transmitting %d, since window opened up (%d)\n", f->h.n_s, pri->windowlen);
|
||||
f->transmitted++;
|
||||
pri->windowlen++;
|
||||
f->h.n_r = pri->v_r;
|
||||
f->h.p_f = 0;
|
||||
q921_transmit(pri, (q921_h *)(&f->h), f->len);
|
||||
}
|
||||
f = f->next;
|
||||
}
|
||||
q921_send_queued_iframes(pri);
|
||||
}
|
||||
if (pri->debug & PRI_DEBUG_Q921_DUMP)
|
||||
pri_message(pri, "-- Waiting for acknowledge, restarting T200 counter\n");
|
||||
@@ -438,9 +444,14 @@ static void t200_expire(void *vpri)
|
||||
pri_message(pri, DBGHEAD "q921_state now is Q921_LINK_CONNECTION_RELEASED\n",DBGINFO);
|
||||
pri->q921_state = Q921_LINK_CONNECTION_RELEASED;
|
||||
pri->t200_timer = 0;
|
||||
q921_dchannel_down(pri);
|
||||
q921_start(pri, 1);
|
||||
pri->schedev = 1;
|
||||
if (pri->bri && pri->master) {
|
||||
q921_tei_release_and_reacquire(pri->master);
|
||||
return;
|
||||
} else {
|
||||
q921_dchannel_down(pri);
|
||||
q921_start(pri, 1);
|
||||
pri->schedev = 1;
|
||||
}
|
||||
}
|
||||
} else if (pri->solicitfbit) {
|
||||
if (pri->debug & PRI_DEBUG_Q921_DUMP)
|
||||
@@ -510,7 +521,7 @@ int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
|
||||
pri->txqueue = f;
|
||||
/* Immediately transmit unless we're in a recovery state, or the window
|
||||
size is too big */
|
||||
if (!pri->retrans && !pri->busy) {
|
||||
if ((pri->q921_state == Q921_LINK_CONNECTION_ESTABLISHED) && (!pri->retrans && !pri->busy)) {
|
||||
if (pri->windowlen < pri->window) {
|
||||
pri->windowlen++;
|
||||
q921_transmit(pri, (q921_h *)(&f->h), f->len);
|
||||
@@ -527,9 +538,14 @@ int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
|
||||
pri_schedule_del(pri, pri->t203_timer);
|
||||
pri->t203_timer = 0;
|
||||
}
|
||||
if (pri->debug & PRI_DEBUG_Q921_DUMP)
|
||||
pri_message(pri, "Starting T_200 timer\n");
|
||||
reschedule_t200(pri);
|
||||
|
||||
/* Check this so that we don't try to send frames while multi frame mode is down */
|
||||
if (pri->q921_state == Q921_LINK_CONNECTION_ESTABLISHED) {
|
||||
if (pri->debug & PRI_DEBUG_Q921_DUMP)
|
||||
pri_message(pri, "Starting T_200 timer\n");
|
||||
|
||||
reschedule_t200(pri);
|
||||
}
|
||||
} else {
|
||||
pri_error(pri, "!! Out of memory for Q.921 transmit\n");
|
||||
return -1;
|
||||
@@ -638,6 +654,7 @@ void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx)
|
||||
direction_tag,
|
||||
h->h.tei,
|
||||
h->h.ea2);
|
||||
|
||||
switch (h->h.data[0] & Q921_FRAMETYPE_MASK) {
|
||||
case 0:
|
||||
case 2:
|
||||
@@ -728,13 +745,48 @@ void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx)
|
||||
len - 3);
|
||||
break;
|
||||
};
|
||||
|
||||
if ((h->u.ft == 3) && (h->u.m3 == 0) && (h->u.m2 == 0) && (h->u.data[0] == 0x0f)) {
|
||||
int ri;
|
||||
int tei;
|
||||
|
||||
ri = (h->u.data[1] << 8) | h->u.data[2];
|
||||
tei = (h->u.data[4] >> 1);
|
||||
/* TEI assignment related */
|
||||
switch (h->u.data[3]) {
|
||||
case Q921_TEI_IDENTITY_REQUEST:
|
||||
type = "TEI Identity Request";
|
||||
break;
|
||||
case Q921_TEI_IDENTITY_ASSIGNED:
|
||||
type = "TEI Identity Assigned";
|
||||
break;
|
||||
case Q921_TEI_IDENTITY_CHECK_REQUEST:
|
||||
type = "TEI Identity Check Request";
|
||||
break;
|
||||
case Q921_TEI_IDENTITY_REMOVE:
|
||||
type = "TEI Identity Remove";
|
||||
break;
|
||||
case Q921_TEI_IDENTITY_DENIED:
|
||||
type = "TEI Identity Denied";
|
||||
break;
|
||||
case Q921_TEI_IDENTITY_CHECK_RESPONSE:
|
||||
type = "TEI Identity Check Response";
|
||||
break;
|
||||
case Q921_TEI_IDENTITY_VERIFY:
|
||||
type = "TEI Identity Verify";
|
||||
break;
|
||||
default:
|
||||
type = "Unknown";
|
||||
break;
|
||||
}
|
||||
pri_message(pri, "%c MDL Message: %s (%d)\n", direction_tag, type, h->u.data[3]);
|
||||
pri_message(pri, "%c RI: %d\n", direction_tag, ri);
|
||||
pri_message(pri, "%c Ai: %d E:%d\n", direction_tag, (h->u.data[4] >> 1) & 0x7f, h->u.data[4] & 1);
|
||||
}
|
||||
}
|
||||
|
||||
static pri_event *q921_dchannel_up(struct pri *pri)
|
||||
{
|
||||
/* Reset counters, etc */
|
||||
q921_reset(pri);
|
||||
|
||||
/* Stop any SABME retransmissions */
|
||||
if (pri->sabme_timer) {
|
||||
pri_schedule_del(pri, pri->sabme_timer);
|
||||
@@ -755,6 +807,8 @@ static pri_event *q921_dchannel_up(struct pri *pri)
|
||||
/* Notify Layer 3 */
|
||||
q931_dl_indication(pri, PRI_EVENT_DCHAN_UP);
|
||||
|
||||
q921_send_queued_iframes(pri);
|
||||
|
||||
/* Report event that D-Channel is now up */
|
||||
pri->ev.gen.e = PRI_EVENT_DCHAN_UP;
|
||||
return &pri->ev;
|
||||
|
||||
8
q931.c
8
q931.c
@@ -825,6 +825,12 @@ static FUNC_SEND(transmit_bearer_capability)
|
||||
/* Apparently EuroISDN switches don't seem to like user layer 2/3 */
|
||||
return 4;
|
||||
}
|
||||
|
||||
if ((tc & PRI_TRANS_CAP_DIGITAL) && (call->transmoderate == TRANS_MODE_64_CIRCUIT)) {
|
||||
/* Unrestricted digital 64k data calls don't use user layer 2/3 */
|
||||
return 4;
|
||||
}
|
||||
|
||||
if (call->transmoderate != TRANS_MODE_PACKET) {
|
||||
/* If you have an AT&T 4ESS, you don't send any more info */
|
||||
if ((pri->switchtype != PRI_SWITCH_ATT4ESS) && (call->userl1 > -1)) {
|
||||
@@ -2985,7 +2991,7 @@ static int restart_ies[] = { Q931_CHANNEL_IDENT, Q931_RESTART_INDICATOR, -1 };
|
||||
int q931_restart(struct pri *pri, int channel)
|
||||
{
|
||||
struct q931_call *c;
|
||||
c = q931_getcall(pri, 0 | 0x8000, 0);
|
||||
c = q931_getcall(pri, 0 | 0x8000, 1);
|
||||
if (!c)
|
||||
return -1;
|
||||
if (!channel)
|
||||
|
||||
Reference in New Issue
Block a user