Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
585a33ce54 | ||
|
|
404ad38826 | ||
|
|
a1457a9c43 |
@@ -1 +0,0 @@
|
||||
0
|
||||
12
.gitignore
vendored
12
.gitignore
vendored
@@ -1,12 +0,0 @@
|
||||
*.o
|
||||
*.o.d
|
||||
*.lo
|
||||
*.so
|
||||
*.a
|
||||
libpri.so.*
|
||||
pridump
|
||||
pritest
|
||||
rosetest
|
||||
testprilib
|
||||
version.c
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
[gerrit]
|
||||
host=gerrit.asterisk.org
|
||||
port=29418
|
||||
project=libpri.git
|
||||
@@ -1 +0,0 @@
|
||||
0
|
||||
157
ChangeLog
157
ChangeLog
@@ -1,160 +1,3 @@
|
||||
2016-03-25 20:59 +0000 Asterisk Development Team <asteriskteam@digium.com>
|
||||
|
||||
* libpri 1.5.0 Released.
|
||||
|
||||
2016-03-25 15:58 +0000 [44b1082a1e] Kevin Harwell <kharwell@lunkwill>
|
||||
|
||||
* Release summaries: Add summaries for 1.5.0
|
||||
|
||||
2016-03-25 15:58 +0000 [9a90caa65e] Kevin Harwell <kharwell@lunkwill>
|
||||
|
||||
* .version: Update for 1.5.0
|
||||
|
||||
2016-03-25 15:58 +0000 [5414ca525e] Kevin Harwell <kharwell@lunkwill>
|
||||
|
||||
* .lastclean: Update for 1.5.0
|
||||
|
||||
2016-03-24 14:55 +0000 [c71499df29] Kevin Harwell <kharwell@digium.com>
|
||||
|
||||
* Adding .cleancount and .gitreview files
|
||||
|
||||
Change-Id: I0e5accd0e43c049578241b2841fc2efa821c24f4
|
||||
|
||||
2016-03-15 16:22 +0000 [2952e95715] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* q931.c: Fix DISCONNECT Progress Indicator ie handling.
|
||||
|
||||
There are two scenarios that are exposed by DISCONNECT not initializing
|
||||
the progress indicator value before processing the message when the
|
||||
chan_dahdi.conf inbanddisconnect=yes option is set.
|
||||
|
||||
1) If a DISCONNECT comes in without a Progress Indicator ie and an earlier
|
||||
message (such as SETUP-ACKNOWLEDGE or PROCEEDING) came in with the
|
||||
indicator #8 (Inband audio present) then the DISCONNECT would not cause an
|
||||
immediate hangup. We would be letting the user hear the inband audio even
|
||||
though there isn't any.
|
||||
|
||||
2) If a DISCONNECT message comes in with the indicator #8 (Inband audio
|
||||
present) and then later the DISCONNECT message is repeated without a
|
||||
Progress Indicator ie we would still ignore the second DISCONNECT to let
|
||||
the user hear inband audio even though it likely isn't there anymore.
|
||||
|
||||
PRI-180 #close
|
||||
Reported by: Alexandr Dranchuk
|
||||
|
||||
Change-Id: Ic88aafb45053146b5701d666e6212f7555573624
|
||||
|
||||
2016-03-16 13:08 +0000 [7da3366cec] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* q931.c: Substitute PROGRESS for DISCONNECT with progress indicator #8
|
||||
|
||||
When the pri_set_inbanddisconnect() option is enabled and the call has not
|
||||
been answered when a DISCONNECT with progress indicator #8 (Inband audio
|
||||
present) is received, then report the event as a PROGRESS with progress
|
||||
indicator #8 (Inband audio present) instead. Substituting a PROGRESS
|
||||
event allows the upper layer to open the media path if it isn't already
|
||||
open so the user can hear the inband audio message.
|
||||
|
||||
PRI-180
|
||||
Reported by: Alexandr Dranchuk
|
||||
|
||||
Change-Id: I62313bf9cc1d2f3b0231f0c07a784717ddba0415
|
||||
|
||||
2016-03-16 12:57 +0000 [734e922301] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* Add .gitignore
|
||||
|
||||
Change-Id: I11ac3b47a9d5d0a0c1ea4559280b75ef5d866d62
|
||||
|
||||
2016-02-17 14:21 +0000 [a9722804c1] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* q931.c: Tighten mandatory ie checks.
|
||||
|
||||
Libpri was lax in checking if a missing channel identification ie is
|
||||
mandatory for the SETUP ACKNOWLEDGE, PROCEEDING, ALERTING, and CONNECT
|
||||
messages. That ie is mandatory when those messages are the first response
|
||||
to a SETUP message sent by the CPE side.
|
||||
|
||||
* Made those messages check if a missing channel identification ie is
|
||||
mandatory and send a STATUS with cause 96 "Mandatory information element
|
||||
is missing" in response.
|
||||
|
||||
Libpri did not care if a mandatory ie had a coding error.
|
||||
|
||||
* Made coding errors in mandatory ie's send a STATUS with cause 100
|
||||
"Invalid information element contents" in response.
|
||||
|
||||
* Fixed detection of coding errors in channel identification ie.
|
||||
|
||||
SWP-8721
|
||||
SWP-8722
|
||||
|
||||
|
||||
git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@2337 2fbb986a-6c06-0410-b554-c9c1f0a7f128
|
||||
|
||||
2016-02-09 15:46 +0000 [6b2cc87b30] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* q931.c: Update ALERTING_NO_PROGRESS conditional code.
|
||||
|
||||
The conditional is to only remove the Progress Indicator ie from being
|
||||
added to select messages.
|
||||
|
||||
* Made so the ALERTING message can have the User-User ie if needed when
|
||||
ALERTING_NO_PROGRESS is defined.
|
||||
|
||||
|
||||
git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@2335 2fbb986a-6c06-0410-b554-c9c1f0a7f128
|
||||
|
||||
2014-11-17 17:26 +0000 [fc96191788] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* q931.c: Made not recognize ie 0x01 for switches other than 4ESS, 5ESS, NI2, and DMS-100.
|
||||
|
||||
An incoming SETUP message needs to reject the invalid ie 0x01 on switches
|
||||
other than 4ESS, 5ESS, NI2, and DMS-100.
|
||||
|
||||
LIBPRI-74 #close
|
||||
Reported by: Richard Mudgett
|
||||
|
||||
|
||||
git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@2333 2fbb986a-6c06-0410-b554-c9c1f0a7f128
|
||||
|
||||
2014-11-17 14:07 +0000 [5fda3d8c68] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* q931.c: Send STATUS messages when receiving messages in the wrong call state.
|
||||
|
||||
* Add checks to send STATUS messages when receiving SETUP ACKNOWLEDGE,
|
||||
ALERTING, and CONNECT ACKNOWLEDGE messages when in the wrong call state.
|
||||
|
||||
LIBPRI-76 #close
|
||||
Reported by: Richard Mudgett
|
||||
|
||||
|
||||
git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@2331 2fbb986a-6c06-0410-b554-c9c1f0a7f128
|
||||
|
||||
2014-11-04 16:19 +0000 [af8a550ff9] Richard Mudgett <rmudgett@digium.com>
|
||||
|
||||
* q921.c: Send DM and DISC frames with only three data octets instead of an extra fourth octet.
|
||||
|
||||
|
||||
git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@2329 2fbb986a-6c06-0410-b554-c9c1f0a7f128
|
||||
|
||||
2014-08-18 17:44 +0000 [a50516c1e4] Gerald Schnabel
|
||||
|
||||
* q931.c: Make always post a PRI_EVENT_KEYPAD_DIGIT if keypad digits come in an INFO message.
|
||||
|
||||
Q.931 Section 3.1.6 INFORMATION message. The keypad-facility or
|
||||
called-party-number ie could be used to convey called party digits. The
|
||||
keypad-facility ie can also be used to convey supplementary service
|
||||
information.
|
||||
|
||||
PRI-173 #close
|
||||
Reported by: Gerald Schnabel
|
||||
Patches:
|
||||
libpri_q931_keypad_digits.patch (license #6297) patch uploaded by Gerald Schnabel
|
||||
|
||||
|
||||
git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@2327 2fbb986a-6c06-0410-b554-c9c1f0a7f128
|
||||
|
||||
2014-06-16 Asterisk Development Team <asteriskteam@digium.com>
|
||||
|
||||
* libpri 1.4.15 Released.
|
||||
|
||||
61
libpri-1.4.15-summary.html
Normal file
61
libpri-1.4.15-summary.html
Normal file
@@ -0,0 +1,61 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - libpri-1.4.15</title></head>
|
||||
<body>
|
||||
<h1 align="center"><a name="top">Release Summary</a></h1>
|
||||
<h3 align="center">libpri-1.4.15</h3>
|
||||
<h3 align="center">Date: 2014-06-16</h3>
|
||||
<h3 align="center"><asteriskteam@digium.com></h3>
|
||||
<hr/>
|
||||
<h2 align="center">Table of Contents</h2>
|
||||
<ol>
|
||||
<li><a href="#summary">Summary</a></li>
|
||||
<li><a href="#contributors">Contributors</a></li>
|
||||
<li><a href="#commits">Other Changes</a></li>
|
||||
<li><a href="#diffstat">Diffstat</a></li>
|
||||
</ol>
|
||||
<hr/>
|
||||
<a name="summary"><h2 align="center">Summary</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes. The changes included were made only to address problems that have been identified in this release series. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p>
|
||||
<p>The data in this summary reflects changes that have been made since the previous release, libpri-1.4.14.</p>
|
||||
<hr/>
|
||||
<a name="contributors"><h2 align="center">Contributors</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
|
||||
<table width="100%" border="0">
|
||||
<tr>
|
||||
<td width="33%"><h3>Coders</h3></td>
|
||||
<td width="33%"><h3>Testers</h3></td>
|
||||
<td width="33%"><h3>Reporters</h3></td>
|
||||
</tr>
|
||||
<tr valign="top">
|
||||
<td>
|
||||
3 rmudgett<br/>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
1 dcolombo<br/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<hr/>
|
||||
<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p>
|
||||
<table width="100%" border="1">
|
||||
<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2315">2315</a></td><td>rmudgett</td><td>Fix hole in layer2_persistence option for TE PTMP links.</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2318">2318</a></td><td>rmudgett</td><td>libpri: Make TE-PTP mode respond to MDL TEI check requests.</td>
|
||||
<td></td></tr></table>
|
||||
<hr/>
|
||||
<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
|
||||
<pre>
|
||||
libpri.h | 66 +++++++++++++++++--
|
||||
pri.c | 12 ++-
|
||||
pri_q931.h | 2
|
||||
q921.c | 208 +++++++++++++++++++++++++++++++++++++------------------------
|
||||
q931.c | 38 +++++++----
|
||||
5 files changed, 224 insertions(+), 102 deletions(-)
|
||||
</pre><br/>
|
||||
<hr/>
|
||||
</body>
|
||||
</html>
|
||||
91
libpri-1.4.15-summary.txt
Normal file
91
libpri-1.4.15-summary.txt
Normal file
@@ -0,0 +1,91 @@
|
||||
Release Summary
|
||||
|
||||
libpri-1.4.15
|
||||
|
||||
Date: 2014-06-16
|
||||
|
||||
<asteriskteam@digium.com>
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Table of Contents
|
||||
|
||||
1. Summary
|
||||
2. Contributors
|
||||
3. Other Changes
|
||||
4. Diffstat
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Summary
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This release includes only bug fixes. The changes included were made only
|
||||
to address problems that have been identified in this release series.
|
||||
Users should be able to safely upgrade to this version if this release
|
||||
series is already in use. Users considering upgrading from a previous
|
||||
release series are strongly encouraged to review the UPGRADE.txt document
|
||||
as well as the CHANGES document for information about upgrading to this
|
||||
release series.
|
||||
|
||||
The data in this summary reflects changes that have been made since the
|
||||
previous release, libpri-1.4.14.
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Contributors
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This table lists the people who have submitted code, those that have
|
||||
tested patches, as well as those that reported issues on the issue tracker
|
||||
that were resolved in this release. For coders, the number is how many of
|
||||
their patches (of any size) were committed into this release. For testers,
|
||||
the number is the number of times their name was listed as assisting with
|
||||
testing a patch. Finally, for reporters, the number is the number of
|
||||
issues that they reported that were closed by commits that went into this
|
||||
release.
|
||||
|
||||
Coders Testers Reporters
|
||||
3 rmudgett 1 dcolombo
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Commits Not Associated with an Issue
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a list of all changes that went into this release that did not
|
||||
directly close an issue from the issue tracker. The commits may have been
|
||||
marked as being related to an issue. If that is the case, the issue
|
||||
numbers are listed here, as well.
|
||||
|
||||
+------------------------------------------------------------------------+
|
||||
| Revision | Author | Summary | Issues |
|
||||
| | | | Referenced |
|
||||
|----------+----------+-------------------------------------+------------|
|
||||
| 2315 | rmudgett | Fix hole in layer2_persistence | |
|
||||
| | | option for TE PTMP links. | |
|
||||
|----------+----------+-------------------------------------+------------|
|
||||
| 2318 | rmudgett | libpri: Make TE-PTP mode respond to | |
|
||||
| | | MDL TEI check requests. | |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Diffstat Results
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a summary of the changes to the source code that went into this
|
||||
release that was generated using the diffstat utility.
|
||||
|
||||
libpri.h | 66 +++++++++++++++++--
|
||||
pri.c | 12 ++-
|
||||
pri_q931.h | 2
|
||||
q921.c | 208 +++++++++++++++++++++++++++++++++++++------------------------
|
||||
q931.c | 38 +++++++----
|
||||
5 files changed, 224 insertions(+), 102 deletions(-)
|
||||
|
||||
----------------------------------------------------------------------
|
||||
@@ -1,38 +0,0 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><title>Release Summary - libpri-1.5.0</title><h1 align="center"><a name="top">Release Summary</a></h1><h3 align="center">libpri-1.5.0</h3><h3 align="center">Date: 2016-03-25</h3><h3 align="center"><asteriskteam@digium.com></h3><hr><h2 align="center">Table of Contents</h2><ol>
|
||||
<li><a href="#summary">Summary</a></li>
|
||||
<li><a href="#contributors">Contributors</a></li>
|
||||
<li><a href="#closed_issues">Closed Issues</a></li>
|
||||
<li><a href="#commits">Other Changes</a></li>
|
||||
<li><a href="#diffstat">Diffstat</a></li>
|
||||
</ol><hr><a name="summary"><h2 align="center">Summary</h2></a><center><a href="#top">[Back to Top]</a></center><p>This release is a point release of an existing major version. The changes included were made to address problems that have been identified in this release series, or are minor, backwards compatible new features or improvements. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous version are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p><p>The data in this summary reflects changes that have been made since the previous release, libpri-1.4.15.</p><hr><a name="contributors"><h2 align="center">Contributors</h2></a><center><a href="#top">[Back to Top]</a></center><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were affected by commits that went into this release.</p><table width="100%" border="0">
|
||||
<tr><th width="33%">Coders</th><th width="33%">Testers</th><th width="33%">Reporters</th></tr>
|
||||
<tr valign="top"><td width="33%">8 Richard Mudgett <rmudgett@digium.com><br/>2 Kevin Harwell <kharwell@lunkwill><br/>1 Gerald Schnabel<br/>1 Kevin Harwell <kharwell@digium.com><br/></td><td width="33%"><td width="33%">2 Alexandr Dranchuk <alex.dranchuk@gmail.com><br/>2 Richard Mudgett<br/>2 Alexandr Dranchuk<br/>1 Gerald Schnabel<br/>1 Gerald Schnabel <gs@starface.de><br/>1 Alec Davis <sivad.a@paradise.net.nz><br/>1 James Wilson <james.wilson@integratedvoip.com.au><br/></td></tr>
|
||||
</table><hr><a name="closed_issues"><h2 align="center">Closed Issues</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p><h3>Bug</h3><h4>Category: General</h4><a href="https://issues.asterisk.org/jira/browse/PRI-180">PRI-180</a>: Incorrect handling of DISCONNECT with Progress Indicator #8<br/>Reported by: Alexandr Dranchuk<ul>
|
||||
<li><a href="https://code.asterisk.org/code/changelog/libpri?cs=2952e95715f26ab239c58d1f0a8213c429514f05">[2952e95715]</a> Richard Mudgett -- q931.c: Fix DISCONNECT Progress Indicator ie handling.</li>
|
||||
<li><a href="https://code.asterisk.org/code/changelog/libpri?cs=7da3366cecf4641d4f27641f3ca5b2bc8dc147a4">[7da3366cec]</a> Richard Mudgett -- q931.c: Substitute PROGRESS for DISCONNECT with progress indicator #8</li>
|
||||
</ul><a href="https://issues.asterisk.org/jira/browse/PRI-74">PRI-74</a>: Unexpected Channel selection<br/>Reported by: James Wilson<ul>
|
||||
<li><a href="https://code.asterisk.org/code/changelog/libpri?cs=fc96191788943877b1ab96113c4804be3ce49753">[fc96191788]</a> Richard Mudgett -- q931.c: Made not recognize ie 0x01 for switches other than 4ESS, 5ESS, NI2, and DMS-100.</li>
|
||||
</ul><a href="https://issues.asterisk.org/jira/browse/PRI-76">PRI-76</a>: [patch] Limit octets received on Called Party Number and Calling Party Number<br/>Reported by: Alec Davis<ul>
|
||||
<li><a href="https://code.asterisk.org/code/changelog/libpri?cs=5fda3d8c68512cf2bdebce3e7cb573eb929eadbd">[5fda3d8c68]</a> Richard Mudgett -- q931.c: Send STATUS messages when receiving messages in the wrong call state.</li>
|
||||
</ul><br><hr><a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all changes that went into this release that did not reference a JIRA issue.</p><table width="100%" border="1">
|
||||
<tr><th>Revision</th><th>Author</th><th>Summary</th></tr>
|
||||
<tr><td><a href="https://code.asterisk.org/code/changelog/libpri?cs=9a90caa65e131259172fc5167477390ea3237ceb">9a90caa65e</a></td><td>Kevin Harwell</td><td>.version: Update for 1.5.0</td></tr>
|
||||
<tr><td><a href="https://code.asterisk.org/code/changelog/libpri?cs=5414ca525e4c7372e0721060f2259702e3e7a84f">5414ca525e</a></td><td>Kevin Harwell</td><td>.lastclean: Update for 1.5.0</td></tr>
|
||||
<tr><td><a href="https://code.asterisk.org/code/changelog/libpri?cs=c71499df2986c44e25d70840e71bd233d4fe7472">c71499df29</a></td><td>Kevin Harwell</td><td>Adding .cleancount and .gitreview files</td></tr>
|
||||
<tr><td><a href="https://code.asterisk.org/code/changelog/libpri?cs=734e922301bd6154fca4732b2ed693e761772e8b">734e922301</a></td><td>Richard Mudgett</td><td>Add .gitignore</td></tr>
|
||||
<tr><td><a href="https://code.asterisk.org/code/changelog/libpri?cs=a9722804c14b11bdeb483dc2825839a5dc7cd869">a9722804c1</a></td><td>Richard Mudgett</td><td>q931.c: Tighten mandatory ie checks.</td></tr>
|
||||
<tr><td><a href="https://code.asterisk.org/code/changelog/libpri?cs=6b2cc87b301d1871795cc4cd2d15e53f13e88e02">6b2cc87b30</a></td><td>Richard Mudgett</td><td>q931.c: Update ALERTING_NO_PROGRESS conditional code.</td></tr>
|
||||
<tr><td><a href="https://code.asterisk.org/code/changelog/libpri?cs=af8a550ff9566626d1d64a5596434d742b1b0ee5">af8a550ff9</a></td><td>Richard Mudgett</td><td>q921.c: Send DM and DISC frames with only three data octets instead of an extra fourth octet.</td></tr>
|
||||
</table><hr><a name="diffstat"><h2 align="center">Diffstat Results</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p><pre>ChangeLog | 2056 ---------------------------------------------
|
||||
b/.cleancount | 1
|
||||
b/.gitignore | 12
|
||||
b/.gitreview | 4
|
||||
b/.lastclean | 1
|
||||
b/.version | 2
|
||||
b/pri_internal.h | 7
|
||||
b/pri_q931.h | 3
|
||||
b/q921.c | 4
|
||||
b/q931.c | 383 ++++++--
|
||||
libpri-1.4.15-summary.html | 61 -
|
||||
libpri-1.4.15-summary.txt | 91 -
|
||||
12 files changed, 325 insertions(+), 2300 deletions(-)</pre><br></html>
|
||||
@@ -1,141 +0,0 @@
|
||||
Release Summary
|
||||
|
||||
libpri-1.5.0
|
||||
|
||||
Date: 2016-03-25
|
||||
|
||||
<asteriskteam@digium.com>
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Table of Contents
|
||||
|
||||
1. Summary
|
||||
2. Contributors
|
||||
3. Closed Issues
|
||||
4. Other Changes
|
||||
5. Diffstat
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Summary
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This release is a point release of an existing major version. The changes
|
||||
included were made to address problems that have been identified in this
|
||||
release series, or are minor, backwards compatible new features or
|
||||
improvements. Users should be able to safely upgrade to this version if
|
||||
this release series is already in use. Users considering upgrading from a
|
||||
previous version are strongly encouraged to review the UPGRADE.txt
|
||||
document as well as the CHANGES document for information about upgrading
|
||||
to this release series.
|
||||
|
||||
The data in this summary reflects changes that have been made since the
|
||||
previous release, libpri-1.4.15.
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Contributors
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This table lists the people who have submitted code, those that have
|
||||
tested patches, as well as those that reported issues on the issue tracker
|
||||
that were resolved in this release. For coders, the number is how many of
|
||||
their patches (of any size) were committed into this release. For testers,
|
||||
the number is the number of times their name was listed as assisting with
|
||||
testing a patch. Finally, for reporters, the number is the number of
|
||||
issues that they reported that were affected by commits that went into
|
||||
this release.
|
||||
|
||||
Coders Testers Reporters
|
||||
8 Richard Mudgett 2 Alexandr Dranchuk
|
||||
2 Kevin Harwell 2 Richard Mudgett
|
||||
1 Gerald Schnabel 2 Alexandr Dranchuk
|
||||
1 Kevin Harwell 1 Gerald Schnabel
|
||||
1 Gerald Schnabel
|
||||
1 Alec Davis
|
||||
1 James Wilson
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Closed Issues
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a list of all issues from the issue tracker that were closed by
|
||||
changes that went into this release.
|
||||
|
||||
Bug
|
||||
|
||||
Category: General
|
||||
|
||||
PRI-180: Incorrect handling of DISCONNECT with Progress Indicator #8
|
||||
Reported by: Alexandr Dranchuk
|
||||
* [2952e95715] Richard Mudgett -- q931.c: Fix DISCONNECT Progress
|
||||
Indicator ie handling.
|
||||
* [7da3366cec] Richard Mudgett -- q931.c: Substitute PROGRESS for
|
||||
DISCONNECT with progress indicator #8
|
||||
PRI-74: Unexpected Channel selection
|
||||
Reported by: James Wilson
|
||||
* [fc96191788] Richard Mudgett -- q931.c: Made not recognize ie 0x01 for
|
||||
switches other than 4ESS, 5ESS, NI2, and DMS-100.
|
||||
PRI-76: [patch] Limit octets received on Called Party Number and Calling
|
||||
Party Number
|
||||
Reported by: Alec Davis
|
||||
* [5fda3d8c68] Richard Mudgett -- q931.c: Send STATUS messages when
|
||||
receiving messages in the wrong call state.
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Commits Not Associated with an Issue
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a list of all changes that went into this release that did not
|
||||
reference a JIRA issue.
|
||||
|
||||
+------------------------------------------------------------------------+
|
||||
| Revision | Author | Summary |
|
||||
|------------+-----------------+-----------------------------------------|
|
||||
| 9a90caa65e | Kevin Harwell | .version: Update for 1.5.0 |
|
||||
|------------+-----------------+-----------------------------------------|
|
||||
| 5414ca525e | Kevin Harwell | .lastclean: Update for 1.5.0 |
|
||||
|------------+-----------------+-----------------------------------------|
|
||||
| c71499df29 | Kevin Harwell | Adding .cleancount and .gitreview files |
|
||||
|------------+-----------------+-----------------------------------------|
|
||||
| 734e922301 | Richard Mudgett | Add .gitignore |
|
||||
|------------+-----------------+-----------------------------------------|
|
||||
| a9722804c1 | Richard Mudgett | q931.c: Tighten mandatory ie checks. |
|
||||
|------------+-----------------+-----------------------------------------|
|
||||
| 6b2cc87b30 | Richard Mudgett | q931.c: Update ALERTING_NO_PROGRESS |
|
||||
| | | conditional code. |
|
||||
|------------+-----------------+-----------------------------------------|
|
||||
| | | q921.c: Send DM and DISC frames with |
|
||||
| af8a550ff9 | Richard Mudgett | only three data octets instead of an |
|
||||
| | | extra fourth octet. |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Diffstat Results
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a summary of the changes to the source code that went into this
|
||||
release that was generated using the diffstat utility.
|
||||
|
||||
ChangeLog | 2056 ---------------------------------------------
|
||||
b/.cleancount | 1
|
||||
b/.gitignore | 12
|
||||
b/.gitreview | 4
|
||||
b/.lastclean | 1
|
||||
b/.version | 2
|
||||
b/pri_internal.h | 7
|
||||
b/pri_q931.h | 3
|
||||
b/q921.c | 4
|
||||
b/q931.c | 383 ++++++--
|
||||
libpri-1.4.15-summary.html | 61 -
|
||||
libpri-1.4.15-summary.txt | 91 -
|
||||
12 files changed, 325 insertions(+), 2300 deletions(-)
|
||||
@@ -647,13 +647,10 @@ struct q931_call {
|
||||
unsigned char char_set;
|
||||
} display;
|
||||
|
||||
/*! AOC charge requesting on Setup */
|
||||
/* AOC charge requesting on Setup */
|
||||
int aoc_charging_request;
|
||||
|
||||
/*! TRUE if the slotmap is E1 (32 bits). */
|
||||
unsigned int slotmap_size:1;
|
||||
/*! TRUE if need to see the channel id ie in first response to SETUP. */
|
||||
unsigned int channel_id_ie_mandatory:1;
|
||||
unsigned int slotmap_size:1;/* TRUE if the slotmap is E1 (32 bits). */
|
||||
|
||||
/*! Control the RESTART reception to the upper layer. */
|
||||
struct {
|
||||
|
||||
@@ -138,6 +138,9 @@ typedef struct q931_ie {
|
||||
#define SERVICE_CHANGE_STATUS_REQCONTINUITYCHECK 3 /* not supported */
|
||||
#define SERVICE_CHANGE_STATUS_SHUTDOWN 4 /* not supported */
|
||||
|
||||
/* Special codeset 0 IE */
|
||||
#define NATIONAL_CHANGE_STATUS 0x1
|
||||
|
||||
/* Q.931 / National ISDN Information Elements */
|
||||
#define Q931_LOCKING_SHIFT 0x90
|
||||
#define Q931_NON_LOCKING_SHIFT 0x98
|
||||
|
||||
4
q921.c
4
q921.c
@@ -313,7 +313,7 @@ static void q921_send_dm(struct q921_link *link, int fbit)
|
||||
if (ctrl->debug & PRI_DEBUG_Q921_STATE) {
|
||||
pri_message(ctrl, "TEI=%d Sending DM\n", link->tei);
|
||||
}
|
||||
q921_transmit(ctrl, &h, 3);
|
||||
q921_transmit(ctrl, &h, 4);
|
||||
}
|
||||
|
||||
static void q921_send_disc(struct q921_link *link, int pbit)
|
||||
@@ -342,7 +342,7 @@ static void q921_send_disc(struct q921_link *link, int pbit)
|
||||
if (ctrl->debug & PRI_DEBUG_Q921_STATE) {
|
||||
pri_message(ctrl, "TEI=%d Sending DISC\n", link->tei);
|
||||
}
|
||||
q921_transmit(ctrl, &h, 3);
|
||||
q921_transmit(ctrl, &h, 4);
|
||||
}
|
||||
|
||||
static void q921_send_ua(struct q921_link *link, int fbit)
|
||||
|
||||
391
q931.c
391
q931.c
@@ -40,12 +40,6 @@
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
|
||||
enum mandatory_ie_status {
|
||||
MAND_STATUS_OK,
|
||||
MAND_STATUS_CONTENT_ERROR,
|
||||
MAND_STATUS_MISSING,
|
||||
};
|
||||
|
||||
#define MAX_MAND_IES 10
|
||||
|
||||
struct msgtype {
|
||||
@@ -56,27 +50,13 @@ struct msgtype {
|
||||
|
||||
static struct msgtype msgs[] = {
|
||||
/* Call establishment messages */
|
||||
{ Q931_ALERTING, "ALERTING", { Q931_CHANNEL_IDENT } },
|
||||
{ Q931_CALL_PROCEEDING, "CALL PROCEEDING", { Q931_CHANNEL_IDENT } },
|
||||
{ Q931_CONNECT, "CONNECT", { Q931_CHANNEL_IDENT } },
|
||||
{ Q931_ALERTING, "ALERTING" },
|
||||
{ Q931_CALL_PROCEEDING, "CALL PROCEEDING" },
|
||||
{ Q931_CONNECT, "CONNECT" },
|
||||
{ Q931_CONNECT_ACKNOWLEDGE, "CONNECT ACKNOWLEDGE" },
|
||||
/*
|
||||
* Very early in libpri SVN history (SVN -r154) a change was explicitly
|
||||
* made to not care about a missing Progress Indicator ie. There is no
|
||||
* explanation in the commit message why this was done even though
|
||||
* Q.931 and ECMA-143 clearly show that the ie is mandatory for a
|
||||
* PROGRESS message.
|
||||
*
|
||||
* Hazzarding a guess, I think it was because of the
|
||||
* ALERTING_NO_PROGRESS support for Mitel switches. (SVN -r44)
|
||||
*/
|
||||
#ifdef ALERTING_NO_PROGRESS
|
||||
{ Q931_PROGRESS, "PROGRESS" },
|
||||
#else
|
||||
{ Q931_PROGRESS, "PROGRESS", { Q931_PROGRESS_INDICATOR } },
|
||||
#endif
|
||||
{ Q931_SETUP, "SETUP", { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT } },
|
||||
{ Q931_SETUP_ACKNOWLEDGE, "SETUP ACKNOWLEDGE", { Q931_CHANNEL_IDENT } },
|
||||
{ Q931_SETUP_ACKNOWLEDGE, "SETUP ACKNOWLEDGE" },
|
||||
|
||||
/* Call disestablishment messages */
|
||||
{ Q931_DISCONNECT, "DISCONNECT", { Q931_CAUSE } },
|
||||
@@ -113,7 +93,7 @@ static struct msgtype msgs[] = {
|
||||
{ Q931_ANY_MESSAGE, "ANY MESSAGE" },
|
||||
};
|
||||
|
||||
static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct q931_call *c, enum mandatory_ie_status mand_status);
|
||||
static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct q931_call *c, int missingmand);
|
||||
static void nt_ptmp_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct q931_call *c, int *allow_event, int *allow_posthandle);
|
||||
|
||||
struct msgtype att_maintenance_msgs[] = {
|
||||
@@ -1278,14 +1258,6 @@ static int receive_channel_id(int full_ie, struct pri *ctrl, q931_call *call, in
|
||||
int pos = 0;
|
||||
int need_extended_channel_octets;/*!< TRUE if octets 3.2 and 3.3 need to be present. */
|
||||
|
||||
call->channel_id_ie_mandatory = 0;
|
||||
|
||||
if (ie->len < 1) {
|
||||
/* Must have at least one payload octet. */
|
||||
pri_error(ctrl, "!! Channel Identification ie too short\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
call->restart.count = 0;
|
||||
|
||||
if (ie->data[0] & 0x08) {
|
||||
@@ -1336,24 +1308,10 @@ static int receive_channel_id(int full_ie, struct pri *ctrl, q931_call *call, in
|
||||
|
||||
pos++;
|
||||
if (ie->data[0] & 0x40) {
|
||||
/* Explicitly defined DS1 (One or more 3.1 octets expected) */
|
||||
if (ctrl->switchtype == PRI_SWITCH_QSIG) {
|
||||
pri_error(ctrl, "!! Q.SIG does not support Channel Identification octet 3.1\n");
|
||||
return -1;
|
||||
}
|
||||
if (ie->len <= pos) {
|
||||
pri_error(ctrl, "!! Missing expected Channel Identification octet 3.1\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Extract explicit DS1 reference. */
|
||||
call->ds1no = ie->data[pos] & 0x7f;
|
||||
/* DS1 specified -- stop here */
|
||||
call->ds1no = ie->data[1] & 0x7f;
|
||||
call->ds1explicit = 1;
|
||||
|
||||
/* Advance to 3.2 octet if present. */
|
||||
do {
|
||||
++pos;
|
||||
} while (pos < ie->len && !(ie->data[pos - 1] & 0x80));
|
||||
pos++;
|
||||
} else {
|
||||
call->ds1explicit = 0;
|
||||
}
|
||||
@@ -1366,12 +1324,8 @@ static int receive_channel_id(int full_ie, struct pri *ctrl, q931_call *call, in
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (need_extended_channel_octets && pos + 2 <= ie->len) {
|
||||
/*
|
||||
* Octet 3.2 and at least one octet 3.3 are present.
|
||||
*
|
||||
* Process octet 3.2
|
||||
*/
|
||||
if (need_extended_channel_octets && pos + 2 < len) {
|
||||
/* More coming */
|
||||
if ((ie->data[pos] & 0x0f) != 3) {
|
||||
/* Channel type/mapping is not for B channel units. */
|
||||
pri_error(ctrl, "!! Unexpected Channel Type %d\n", ie->data[pos] & 0x0f);
|
||||
@@ -1381,25 +1335,14 @@ static int receive_channel_id(int full_ie, struct pri *ctrl, q931_call *call, in
|
||||
pri_error(ctrl, "!! Invalid CCITT coding %d\n", (ie->data[pos] & 0x60) >> 5);
|
||||
return -1;
|
||||
}
|
||||
if (ie->data[pos++] & 0x10) {
|
||||
/* Process 3.3 octets as a Slot Map */
|
||||
if (ie->data[pos] & 0x10) {
|
||||
/* Expect Slot Map */
|
||||
call->slotmap = 0;
|
||||
pos++;
|
||||
call->slotmap_size = (ie->len - pos > 3) ? 1 : 0;
|
||||
|
||||
/*
|
||||
* We will be tolerant of partial slot maps that do not
|
||||
* specify the upper channels. We will assume they
|
||||
* are not requested.
|
||||
*
|
||||
* We will only read up to 24 or 32 bit channel maps.
|
||||
*/
|
||||
for (x = call->slotmap_size ? 4 : 3; x--;) {
|
||||
for (x = 0; x < (call->slotmap_size ? 4 : 3); ++x) {
|
||||
call->slotmap <<= 8;
|
||||
call->slotmap |= ie->data[pos++];
|
||||
if (ie->len <= pos) {
|
||||
/* No more ie contents. */
|
||||
break;
|
||||
}
|
||||
call->slotmap |= ie->data[x + pos];
|
||||
}
|
||||
|
||||
if (msgtype == Q931_RESTART) {
|
||||
@@ -1414,11 +1357,8 @@ static int receive_channel_id(int full_ie, struct pri *ctrl, q931_call *call, in
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/*
|
||||
* Process 3.3 octets as either a single channel or a channel list
|
||||
*
|
||||
* Get single channel
|
||||
*/
|
||||
pos++;
|
||||
/* Only expect a particular channel */
|
||||
call->channelno = ie->data[pos] & 0x7f;
|
||||
if (ctrl->chan_mapping_logical && call->channelno > 15) {
|
||||
call->channelno++;
|
||||
@@ -1445,9 +1385,6 @@ static int receive_channel_id(int full_ie, struct pri *ctrl, q931_call *call, in
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (need_extended_channel_octets) {
|
||||
pri_error(ctrl, "!! Missing expected Channel Identification octets 3.2 or 3.3\n");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1581,29 +1518,21 @@ static void dump_channel_id(int full_ie, struct pri *ctrl, q931_ie *ie, int len,
|
||||
(ie->data[0] & 0x08) ? "Exclusive" : "Preferred",
|
||||
(ie->data[0] & 0x04) ? 1 : 0);
|
||||
pri_message(ctrl, "%c ChanSel: %s\n",
|
||||
prefix, msg_chan_sel[(ie->data[0] & 0x03) | ((ie->data[0] & 0x20) >> 3)]);
|
||||
prefix, msg_chan_sel[(ie->data[0] & 0x03) | ((ie->data[0] >> 3) & 0x04)]);
|
||||
pos = 1;
|
||||
len -= 2;
|
||||
if (ie->data[0] & 0x40) {
|
||||
/* Explicitly defined DS1 (One or more 3.1 octets expected) */
|
||||
if (ctrl->switchtype == PRI_SWITCH_QSIG) {
|
||||
pri_message(ctrl, "%c Octet 3.1 specified when Q.SIG!\n",
|
||||
prefix);
|
||||
}
|
||||
if (pos < len) {
|
||||
do {
|
||||
pri_message(ctrl, "%c Ext: %d DS1 Identifier: %d\n",
|
||||
prefix, (ie->data[pos] & 0x80) >> 7, ie->data[pos] & 0x7f);
|
||||
++pos;
|
||||
} while (!(ie->data[pos - 1] & 0x80) && pos < len);
|
||||
} else {
|
||||
pri_message(ctrl, "%c Octet 3.1 is missing!\n", prefix);
|
||||
}
|
||||
/* Explicitly defined DS1 */
|
||||
do {
|
||||
pri_message(ctrl, "%c Ext: %d DS1 Identifier: %d \n",
|
||||
prefix, (ie->data[pos] & 0x80) >> 7, ie->data[pos] & 0x7f);
|
||||
++pos;
|
||||
} while (!(ie->data[pos - 1] & 0x80) && pos < len);
|
||||
} else {
|
||||
/* Implicitly defined DS1 */
|
||||
}
|
||||
if (pos < len) {
|
||||
/* Octet 3.2 present */
|
||||
/* Still more information here */
|
||||
pri_message(ctrl,
|
||||
"%c Ext: %d Coding: %d %s Specified Channel Type: %d\n",
|
||||
prefix, (ie->data[pos] & 0x80) >> 7, (ie->data[pos] & 60) >> 5,
|
||||
@@ -1611,7 +1540,6 @@ static void dump_channel_id(int full_ie, struct pri *ctrl, q931_ie *ie, int len,
|
||||
++pos;
|
||||
}
|
||||
if (pos < len) {
|
||||
/* One or more 3.3 octets present */
|
||||
if (!(ie->data[pos - 1] & 0x10)) {
|
||||
/* Number specified */
|
||||
do {
|
||||
@@ -2753,33 +2681,10 @@ static void dump_change_status(int full_ie, struct pri *ctrl, q931_ie *ie, int l
|
||||
pri_message(ctrl, " %02x", ie->data[x] & 0x7f);
|
||||
}
|
||||
pri_message(ctrl, " ]\n");
|
||||
|
||||
switch (ctrl->switchtype) {
|
||||
case PRI_SWITCH_NI2:
|
||||
case PRI_SWITCH_DMS100:
|
||||
case PRI_SWITCH_LUCENT5E:
|
||||
case PRI_SWITCH_ATT4ESS:
|
||||
break;
|
||||
default:
|
||||
/* ie not supported by this switch type */
|
||||
pri_message(ctrl, "%c %s is treated as unknown by current switch type.\n",
|
||||
prefix, ie2str(full_ie));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static int receive_change_status(int full_ie, struct pri *ctrl, q931_call *call, int msgtype, q931_ie *ie, int len)
|
||||
{
|
||||
switch (ctrl->switchtype) {
|
||||
case PRI_SWITCH_NI2:
|
||||
case PRI_SWITCH_DMS100:
|
||||
case PRI_SWITCH_LUCENT5E:
|
||||
case PRI_SWITCH_ATT4ESS:
|
||||
break;
|
||||
default:
|
||||
/* ie not supported by this switch type */
|
||||
return -1;
|
||||
}
|
||||
call->changestatus = ie->data[0] & 0x0f;
|
||||
return 0;
|
||||
}
|
||||
@@ -2936,7 +2841,7 @@ static int receive_progress_indicator(int full_ie, struct pri *ctrl, q931_call *
|
||||
break;
|
||||
default:
|
||||
pri_error(ctrl, "XXX Invalid Progress indicator value received: %02x\n",(ie->data[1] & 0x7f));
|
||||
return -1;
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -4050,11 +3955,8 @@ static int transmit_reverse_charging_indication(int full_ie, struct pri *ctrl, q
|
||||
}
|
||||
|
||||
static struct ie ies[] = {
|
||||
/* Codeset 0 - Comprehension required ie's with varying support. */
|
||||
{ 1, Q931_IE_SEGMENTED_MSG, "Segmented Message" }, /* Not supported. Just ie name is available for message decode. */
|
||||
{ 1, Q931_IE_CHANGE_STATUS, "Change Status Information", dump_change_status, receive_change_status, transmit_change_status },
|
||||
|
||||
/* Codeset 0 - Common */
|
||||
{ 1, NATIONAL_CHANGE_STATUS, "Change Status Information", dump_change_status, receive_change_status, transmit_change_status },
|
||||
{ 0, Q931_LOCKING_SHIFT, "Locking Shift", dump_shift },
|
||||
{ 0, Q931_BEARER_CAPABILITY, "Bearer Capability", dump_bearer_capability, receive_bearer_capability, transmit_bearer_capability },
|
||||
{ 0, Q931_CAUSE, "Cause", dump_cause, receive_cause, transmit_cause },
|
||||
@@ -4086,6 +3988,7 @@ static struct ie ies[] = {
|
||||
{ 1, Q931_IE_FEATURE_ACTIVATE, "Feature Activation" },
|
||||
{ 1, Q931_IE_INFO_REQUEST, "Feature Request" },
|
||||
{ 1, Q931_IE_FEATURE_IND, "Feature Indication" },
|
||||
{ 1, Q931_IE_SEGMENTED_MSG, "Segmented Message" },
|
||||
{ 1, Q931_IE_CALL_IDENTITY, "Call Identity", dump_call_identity },
|
||||
{ 1, Q931_IE_ENDPOINT_ID, "Endpoint Identification" },
|
||||
{ 1, Q931_IE_NOTIFY_IND, "Notification Indicator", dump_notify, receive_notify, transmit_notify },
|
||||
@@ -4097,6 +4000,7 @@ static struct ie ies[] = {
|
||||
{ 1, Q931_IE_USER_USER, "User-User Information", dump_user_user, receive_user_user, transmit_user_user },
|
||||
{ 1, Q931_IE_ESCAPE_FOR_EXT, "Escape for Extension" },
|
||||
{ 1, Q931_IE_CALL_STATUS, "Call Status" },
|
||||
{ 1, Q931_IE_CHANGE_STATUS, "Change Status Information", dump_change_status, receive_change_status, transmit_change_status },
|
||||
{ 1, Q931_IE_CONNECTED_ADDR, "Connected Address", dump_connected_number, receive_connected_number, transmit_connected_number },
|
||||
{ 1, Q931_IE_CONNECTED_NUM, "Connected Number", dump_connected_number, receive_connected_number, transmit_connected_number },
|
||||
{ 1, Q931_IE_CONNECTED_SUBADDR, "Connected Subaddress", dump_connected_subaddr, receive_connected_subaddr, transmit_connected_subaddr },
|
||||
@@ -4888,7 +4792,7 @@ static int add_ie(struct pri *ctrl, q931_call *call, int msgtype, int ie, q931_i
|
||||
}
|
||||
return total_res;
|
||||
} else {
|
||||
pri_error(ctrl, "!! Don't know how to add IE %d (%s)\n", ie, ie2str(ie));
|
||||
pri_error(ctrl, "!! Don't know how to add an IE %s (%d)\n", ie2str(ie), ie);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@@ -5709,12 +5613,11 @@ int q931_notify(struct pri *ctrl, q931_call *c, int channel, int info)
|
||||
return q931_notify_redirection(ctrl, c, info, NULL, NULL);
|
||||
}
|
||||
|
||||
static int call_progress_ies[] = {
|
||||
#ifndef ALERTING_NO_PROGRESS
|
||||
Q931_PROGRESS_INDICATOR,
|
||||
#ifdef ALERTING_NO_PROGRESS
|
||||
static int call_progress_ies[] = { -1 };
|
||||
#else
|
||||
static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
|
||||
#endif
|
||||
-1
|
||||
};
|
||||
|
||||
int q931_call_progress(struct pri *ctrl, q931_call *c, int channel, int info)
|
||||
{
|
||||
@@ -5742,13 +5645,11 @@ int q931_call_progress(struct pri *ctrl, q931_call *c, int channel, int info)
|
||||
return send_message(ctrl, c, Q931_PROGRESS, call_progress_ies);
|
||||
}
|
||||
|
||||
static int call_progress_with_cause_ies[] = {
|
||||
Q931_CAUSE,
|
||||
#ifndef ALERTING_NO_PROGRESS
|
||||
Q931_PROGRESS_INDICATOR,
|
||||
#ifdef ALERTING_NO_PROGRESS
|
||||
static int call_progress_with_cause_ies[] = { Q931_CAUSE, -1 };
|
||||
#else
|
||||
static int call_progress_with_cause_ies[] = { Q931_CAUSE, Q931_PROGRESS_INDICATOR, -1 };
|
||||
#endif
|
||||
-1
|
||||
};
|
||||
|
||||
int q931_call_progress_with_cause(struct pri *ctrl, q931_call *c, int channel, int info, int cause)
|
||||
{
|
||||
@@ -5780,13 +5681,11 @@ int q931_call_progress_with_cause(struct pri *ctrl, q931_call *c, int channel, i
|
||||
return send_message(ctrl, c, Q931_PROGRESS, call_progress_with_cause_ies);
|
||||
}
|
||||
|
||||
static int call_proceeding_ies[] = {
|
||||
Q931_CHANNEL_IDENT,
|
||||
#ifndef ALERTING_NO_PROGRESS
|
||||
Q931_PROGRESS_INDICATOR,
|
||||
#ifdef ALERTING_NO_PROGRESS
|
||||
static int call_proceeding_ies[] = { Q931_CHANNEL_IDENT, -1 };
|
||||
#else
|
||||
static int call_proceeding_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, -1 };
|
||||
#endif
|
||||
-1
|
||||
};
|
||||
|
||||
int q931_call_proceeding(struct pri *ctrl, q931_call *c, int channel, int info)
|
||||
{
|
||||
@@ -5817,15 +5716,11 @@ int q931_call_proceeding(struct pri *ctrl, q931_call *c, int channel, int info)
|
||||
c->alive = 1;
|
||||
return send_message(ctrl, c, Q931_CALL_PROCEEDING, call_proceeding_ies);
|
||||
}
|
||||
|
||||
static int alerting_ies[] = {
|
||||
Q931_IE_FACILITY,
|
||||
#ifndef ALERTING_NO_PROGRESS
|
||||
Q931_PROGRESS_INDICATOR,
|
||||
static int alerting_ies[] = { Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_IE_USER_USER, -1 };
|
||||
#else
|
||||
static int alerting_ies[] = { Q931_IE_FACILITY, -1 };
|
||||
#endif
|
||||
Q931_IE_USER_USER,
|
||||
-1
|
||||
};
|
||||
|
||||
int q931_alerting(struct pri *ctrl, q931_call *c, int channel, int info)
|
||||
{
|
||||
@@ -6388,9 +6283,6 @@ int q931_setup(struct pri *ctrl, q931_call *c, struct pri_sr *req)
|
||||
c->chanflags = FLAG_PREFERRED;
|
||||
}
|
||||
}
|
||||
if (ctrl->localtype == PRI_CPE) {
|
||||
c->channel_id_ie_mandatory = 1;
|
||||
}
|
||||
|
||||
c->slotmap = -1;
|
||||
c->nonisdn = req->nonisdn;
|
||||
@@ -7381,8 +7273,6 @@ static int prepare_to_handle_q931_message(struct pri *ctrl, q931_mh *mh, q931_ca
|
||||
c->cause = -1;
|
||||
c->causecode = -1;
|
||||
c->causeloc = -1;
|
||||
c->progress = -1;
|
||||
c->progressmask = 0;
|
||||
c->aoc_units = -1;
|
||||
pri_schedule_del(ctrl, c->retranstimer);
|
||||
c->retranstimer = 0;
|
||||
@@ -7587,13 +7477,12 @@ int q931_receive(struct q921_link *link, q931_h *h, int len)
|
||||
int res;
|
||||
int r;
|
||||
int mandies[MAX_MAND_IES];
|
||||
int is_mandatory;
|
||||
int missingmand;
|
||||
int codeset, cur_codeset;
|
||||
int last_ie[8];
|
||||
int cref;
|
||||
int allow_event;
|
||||
int allow_posthandle;
|
||||
enum mandatory_ie_status mand_status;
|
||||
|
||||
ctrl = link->ctrl;
|
||||
memset(last_ie, 0, sizeof(last_ie));
|
||||
@@ -7673,7 +7562,7 @@ int q931_receive(struct q921_link *link, q931_h *h, int len)
|
||||
q931_clr_subcommands(ctrl);
|
||||
q931_display_clear(c);
|
||||
|
||||
/* Determine which ies are mandatory for this message. */
|
||||
/* Handle IEs */
|
||||
memset(mandies, 0, sizeof(mandies));
|
||||
for (x = 0; x < ARRAY_LEN(msgs); ++x) {
|
||||
if (msgs[x].msgnum == mh->msg) {
|
||||
@@ -7681,25 +7570,6 @@ int q931_receive(struct q921_link *link, q931_h *h, int len)
|
||||
break;
|
||||
}
|
||||
}
|
||||
for (x = 0; x < ARRAY_LEN(mandies); ++x) {
|
||||
if (mandies[x]) {
|
||||
/* Check mandatory channel identification ie exceptions */
|
||||
if (mandies[x] != Q931_CHANNEL_IDENT
|
||||
/* Always mandatory for RESUME_ACKNOWLEDGE */
|
||||
|| mh->msg == Q931_RESUME_ACKNOWLEDGE
|
||||
/* Mandatory in Net -> CPE direction for SETUP */
|
||||
|| (mh->msg == Q931_SETUP && ctrl->localtype == PRI_CPE)
|
||||
/* Mandatory for first SETUP response message in Net -> CPE direction. */
|
||||
|| c->channel_id_ie_mandatory) {
|
||||
/* ie is mandatory for this message */
|
||||
continue;
|
||||
}
|
||||
/* ie is not mandatory for this message */
|
||||
mandies[x] = 0;
|
||||
}
|
||||
}
|
||||
mand_status = MAND_STATUS_OK;
|
||||
|
||||
/* Do real IE processing */
|
||||
len -= (h->crlen + 3);
|
||||
codeset = cur_codeset = 0;
|
||||
@@ -7716,16 +7586,10 @@ int q931_receive(struct q921_link *link, q931_h *h, int len)
|
||||
q931_display_clear(c);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Check if processing a mandatory ie. */
|
||||
is_mandatory = 0;
|
||||
for (y = 0; y < ARRAY_LEN(mandies); ++y) {
|
||||
if (mandies[y] == Q931_FULL_IE(cur_codeset, ie->ie)) {
|
||||
if (mandies[y] == Q931_FULL_IE(cur_codeset, ie->ie))
|
||||
mandies[y] = 0;
|
||||
is_mandatory = 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Special processing for codeset shifts */
|
||||
switch (ie->ie & 0xf8) {
|
||||
case Q931_LOCKING_SHIFT:
|
||||
@@ -7768,15 +7632,6 @@ int q931_receive(struct q921_link *link, q931_h *h, int len)
|
||||
/* Fall through */
|
||||
default:
|
||||
y = q931_handle_ie(cur_codeset, ctrl, c, mh->msg, ie);
|
||||
if (y < 0 && is_mandatory) {
|
||||
/* Error processing mandatory ie. */
|
||||
mand_status = MAND_STATUS_CONTENT_ERROR;
|
||||
pri_error(ctrl, "%s: Error in mandatory IE %d (cs%d, %s)\n",
|
||||
msg2str(mh->msg),
|
||||
ie->ie,
|
||||
cur_codeset,
|
||||
ie2str(Q931_FULL_IE(codeset, ie->ie)));
|
||||
}
|
||||
/* XXX Applicable to codeset 0 only? XXX */
|
||||
if (!cur_codeset && !(ie->ie & 0xf0) && (y < 0)) {
|
||||
/*
|
||||
@@ -7793,21 +7648,19 @@ int q931_receive(struct q921_link *link, q931_h *h, int len)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Check for missing mandatory ies. */
|
||||
missingmand = 0;
|
||||
for (x = 0; x < ARRAY_LEN(mandies); ++x) {
|
||||
if (mandies[x]) {
|
||||
/* This mandatory ie was not processed. */
|
||||
mand_status = MAND_STATUS_MISSING;
|
||||
pri_error(ctrl, "%s: Missing mandatory IE %d (cs%d, %s)\n",
|
||||
msg2str(mh->msg),
|
||||
Q931_IE_IE(mandies[x]),
|
||||
Q931_IE_CODESET(mandies[x]),
|
||||
ie2str(mandies[x]));
|
||||
/* check if there is no channel identification when we're configured as network -> that's not an error */
|
||||
if (((ctrl->localtype != PRI_NETWORK) || (mh->msg != Q931_SETUP) || (mandies[x] != Q931_CHANNEL_IDENT)) &&
|
||||
((mh->msg != Q931_PROGRESS) || (mandies[x] != Q931_PROGRESS_INDICATOR))) {
|
||||
pri_error(ctrl, "XXX Missing handling for mandatory IE %d (cs%d, %s) XXX\n", Q931_IE_IE(mandies[x]), Q931_IE_CODESET(mandies[x]), ie2str(mandies[x]));
|
||||
missingmand++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (mand_status == MAND_STATUS_OK) {
|
||||
if (!missingmand) {
|
||||
switch (mh->msg) {
|
||||
case Q931_SETUP:
|
||||
case Q931_CONNECT:
|
||||
@@ -7843,7 +7696,7 @@ int q931_receive(struct q921_link *link, q931_h *h, int len)
|
||||
}
|
||||
|
||||
if (allow_posthandle) {
|
||||
res = post_handle_q931_message(ctrl, mh, c, mand_status);
|
||||
res = post_handle_q931_message(ctrl, mh, c, missingmand);
|
||||
if (res == Q931_RES_HAVEEVENT && !allow_event) {
|
||||
res = 0;
|
||||
}
|
||||
@@ -8713,7 +8566,7 @@ static void q931_restart_notify(struct q931_call *call)
|
||||
* \param ctrl D channel controller.
|
||||
* \param mh Q.931 message header.
|
||||
* \param c Q.931 call leg.
|
||||
* \param mand_status Mandatory ie status
|
||||
* \param missingmand Number of missing mandatory ie's.
|
||||
*
|
||||
* \note
|
||||
* When this function returns c may be destroyed so you can no
|
||||
@@ -8723,33 +8576,19 @@ static void q931_restart_notify(struct q931_call *call)
|
||||
* \retval Q931_RES_HAVEEVENT if have an event.
|
||||
* \retval -1 on error.
|
||||
*/
|
||||
static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct q931_call *c, enum mandatory_ie_status mand_status)
|
||||
static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct q931_call *c, int missingmand)
|
||||
{
|
||||
int res;
|
||||
int changed;
|
||||
int mand_cause;
|
||||
enum Q931_CALL_STATE ourcallstate_orig;
|
||||
struct apdu_event *cur = NULL;
|
||||
struct pri_subcommand *subcmd;
|
||||
struct q931_call *master_call;
|
||||
|
||||
mand_cause = 0;
|
||||
switch (mand_status) {
|
||||
case MAND_STATUS_OK:
|
||||
break;
|
||||
case MAND_STATUS_CONTENT_ERROR:
|
||||
mand_cause = PRI_CAUSE_INVALID_IE_CONTENTS;
|
||||
break;
|
||||
case MAND_STATUS_MISSING:
|
||||
mand_cause = PRI_CAUSE_MANDATORY_IE_MISSING;
|
||||
break;
|
||||
}
|
||||
|
||||
switch(mh->msg) {
|
||||
case Q931_RESTART:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
q931_status(ctrl, c, mand_cause);
|
||||
if (missingmand) {
|
||||
q931_status(ctrl, c, PRI_CAUSE_MANDATORY_IE_MISSING);
|
||||
pri_destroycall(ctrl, c);
|
||||
break;
|
||||
}
|
||||
@@ -8807,8 +8646,9 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
return Q931_RES_HAVEEVENT;
|
||||
case Q931_SETUP:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
q931_release_complete(ctrl, c, mand_cause);
|
||||
|
||||
if (missingmand) {
|
||||
q931_release_complete(ctrl, c, PRI_CAUSE_MANDATORY_IE_MISSING);
|
||||
break;
|
||||
}
|
||||
/* Must be new call */
|
||||
@@ -8851,24 +8691,11 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
return Q931_RES_HAVEEVENT;
|
||||
case Q931_ALERTING:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
q931_status(ctrl, c, mand_cause);
|
||||
break;
|
||||
}
|
||||
stop_t303(c->master_call);
|
||||
if (c->newcall) {
|
||||
q931_release_complete(ctrl, c, newcall_rel_comp_cause(c));
|
||||
break;
|
||||
}
|
||||
switch (c->ourcallstate) {
|
||||
default:
|
||||
q931_status(ctrl, c, PRI_CAUSE_WRONG_CALL_STATE);
|
||||
return 0;
|
||||
case Q931_CALL_STATE_CALL_INITIATED:
|
||||
case Q931_CALL_STATE_OVERLAP_SENDING:
|
||||
case Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING:
|
||||
break;
|
||||
}
|
||||
UPDATE_OURCALLSTATE(ctrl, c, Q931_CALL_STATE_CALL_DELIVERED);
|
||||
c->peercallstate = Q931_CALL_STATE_CALL_RECEIVED;
|
||||
ctrl->ev.e = PRI_EVENT_RINGING;
|
||||
@@ -8900,10 +8727,6 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
return Q931_RES_HAVEEVENT;
|
||||
case Q931_CONNECT:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
q931_status(ctrl, c, mand_cause);
|
||||
break;
|
||||
}
|
||||
stop_t303(c->master_call);
|
||||
if (c->newcall) {
|
||||
q931_release_complete(ctrl, c, newcall_rel_comp_cause(c));
|
||||
@@ -8982,15 +8805,16 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
}
|
||||
break;
|
||||
case Q931_PROGRESS:
|
||||
if (missingmand) {
|
||||
q931_status(ctrl, c, PRI_CAUSE_MANDATORY_IE_MISSING);
|
||||
pri_destroycall(ctrl, c);
|
||||
break;
|
||||
}
|
||||
ctrl->ev.e = PRI_EVENT_PROGRESS;
|
||||
ctrl->ev.proceeding.cause = c->cause;
|
||||
/* Fall through */
|
||||
case Q931_CALL_PROCEEDING:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
q931_status(ctrl, c, mand_cause);
|
||||
break;
|
||||
}
|
||||
stop_t303(c->master_call);
|
||||
ctrl->ev.proceeding.subcmds = &ctrl->subcmds;
|
||||
if (c->newcall) {
|
||||
@@ -9042,8 +8866,11 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
}
|
||||
switch (c->ourcallstate) {
|
||||
default:
|
||||
q931_status(ctrl, c, PRI_CAUSE_WRONG_CALL_STATE);
|
||||
return 0;
|
||||
if (ctrl->localtype == PRI_NETWORK || ctrl->switchtype == PRI_SWITCH_QSIG) {
|
||||
q931_status(ctrl, c, PRI_CAUSE_WRONG_MESSAGE);
|
||||
break;
|
||||
}
|
||||
/* Fall through */
|
||||
case Q931_CALL_STATE_CONNECT_REQUEST:
|
||||
case Q931_CALL_STATE_ACTIVE:
|
||||
UPDATE_OURCALLSTATE(ctrl, c, Q931_CALL_STATE_ACTIVE);
|
||||
@@ -9060,8 +8887,9 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
break;
|
||||
case Q931_STATUS:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
q931_status(ctrl, c, mand_cause);
|
||||
if (missingmand) {
|
||||
q931_status(ctrl, c, PRI_CAUSE_MANDATORY_IE_MISSING);
|
||||
pri_destroycall(ctrl, c);
|
||||
break;
|
||||
}
|
||||
if (c->newcall) {
|
||||
@@ -9167,9 +8995,9 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
case Q931_RELEASE:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
c->hangupinitiated = 1;
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
/* Force mandatory ie cause */
|
||||
c->cause = mand_cause;
|
||||
if (missingmand) {
|
||||
/* Force cause to be mandatory IE missing */
|
||||
c->cause = PRI_CAUSE_MANDATORY_IE_MISSING;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -9213,9 +9041,9 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
case Q931_DISCONNECT:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
c->hangupinitiated = 1;
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
if (missingmand) {
|
||||
/* Still let user call release */
|
||||
c->cause = mand_cause;
|
||||
c->cause = PRI_CAUSE_MANDATORY_IE_MISSING;
|
||||
}
|
||||
if (c->newcall) {
|
||||
q931_release_complete(ctrl, c, newcall_rel_comp_cause(c));
|
||||
@@ -9268,46 +9096,14 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
}
|
||||
}
|
||||
|
||||
ourcallstate_orig = c->ourcallstate;
|
||||
UPDATE_OURCALLSTATE(ctrl, c, Q931_CALL_STATE_DISCONNECT_INDICATION);
|
||||
c->peercallstate = Q931_CALL_STATE_DISCONNECT_REQUEST;
|
||||
c->sendhangupack = 1;
|
||||
|
||||
/* wait for a RELEASE so that sufficient time has passed
|
||||
for the inband audio to be heard */
|
||||
if (ctrl->acceptinbanddisconnect
|
||||
&& (c->progressmask & PRI_PROG_INBAND_AVAILABLE)) {
|
||||
switch (ourcallstate_orig) {
|
||||
case Q931_CALL_STATE_CALL_INITIATED:
|
||||
case Q931_CALL_STATE_OVERLAP_SENDING:
|
||||
case Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING:
|
||||
case Q931_CALL_STATE_CALL_DELIVERED:
|
||||
/*
|
||||
* Open the media path if it isn't already open so
|
||||
* the user can hear the inband audio.
|
||||
*/
|
||||
if (ctrl->debug & PRI_DEBUG_Q931_STATE) {
|
||||
pri_message(ctrl, "Report the DISCONNECT as a PROGRESS instead.\n");
|
||||
}
|
||||
ctrl->ev.e = PRI_EVENT_PROGRESS;
|
||||
ctrl->ev.proceeding.cause = c->cause;
|
||||
ctrl->ev.proceeding.subcmds = &ctrl->subcmds;
|
||||
ctrl->ev.proceeding.channel = q931_encode_channel(c);
|
||||
ctrl->ev.proceeding.progress = c->progress;
|
||||
ctrl->ev.proceeding.progressmask = c->progressmask;
|
||||
ctrl->ev.proceeding.cref = c->cr;
|
||||
ctrl->ev.proceeding.call = c->master_call;
|
||||
return Q931_RES_HAVEEVENT;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
/*
|
||||
* Suppress reporting DISCONNECT to the upper layer. The
|
||||
* media path should already be open and we cannot report
|
||||
* a PROGRESS at this time anyway.
|
||||
*/
|
||||
if (ctrl->acceptinbanddisconnect && (c->progressmask & PRI_PROG_INBAND_AVAILABLE))
|
||||
break;
|
||||
}
|
||||
|
||||
/* Return such an event */
|
||||
ctrl->ev.e = PRI_EVENT_HANGUP_REQ;
|
||||
@@ -9374,7 +9170,7 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
q931_release_complete(ctrl, c, newcall_rel_comp_cause(c));
|
||||
break;
|
||||
}
|
||||
if (strlen(c->keypad_digits)) {
|
||||
if (c->ourcallstate != Q931_CALL_STATE_OVERLAP_RECEIVING) {
|
||||
ctrl->ev.e = PRI_EVENT_KEYPAD_DIGIT;
|
||||
ctrl->ev.digit.subcmds = &ctrl->subcmds;
|
||||
ctrl->ev.digit.call = c->master_call;
|
||||
@@ -9407,22 +9203,11 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
break;
|
||||
case Q931_SETUP_ACKNOWLEDGE:
|
||||
q931_display_subcmd(ctrl, c);
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
q931_status(ctrl, c, mand_cause);
|
||||
break;
|
||||
}
|
||||
stop_t303(c->master_call);
|
||||
if (c->newcall) {
|
||||
q931_release_complete(ctrl, c, newcall_rel_comp_cause(c));
|
||||
break;
|
||||
}
|
||||
switch (c->ourcallstate) {
|
||||
default:
|
||||
q931_status(ctrl, c, PRI_CAUSE_WRONG_CALL_STATE);
|
||||
return 0;
|
||||
case Q931_CALL_STATE_CALL_INITIATED:
|
||||
break;
|
||||
}
|
||||
UPDATE_OURCALLSTATE(ctrl, c, Q931_CALL_STATE_OVERLAP_SENDING);
|
||||
c->peercallstate = Q931_CALL_STATE_OVERLAP_RECEIVING;
|
||||
ctrl->ev.e = PRI_EVENT_SETUP_ACK;
|
||||
@@ -9636,9 +9421,9 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
master_call = c->master_call;
|
||||
switch (master_call->hold_state) {
|
||||
case Q931_HOLD_STATE_HOLD_REQ:
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
if (missingmand) {
|
||||
/* Still, let hold rejection continue. */
|
||||
c->cause = mand_cause;
|
||||
c->cause = PRI_CAUSE_MANDATORY_IE_MISSING;
|
||||
}
|
||||
ctrl->ev.e = PRI_EVENT_HOLD_REJ;
|
||||
ctrl->ev.hold_rej.channel = q931_encode_channel(c);
|
||||
@@ -9760,9 +9545,9 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
|
||||
pri_schedule_del(ctrl, master_call->hold_timer);
|
||||
master_call->hold_timer = 0;
|
||||
|
||||
if (mand_status != MAND_STATUS_OK) {
|
||||
if (missingmand) {
|
||||
/* Still, let retrive rejection continue. */
|
||||
c->cause = mand_cause;
|
||||
c->cause = PRI_CAUSE_MANDATORY_IE_MISSING;
|
||||
}
|
||||
ctrl->ev.e = PRI_EVENT_RETRIEVE_REJ;
|
||||
ctrl->ev.retrieve_rej.channel = q931_encode_channel(c);
|
||||
|
||||
Reference in New Issue
Block a user