Compare commits

..

3 Commits

Author SHA1 Message Date
Admin Commit
b82d1deb3e Importing release summary for 1.4.13 release.
git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.4.13@2304 2fbb986a-6c06-0410-b554-c9c1f0a7f128
2012-10-09 17:45:56 +00:00
Admin Commit
5560e1e861 Importing files for 1.4.13 release.
git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.4.13@2303 2fbb986a-6c06-0410-b554-c9c1f0a7f128
2012-10-09 17:45:52 +00:00
Admin Commit
2eeee3566f Creating tag for the release of libpri-1.4.13
git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.4.13@2302 2fbb986a-6c06-0410-b554-c9c1f0a7f128
2012-10-09 17:44:59 +00:00
8 changed files with 304 additions and 285 deletions

View File

@@ -1 +1 @@
1.4.14
1.4.13

View File

@@ -1,34 +1,3 @@
2012-12-20 Asterisk Development Team <asteriskteam@digium.com>
* libpri 1.4.14 Released.
2012-12-10 18:28 +0000 [r2310] Richard Mudgett <rmudgett@digium.com>
* q931.c: Handle optional Recommendation octet 3a in Cause IE. If
the MSB of octet 3 is 0 then the optional Recommendation octet 3a
is present. References: ITU-T Q.850 Section 2.1 and ETSI ETS 300
102-1 Section 4.5.12. (closes issue PRI-151) Reported by: Tzafrir
Cohen Patches:
0001-handle-optional-Recommendation-in-Cause-IE.patch (license
#5035) patch uploaded by Tzafrir Cohen Modified
2012-11-13 19:59 +0000 [r2307-2308] Richard Mudgett <rmudgett@digium.com>
* q931.c: Q.SIG: Allow PROGRESS when in the Active state. ECMA-143
Section 10.1.7.2 indicates that PROGRESS is allowed when in the
Active state. * Made Q.SIG ignore the PROGRESS message when in
the Active call state. (closes issue PRI-147) Reported by: Nick
Merrett
* q931.c: Fix compiler error with ALERTING_NO_PROGRESS define.
2012-10-29 21:19 +0000 [r2305] Richard Mudgett <rmudgett@digium.com>
* pritest.c: Fix compiler warning in pritest.c. * Made do_channel()
exit on a failed write(). (closes issue PRI-145) Reported by:
Tzafrir Cohen Patches: fix_unused_write.patch (license #5035)
patch uploaded by Tzafrir Cohen Modified
2012-10-09 Asterisk Development Team <asteriskteam@digium.com>
* libpri 1.4.13 Released.

123
libpri-1.4.13-summary.html Normal file
View File

@@ -0,0 +1,123 @@
<!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.13</title></head>
<body>
<h1 align="center"><a name="top">Release Summary</a></h1>
<h3 align="center">libpri-1.4.13</h3>
<h3 align="center">Date: 2012-10-09</h3>
<h3 align="center">&lt;asteriskteam@digium.com&gt;</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="#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><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.12.</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>
12 rmudgett<br/>
1 kmoore<br/>
1 Pavel<br/>
1 Shaun<br/>
1 Tzafrir<br/>
</td>
<td>
4 rmudgett<br/>
2 zvision<br/>
</td>
<td>
2 tzafrir<br/>
1 bcnx<br/>
1 kowalma<br/>
1 mboylan<br/>
1 patrol-cz<br/>
1 phsultan<br/>
1 sruffell<br/>
1 tsearle<br/>
1 wimpy<br/>
</td>
</tr>
</table>
<hr/>
<a name="issues"><h2 align="center">Closed Issues</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p>
<h3>Category: General</h3><br/>
<a href="https://issues.asterisk.org/jira/browse/PRI-119">PRI-119</a>: [patch] Make PRI_DEBUG_Q921_RAW work independantly of PRI_DEBUG_Q921_DUMP<br/>
Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2282">2282</a><br/>
Reporter: wimpy<br/>
Coders: kmoore<br/>
<br/>
<a href="https://issues.asterisk.org/jira/browse/PRI-137">PRI-137</a>: MDL/TEI warning messages while using PTP mode on BRI<br/>
Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2290">2290</a><br/>
Reporter: bcnx<br/>
Coders: rmudgett<br/>
<br/>
<a href="https://issues.asterisk.org/jira/browse/PRI-139">PRI-139</a>: pri_pres2str() function returns wrong values<br/>
Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2286">2286</a><br/>
Reporter: patrol-cz<br/>
Coders: Pavel<br/>
<br/>
<a href="https://issues.asterisk.org/jira/browse/PRI-143">PRI-143</a>: Fix "no return statement in function returning non-void" compile error.<br/>
Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2298">2298</a><br/>
Reporter: sruffell<br/>
Coders: Shaun<br/>
<br/>
<a href="https://issues.asterisk.org/jira/browse/PRI-93">PRI-93</a>: E1 RESTART form interconnet partner on slot 1 does not restart whole span<br/>
Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2277">2277</a><br/>
Reporter: kowalma<br/>
Testers: zvision, rmudgett<br/>
Coders: rmudgett<br/>
<br/>
<h3>Category: NewFeature</h3><br/>
<a href="https://issues.asterisk.org/jira/browse/PRI-71">PRI-71</a>: [patch] add basic slotmap support to RESTART messages<br/>
Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2277">2277</a><br/>
Reporter: tsearle<br/>
Testers: zvision, rmudgett<br/>
Coders: rmudgett<br/>
<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><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=2273">2273</a></td><td>rmudgett</td><td>Outgoing BRI calls fail when using Asterisk 1.8 with HA8, HB8, and B410P cards.</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2280">2280</a></td><td>rmudgett</td><td>Use ie2str(full_ie) where possible in q931.c.</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2284">2284</a></td><td>rmudgett</td><td>Make number not available presentation also set screening to network provided.</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2292">2292</a></td><td>rmudgett</td><td>Make pridump and testprilib compile again.</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2294">2294</a></td><td>rmudgett</td><td>* Made no longer compile *.lo files they are identical to *.o files.</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2295">2295</a></td><td>rmudgett</td><td>SVN ignore built utilities.</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>
Makefile | 80 ++----
libpri.h | 28 ++
pri.c | 64 ++++
pri_cc.c | 3
pri_facility.c | 13 -
pri_internal.h | 29 ++
pri_q921.h | 5
pridump.c | 16 -
q921.c | 395 +++++++++++++++++++-----------
q931.c | 736 +++++++++++++++++++++++++++++++++++++++++----------------
testprilib.c | 22 -
11 files changed, 959 insertions(+), 432 deletions(-)
</pre><br/>
<hr/>
</body>
</html>

167
libpri-1.4.13-summary.txt Normal file
View File

@@ -0,0 +1,167 @@
Release Summary
libpri-1.4.13
Date: 2012-10-09
<asteriskteam@digium.com>
----------------------------------------------------------------------
Table of Contents
1. Summary
2. Contributors
3. Closed Issues
4. Other Changes
5. 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.12.
----------------------------------------------------------------------
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
12 rmudgett 4 rmudgett 2 tzafrir
1 kmoore 2 zvision 1 bcnx
1 Pavel 1 kowalma
1 Shaun 1 mboylan
1 Tzafrir 1 patrol-cz
1 phsultan
1 sruffell
1 tsearle
1 wimpy
----------------------------------------------------------------------
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.
Category: General
PRI-119: [patch] Make PRI_DEBUG_Q921_RAW work independantly of
PRI_DEBUG_Q921_DUMP
Revision: 2282
Reporter: wimpy
Coders: kmoore
PRI-137: MDL/TEI warning messages while using PTP mode on BRI
Revision: 2290
Reporter: bcnx
Coders: rmudgett
PRI-139: pri_pres2str() function returns wrong values
Revision: 2286
Reporter: patrol-cz
Coders: Pavel
PRI-143: Fix "no return statement in function returning non-void" compile
error.
Revision: 2298
Reporter: sruffell
Coders: Shaun
PRI-93: E1 RESTART form interconnet partner on slot 1 does not restart
whole span
Revision: 2277
Reporter: kowalma
Testers: zvision, rmudgett
Coders: rmudgett
Category: NewFeature
PRI-71: [patch] add basic slotmap support to RESTART messages
Revision: 2277
Reporter: tsearle
Testers: zvision, rmudgett
Coders: rmudgett
----------------------------------------------------------------------
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 |
|----------+----------+-------------------------------------+------------|
| | | Outgoing BRI calls fail when using | |
| 2273 | rmudgett | Asterisk 1.8 with HA8, HB8, and | |
| | | B410P cards. | |
|----------+----------+-------------------------------------+------------|
| 2280 | rmudgett | Use ie2str(full_ie) where possible | |
| | | in q931.c. | |
|----------+----------+-------------------------------------+------------|
| | | Make number not available | |
| 2284 | rmudgett | presentation also set screening to | |
| | | network provided. | |
|----------+----------+-------------------------------------+------------|
| 2292 | rmudgett | Make pridump and testprilib compile | |
| | | again. | |
|----------+----------+-------------------------------------+------------|
| 2294 | rmudgett | * Made no longer compile *.lo files | |
| | | they are identical to *.o files. | |
|----------+----------+-------------------------------------+------------|
| 2295 | rmudgett | SVN ignore built utilities. | |
+------------------------------------------------------------------------+
----------------------------------------------------------------------
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.
Makefile | 80 ++----
libpri.h | 28 ++
pri.c | 64 ++++
pri_cc.c | 3
pri_facility.c | 13 -
pri_internal.h | 29 ++
pri_q921.h | 5
pridump.c | 16 -
q921.c | 395 +++++++++++++++++++-----------
q931.c | 736 +++++++++++++++++++++++++++++++++++++++++----------------
testprilib.c | 22 -
11 files changed, 959 insertions(+), 432 deletions(-)
----------------------------------------------------------------------

View File

@@ -1,74 +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">
<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - libpri-1.4.14</title></head>
<body>
<h1 align="center"><a name="top">Release Summary</a></h1>
<h3 align="center">libpri-1.4.14</h3>
<h3 align="center">Date: 2012-12-20</h3>
<h3 align="center">&lt;asteriskteam@digium.com&gt;</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="#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><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.13.</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>
2 rmudgett<br/>
2 Tzafrir Cohen<br/>
</td>
<td>
</td>
<td>
2 tzafrir<br/>
1 nmerrett<br/>
</td>
</tr>
</table>
<hr/>
<a name="issues"><h2 align="center">Closed Issues</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p>
<h3>Category: General</h3><br/>
<a href="https://issues.asterisk.org/jira/browse/PRI-145">PRI-145</a>: Unchecked write in pritest<br/>
Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2305">2305</a><br/>
Reporter: tzafrir<br/>
Coders: Tzafrir Cohen<br/>
<br/>
<a href="https://issues.asterisk.org/jira/browse/PRI-147">PRI-147</a>: Normal Clearing in Progress Message is ignored<br/>
Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2308">2308</a><br/>
Reporter: nmerrett<br/>
Coders: rmudgett<br/>
<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><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=2307">2307</a></td><td>rmudgett</td><td>Fix compiler error with ALERTING_NO_PROGRESS define.</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>
pritest.c | 5 +++
q931.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 71 insertions(+), 13 deletions(-)
</pre><br/>
<hr/>
</body>
</html>

View File

@@ -1,108 +0,0 @@
Release Summary
libpri-1.4.14
Date: 2012-12-20
<asteriskteam@digium.com>
----------------------------------------------------------------------
Table of Contents
1. Summary
2. Contributors
3. Closed Issues
4. Other Changes
5. 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.13.
----------------------------------------------------------------------
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
2 rmudgett 2 tzafrir
2 Tzafrir Cohen 1 nmerrett
----------------------------------------------------------------------
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.
Category: General
PRI-145: Unchecked write in pritest
Revision: 2305
Reporter: tzafrir
Coders: Tzafrir Cohen
PRI-147: Normal Clearing in Progress Message is ignored
Revision: 2308
Reporter: nmerrett
Coders: rmudgett
----------------------------------------------------------------------
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 |
|----------+----------+-------------------------------------+------------|
| 2307 | rmudgett | Fix compiler error with | |
| | | ALERTING_NO_PROGRESS define. | |
+------------------------------------------------------------------------+
----------------------------------------------------------------------
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.
pritest.c | 5 +++
q931.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 71 insertions(+), 13 deletions(-)
----------------------------------------------------------------------

View File

@@ -68,10 +68,7 @@ static void do_channel(int fd)
int i=0;
while ((res = read(fd, buf, READ_SIZE)) > 0 && (i++ < 1000)) {
if (write(fd, buf, res) == -1) {
fprintf(stderr, "--!! Failed write: %d\n", errno);
break;
}
write(fd, buf, res);
}
}

79
q931.c
View File

@@ -3475,73 +3475,38 @@ static char *pri_causeclass2str(int cause)
static void dump_cause(int full_ie, struct pri *ctrl, q931_ie *ie, int len, char prefix)
{
int x;
int cause_ind = 1;
int data_ind = 2;
pri_message(ctrl,
"%c %s (len=%2d) [ Ext: %d Coding: %s (%d) Spare: %d Location: %s (%d)\n",
prefix, ie2str(full_ie), len, ie->data[0] >> 7,
coding2str((ie->data[0] & 0x60) >> 5), (ie->data[0] & 0x60) >> 5,
(ie->data[0] & 0x10) >> 4, loc2str(ie->data[0] & 0xf), ie->data[0] & 0xf);
if ((ie->data[0] & 0x80) == 0) {
const char *recommendation;
switch (ie->data[1] & 0x7f) {
case 0x00:
recommendation = "Q.931";
break;
case 0x03:
recommendation = "X.21";
break;
case 0x04:
recommendation = "X.25";
break;
case 0x05:
recommendation = "Q.1031/Q.1051";
break;
default:
recommendation = "Reserved";
break;
}
pri_message(ctrl, "%c Ext: %d Recommendation: %s (%d)\n",
prefix, (ie->data[1] >> 7), recommendation, ie->data[1] & 0x7f);
cause_ind = 2;
data_ind = 3;
}
pri_message(ctrl, "%c Ext: %d Cause: %s (%d), class = %s (%d) ]\n",
prefix, (ie->data[cause_ind] >> 7), pri_cause2str(ie->data[cause_ind] & 0x7f), ie->data[cause_ind] & 0x7f,
pri_causeclass2str((ie->data[cause_ind] & 0x7f) >> 4), (ie->data[cause_ind] & 0x7f) >> 4);
if (ie->len <= data_ind) {
prefix, (ie->data[1] >> 7), pri_cause2str(ie->data[1] & 0x7f), ie->data[1] & 0x7f,
pri_causeclass2str((ie->data[1] & 0x7f) >> 4), (ie->data[1] & 0x7f) >> 4);
if (ie->len < 3)
return;
}
/* Dump cause data in readable form */
switch(ie->data[cause_ind] & 0x7f) {
switch(ie->data[1] & 0x7f) {
case PRI_CAUSE_IE_NONEXIST:
for (x = data_ind; x < ie->len; x++) {
for (x=2;x<ie->len;x++)
pri_message(ctrl, "%c Cause data %d: %02x (%d, %s IE)\n", prefix, x-1, ie->data[x], ie->data[x], ie2str(ie->data[x]));
}
break;
case PRI_CAUSE_WRONG_CALL_STATE:
for (x = data_ind; x < ie->len; x++) {
for (x=2;x<ie->len;x++)
pri_message(ctrl, "%c Cause data %d: %02x (%d, %s message)\n", prefix, x-1, ie->data[x], ie->data[x], msg2str(ie->data[x]));
}
break;
case PRI_CAUSE_RECOVERY_ON_TIMER_EXPIRE:
pri_message(ctrl, "%c Cause data:", prefix);
for (x = data_ind; x < ie->len; x++) {
for (x=2;x<ie->len;x++)
pri_message(ctrl, " %02x", ie->data[x]);
}
pri_message(ctrl, " (Timer T");
for (x = data_ind; x < ie->len; x++) {
for (x=2;x<ie->len;x++)
pri_message(ctrl, "%c", ((ie->data[x] >= ' ') && (ie->data[x] < 0x7f)) ? ie->data[x] : '.');
}
pri_message(ctrl, ")\n");
break;
default:
for (x = data_ind; x < ie->len; x++) {
for (x=2;x<ie->len;x++)
pri_message(ctrl, "%c Cause data %d: %02x (%d)\n", prefix, x-1, ie->data[x], ie->data[x]);
}
break;
}
}
@@ -3550,11 +3515,7 @@ static int receive_cause(int full_ie, struct pri *ctrl, q931_call *call, int msg
{
call->causeloc = ie->data[0] & 0xf;
call->causecode = (ie->data[0] & 0x60) >> 5;
if (ie->data[0] & 0x80) {
call->cause = (ie->data[1] & 0x7f);
} else {
call->cause = (ie->data[2] & 0x7f);
}
call->cause = (ie->data[1] & 0x7f);
return 0;
}
@@ -5613,6 +5574,8 @@ int q931_notify(struct pri *ctrl, q931_call *c, int channel, int info)
#ifdef ALERTING_NO_PROGRESS
static int call_progress_ies[] = { -1 };
#else
static int call_progress_with_cause_ies[] = { Q931_CAUSE, Q931_PROGRESS_INDICATOR, -1 };
static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
#endif
@@ -5642,12 +5605,6 @@ int q931_call_progress(struct pri *ctrl, q931_call *c, int channel, int info)
return send_message(ctrl, c, Q931_PROGRESS, call_progress_ies);
}
#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
int q931_call_progress_with_cause(struct pri *ctrl, q931_call *c, int channel, int info, int cause)
{
if (c->ourcallstate == Q931_CALL_STATE_CALL_INDEPENDENT_SERVICE) {
@@ -8810,18 +8767,6 @@ static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct
(c->ourcallstate != Q931_CALL_STATE_OVERLAP_SENDING) &&
(c->ourcallstate != Q931_CALL_STATE_CALL_DELIVERED) &&
(c->ourcallstate != Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING)) {
if (mh->msg == Q931_PROGRESS
&& c->ourcallstate == Q931_CALL_STATE_ACTIVE
&& ctrl->switchtype == PRI_SWITCH_QSIG) {
/*
* Q.SIG is odd to allow PROGRESS when in the Active state since
* the media path is already open. Ignore it since it doesn't
* convey anything very useful. Maybe they will stop doing it.
*
* See ECMA-143 Section 10.1.7.2.
*/
break;
}
q931_status(ctrl,c,PRI_CAUSE_WRONG_MESSAGE);
break;
}