mirror of
https://github.com/asterisk/asterisk.git
synced 2026-01-11 20:36:47 +00:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
c96df2eb3f | ||
|
1baf757f0c | ||
|
df3ab7b87e | ||
|
|
efc53f6af4 | ||
|
|
7f8bd83765 | ||
|
|
35c6d92d53 | ||
|
|
e616b15374 | ||
|
63ef699161 | ||
|
|
a55d93704f | ||
|
|
5ce8b59681 | ||
|
|
b02229a437 | ||
|
|
e2749c8aa4 | ||
|
|
344583e76a | ||
|
|
7b13fd4d6e | ||
|
|
0bca8d9215 | ||
|
|
a22b25853c | ||
|
|
522ea01ee2 | ||
|
|
e6f347a37e | ||
|
|
0030625f68 | ||
|
|
f60deda3a7 |
1
.lastclean
Normal file
1
.lastclean
Normal file
@@ -0,0 +1 @@
|
||||
36
|
||||
2
CREDITS
2
CREDITS
@@ -201,7 +201,7 @@ Brian M. Clapper - poll.c emulation
|
||||
This product includes software developed by Brian M. Clapper <bmc(AT)clapper.org>
|
||||
|
||||
=== HOLD MUSIC ===
|
||||
Music provided by www.freeplaymusic.com
|
||||
Music provided by www.opsound.org
|
||||
|
||||
=== OTHER SOURCE CODE IN ASTERISK ===
|
||||
Asterisk uses libedit, the lightweight readline replacement from NetBSD.
|
||||
|
||||
@@ -74,11 +74,11 @@ Beginning with Asterisk 1.4, the sound files and music on hold files supplied fo
|
||||
use with Asterisk have been replaced with new versions produced from high quality
|
||||
master recordings, and are available in three languages (English, French and
|
||||
Spanish) and in five formats (WAV (uncompressed), mu-Law, a-Law, GSM and G.729).
|
||||
In addition, the music on hold files provided by FreePlay Music are now available
|
||||
In addition, the music on hold files provided by opsound.org Music are now available
|
||||
in the same five formats, but no longer available in MP3 format.
|
||||
|
||||
The Asterisk 1.4 tarball packages will only include English prompts in GSM format,
|
||||
(as were supplied with previous releases) and the FreePlay MOH files in WAV format.
|
||||
(as were supplied with previous releases) and the opsound.org MOH files in WAV format.
|
||||
All of the other variations can be installed by running 'make menuselect' and
|
||||
selecting the packages you wish to install; when you run 'make install', those
|
||||
packages will be downloaded and installed along with the standard files included
|
||||
|
||||
3512
asterisk-1.6.1.0-summary.html
Normal file
3512
asterisk-1.6.1.0-summary.html
Normal file
File diff suppressed because it is too large
Load Diff
4673
asterisk-1.6.1.0-summary.txt
Normal file
4673
asterisk-1.6.1.0-summary.txt
Normal file
File diff suppressed because it is too large
Load Diff
84
asterisk-1.6.1.1-summary.html
Normal file
84
asterisk-1.6.1.1-summary.html
Normal file
@@ -0,0 +1,84 @@
|
||||
<!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 - asterisk-1.6.1.1</title></head>
|
||||
<body>
|
||||
<h1 align="center"><a name="top">Release Summary</a></h1>
|
||||
<h3 align="center">asterisk-1.6.1.1</h3>
|
||||
<h3 align="center">Date: 2009-06-05</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="#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 has been made to address one or more security vulnerabilities that have been identified. A security advisory document has been published for each vulnerability that includes additional information. Users of versions of Asterisk that are affected are strongly encouraged to review the advisories and determine what action they should take to protect their systems from these issues.</p>
|
||||
<p>Security Advisories: <a href="http://downloads.asterisk.org/pub/security/AST-2009-001.html">AST-2009-001</a></p>
|
||||
<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.6.1.0.</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>
|
||||
5 dvossel<br/>
|
||||
3 lmadsen<br/>
|
||||
</td>
|
||||
<td>
|
||||
2 dvossel<br/>
|
||||
</td>
|
||||
<td>
|
||||
1 aragon<br/>
|
||||
1 mobeck<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: Channels/chan_iax2</h3><br/>
|
||||
<a href="http://bugs.digium.com/view.php?id=14717">#14717</a>: [patch] chan_iax2 reports endless if a peer cannot be registered (>100 logs/sec)<br/>
|
||||
Revision: <a href="http://svn.digium.com/view/asterisk/tags/1.6.1.1?view=revision&revision=199208">199208</a><br/>
|
||||
Reporter: mobeck<br/>
|
||||
Testers: dvossel<br/>
|
||||
Coders: dvossel<br/>
|
||||
<br/>
|
||||
<a href="http://bugs.digium.com/view.php?id=14867">#14867</a>: IAX2 failed registration notices are spamming the CLI until /var/log/asterisk/messages file fills hard drive 100%<br/>
|
||||
Revision: <a href="http://svn.digium.com/view/asterisk/tags/1.6.1.1?view=revision&revision=199208">199208</a><br/>
|
||||
Reporter: aragon<br/>
|
||||
Testers: dvossel<br/>
|
||||
Coders: dvossel<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/asterisk/tags/1.6.1.1?view=revision&revision=199128">199128</a></td><td>lmadsen</td><td>Create 1.6.1.1 tag from 1.6.1.0.</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.6.1.1?view=revision&revision=199133">199133</a></td><td>lmadsen</td><td>Update .version</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.6.1.1?view=revision&revision=199209">199209</a></td><td>dvossel</td><td>Additional updates to AST-2009-001</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.6.1.1?view=revision&revision=199213">199213</a></td><td>dvossel</td><td>update ChangeLog to reflect changes to AST-2009-001</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.6.1.1?view=revision&revision=199264">199264</a></td><td>dvossel</td><td>update ChangeLog</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.6.1.1?view=revision&revision=199268">199268</a></td><td>lmadsen</td><td>Update ChangeLog</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>
|
||||
.version | 2 -
|
||||
ChangeLog | 12 ++++++++
|
||||
channels/chan_iax2.c | 72 +++++++++++++++++++++++++++++++++++----------------
|
||||
3 files changed, 63 insertions(+), 23 deletions(-)
|
||||
</pre><br/>
|
||||
<hr/>
|
||||
</body>
|
||||
</html>
|
||||
125
asterisk-1.6.1.1-summary.txt
Normal file
125
asterisk-1.6.1.1-summary.txt
Normal file
@@ -0,0 +1,125 @@
|
||||
Release Summary
|
||||
|
||||
asterisk-1.6.1.1
|
||||
|
||||
Date: 2009-06-05
|
||||
|
||||
<asteriskteam@digium.com>
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Table of Contents
|
||||
|
||||
1. Summary
|
||||
2. Contributors
|
||||
3. Closed Issues
|
||||
4. Other Changes
|
||||
5. Diffstat
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Summary
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This release has been made to address one or more security vulnerabilities
|
||||
that have been identified. A security advisory document has been published
|
||||
for each vulnerability that includes additional information. Users of
|
||||
versions of Asterisk that are affected are strongly encouraged to review
|
||||
the advisories and determine what action they should take to protect their
|
||||
systems from these issues.
|
||||
|
||||
Security Advisories: AST-2009-001
|
||||
|
||||
The data in this summary reflects changes that have been made since the
|
||||
previous release, asterisk-1.6.1.0.
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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
|
||||
5 dvossel 2 dvossel 1 aragon
|
||||
3 lmadsen 1 mobeck
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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: Channels/chan_iax2
|
||||
|
||||
#14717: [patch] chan_iax2 reports endless if a peer cannot be registered
|
||||
(>100 logs/sec)
|
||||
Revision: 199208
|
||||
Reporter: mobeck
|
||||
Testers: dvossel
|
||||
Coders: dvossel
|
||||
|
||||
#14867: IAX2 failed registration notices are spamming the CLI until
|
||||
/var/log/asterisk/messages file fills hard drive 100%
|
||||
Revision: 199208
|
||||
Reporter: aragon
|
||||
Testers: dvossel
|
||||
Coders: dvossel
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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 |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 199128 | lmadsen | Create 1.6.1.1 tag from | |
|
||||
| | | 1.6.1.0. | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 199133 | lmadsen | Update .version | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 199209 | dvossel | Additional updates to | |
|
||||
| | | AST-2009-001 | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 199213 | dvossel | update ChangeLog to reflect | |
|
||||
| | | changes to AST-2009-001 | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 199264 | dvossel | update ChangeLog | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 199268 | lmadsen | Update ChangeLog | |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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.
|
||||
|
||||
.version | 2 -
|
||||
ChangeLog | 12 ++++++++
|
||||
channels/chan_iax2.c | 72 +++++++++++++++++++++++++++++++++++----------------
|
||||
3 files changed, 63 insertions(+), 23 deletions(-)
|
||||
|
||||
----------------------------------------------------------------------
|
||||
61
asterisk-1.6.1.2-summary.html
Normal file
61
asterisk-1.6.1.2-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 - asterisk-1.6.1.2</title></head>
|
||||
<body>
|
||||
<h1 align="center"><a name="top">Release Summary</a></h1>
|
||||
<h3 align="center">asterisk-1.6.1.2</h3>
|
||||
<h3 align="center">Date: 2009-07-27</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 has been made to address one or more security vulnerabilities that have been identified. A security advisory document has been published for each vulnerability that includes additional information. Users of versions of Asterisk that are affected are strongly encouraged to review the advisories and determine what action they should take to protect their systems from these issues.</p>
|
||||
<p>Security Advisories: <a href="http://downloads.asterisk.org/pub/security/AST-2009-004.html">AST-2009-004</a></p>
|
||||
<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.6.1.1.</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 lmadsen<br/>
|
||||
1 mmichelson<br/>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</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/asterisk/tags/1.6.1.2?view=revision&revision=209052">209052</a></td><td>lmadsen</td><td>Create 1.6.1.2 tag from 1.6.1.1.</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.6.1.2?view=revision&revision=209054">209054</a></td><td>lmadsen</td><td>Update .version and ChangeLog files.</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.6.1.2?view=revision&revision=209240">209240</a></td><td>mmichelson</td><td>Gracefully handle malformed RTP text packets.</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>
|
||||
.version | 2 +-
|
||||
ChangeLog | 4 ++++
|
||||
main/rtp.c | 3 +++
|
||||
3 files changed, 8 insertions(+), 1 deletion(-)
|
||||
</pre><br/>
|
||||
<hr/>
|
||||
</body>
|
||||
</html>
|
||||
94
asterisk-1.6.1.2-summary.txt
Normal file
94
asterisk-1.6.1.2-summary.txt
Normal file
@@ -0,0 +1,94 @@
|
||||
Release Summary
|
||||
|
||||
asterisk-1.6.1.2
|
||||
|
||||
Date: 2009-07-27
|
||||
|
||||
<asteriskteam@digium.com>
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Table of Contents
|
||||
|
||||
1. Summary
|
||||
2. Contributors
|
||||
3. Other Changes
|
||||
4. Diffstat
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Summary
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This release has been made to address one or more security vulnerabilities
|
||||
that have been identified. A security advisory document has been published
|
||||
for each vulnerability that includes additional information. Users of
|
||||
versions of Asterisk that are affected are strongly encouraged to review
|
||||
the advisories and determine what action they should take to protect their
|
||||
systems from these issues.
|
||||
|
||||
Security Advisories: AST-2009-004
|
||||
|
||||
The data in this summary reflects changes that have been made since the
|
||||
previous release, asterisk-1.6.1.1.
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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 lmadsen
|
||||
1 mmichelson
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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 |
|
||||
|----------+------------+----------------------------+-------------------|
|
||||
| 209052 | lmadsen | Create 1.6.1.2 tag from | |
|
||||
| | | 1.6.1.1. | |
|
||||
|----------+------------+----------------------------+-------------------|
|
||||
| 209054 | lmadsen | Update .version and | |
|
||||
| | | ChangeLog files. | |
|
||||
|----------+------------+----------------------------+-------------------|
|
||||
| | | Gracefully handle | |
|
||||
| 209240 | mmichelson | malformed RTP text | |
|
||||
| | | packets. | |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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.
|
||||
|
||||
.version | 2 +-
|
||||
ChangeLog | 4 ++++
|
||||
main/rtp.c | 3 +++
|
||||
3 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
----------------------------------------------------------------------
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# It will be executed from the top-level directory of the project.
|
||||
|
||||
make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget all
|
||||
make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-WAV WGET=wget DOWNLOAD=wget all
|
||||
make AWK=awk GREP=grep menuselect-tree
|
||||
|
||||
make_tex_docs() {
|
||||
|
||||
@@ -256,10 +256,9 @@ AST_MUTEX_DEFINE_STATIC(sched_lock);
|
||||
static ast_cond_t sched_cond;
|
||||
|
||||
enum iax2_state {
|
||||
IAX_STATE_STARTED = (1 << 0),
|
||||
IAX_STATE_AUTHENTICATED = (1 << 1),
|
||||
IAX_STATE_TBD = (1 << 2),
|
||||
IAX_STATE_UNCHANGED = (1 << 3),
|
||||
IAX_STATE_STARTED = (1 << 0),
|
||||
IAX_STATE_AUTHENTICATED = (1 << 1),
|
||||
IAX_STATE_TBD = (1 << 2),
|
||||
};
|
||||
|
||||
struct iax2_context {
|
||||
@@ -603,7 +602,8 @@ struct chan_iax2_pvt {
|
||||
/*! Default parkinglot */
|
||||
AST_STRING_FIELD(parkinglot);
|
||||
);
|
||||
|
||||
/*! AUTHREJ all AUTHREP frames */
|
||||
int authrej;
|
||||
/*! permitted authentication methods */
|
||||
int authmethods;
|
||||
/*! permitted encryption methods */
|
||||
@@ -6219,6 +6219,18 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
|
||||
ast_string_field_set(iaxs[callno], secret, user->secret);
|
||||
res = 0;
|
||||
user = user_unref(user);
|
||||
} else {
|
||||
/* user was not found, but we should still fake an AUTHREQ.
|
||||
* Set authmethods to the last known authmethod used by the system
|
||||
* Set a fake secret, it's not looked at, just required to attempt authentication.
|
||||
* Set authrej so the AUTHREP is rejected without even looking at its contents */
|
||||
iaxs[callno]->authmethods = last_authmethod ? last_authmethod : (IAX_AUTH_MD5 | IAX_AUTH_PLAINTEXT);
|
||||
ast_string_field_set(iaxs[callno], secret, "badsecret");
|
||||
iaxs[callno]->authrej = 1;
|
||||
if (!ast_strlen_zero(iaxs[callno]->username)) {
|
||||
/* only send the AUTHREQ if a username was specified. */
|
||||
res = 0;
|
||||
}
|
||||
}
|
||||
ast_set2_flag(iaxs[callno], iax2_getpeertrunk(*sin), IAX_TRUNK);
|
||||
return res;
|
||||
@@ -6329,6 +6341,9 @@ static int authenticate_verify(struct chan_iax2_pvt *p, struct iax_ies *ies)
|
||||
.name = p->username,
|
||||
};
|
||||
|
||||
if (p->authrej) {
|
||||
return res;
|
||||
}
|
||||
user = ao2_find(users, &tmp_user, OBJ_POINTER);
|
||||
if (user) {
|
||||
if (ast_test_flag(p, IAX_MAXAUTHREQ)) {
|
||||
@@ -6406,7 +6421,7 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
|
||||
int expire = 0;
|
||||
int res = -1;
|
||||
|
||||
ast_clear_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED | IAX_STATE_UNCHANGED);
|
||||
ast_clear_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED);
|
||||
/* iaxs[callno]->peer[0] = '\0'; not necc. any more-- stringfield is pre-inited to null string */
|
||||
if (ies->username)
|
||||
ast_copy_string(peer, ies->username, sizeof(peer));
|
||||
@@ -6430,8 +6445,23 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
|
||||
ast_mutex_lock(&iaxsl[callno]);
|
||||
if (!p || !iaxs[callno]) {
|
||||
if (iaxs[callno]) {
|
||||
int plaintext = ((last_authmethod & IAX_AUTH_PLAINTEXT) | (iaxs[callno]->authmethods & IAX_AUTH_PLAINTEXT));
|
||||
/* Anything, as long as it's non-blank */
|
||||
ast_string_field_set(iaxs[callno], secret, "badsecret");
|
||||
/* An AUTHREQ must be sent in response to a REGREQ of an invalid peer unless
|
||||
* 1. A challenge already exists indicating a AUTHREQ was already sent out.
|
||||
* 2. A plaintext secret is present in ie as result of a previous AUTHREQ requesting it.
|
||||
* 3. A plaintext secret is present in the ie and the last_authmethod used by a peer happened
|
||||
* to be plaintext, indicating it is an authmethod used by other peers on the system.
|
||||
*
|
||||
* If none of these cases exist, res will be returned as 0 without authentication indicating
|
||||
* an AUTHREQ needs to be sent out. */
|
||||
|
||||
if (ast_strlen_zero(iaxs[callno]->challenge) &&
|
||||
!(!ast_strlen_zero(secret) && plaintext)) {
|
||||
/* by setting res to 0, an REGAUTH will be sent */
|
||||
res = 0;
|
||||
}
|
||||
}
|
||||
if (authdebug && !p)
|
||||
ast_log(LOG_NOTICE, "No registration for peer '%s' (from %s)\n", peer, ast_inet_ntoa(sin->sin_addr));
|
||||
@@ -6449,8 +6479,6 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
|
||||
ast_log(LOG_NOTICE, "Host %s denied access to register peer '%s'\n", ast_inet_ntoa(sin->sin_addr), p->name);
|
||||
goto return_unref;
|
||||
}
|
||||
if (!inaddrcmp(&p->addr, sin))
|
||||
ast_set_flag(&iaxs[callno]->state, IAX_STATE_UNCHANGED);
|
||||
ast_string_field_set(iaxs[callno], secret, p->secret);
|
||||
ast_string_field_set(iaxs[callno], inkeys, p->inkeys);
|
||||
/* Check secret against what we have on file */
|
||||
@@ -6466,7 +6494,7 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
|
||||
if (key && !ast_check_signature(key, iaxs[callno]->challenge, rsasecret)) {
|
||||
ast_set_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED);
|
||||
break;
|
||||
} else if (!key)
|
||||
} else if (!key)
|
||||
ast_log(LOG_WARNING, "requested inkey '%s' does not exist\n", keyn);
|
||||
keyn = strsep(&stringp, ":");
|
||||
}
|
||||
@@ -6484,7 +6512,7 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
|
||||
struct MD5Context md5;
|
||||
unsigned char digest[16];
|
||||
char *tmppw, *stringp;
|
||||
|
||||
|
||||
tmppw = ast_strdupa(p->secret);
|
||||
stringp = tmppw;
|
||||
while((tmppw = strsep(&stringp, ";"))) {
|
||||
@@ -6494,7 +6522,7 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
|
||||
MD5Final(digest, &md5);
|
||||
for (x=0;x<16;x++)
|
||||
sprintf(requeststr + (x << 1), "%2.2x", digest[x]); /* safe */
|
||||
if (!strcasecmp(requeststr, md5secret))
|
||||
if (!strcasecmp(requeststr, md5secret))
|
||||
break;
|
||||
}
|
||||
if (tmppw) {
|
||||
@@ -6512,16 +6540,15 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
|
||||
goto return_unref;
|
||||
} else
|
||||
ast_set_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED);
|
||||
} else if (!ast_strlen_zero(p->secret) || !ast_strlen_zero(p->inkeys)) {
|
||||
if (authdebug &&
|
||||
((!ast_strlen_zero(p->secret) && (p->authmethods & IAX_AUTH_MD5) && !ast_strlen_zero(iaxs[callno]->challenge)) ||
|
||||
(!ast_strlen_zero(p->inkeys) && (p->authmethods & IAX_AUTH_RSA) && !ast_strlen_zero(iaxs[callno]->challenge)))) {
|
||||
ast_log(LOG_NOTICE, "Inappropriate authentication received for '%s'\n", p->name);
|
||||
}
|
||||
} else if (!ast_strlen_zero(iaxs[callno]->challenge) && ast_strlen_zero(md5secret) && ast_strlen_zero(rsasecret)) {
|
||||
/* if challenge has been sent, but no challenge response if given, reject. */
|
||||
goto return_unref;
|
||||
}
|
||||
ast_devstate_changed(AST_DEVICE_UNKNOWN, "IAX2/%s", p->name); /* Activate notification */
|
||||
|
||||
/* either Authentication has taken place, or a REGAUTH must be sent before verifying registration */
|
||||
res = 0;
|
||||
|
||||
return_unref:
|
||||
if (iaxs[callno]) {
|
||||
ast_string_field_set(iaxs[callno], peer, peer);
|
||||
@@ -6532,12 +6559,9 @@ return_unref:
|
||||
}
|
||||
}
|
||||
|
||||
res = 0;
|
||||
|
||||
if (p) {
|
||||
peer_unref(p);
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -7291,6 +7315,9 @@ static int registry_authrequest(int callno)
|
||||
* Therefore, we use whatever the last peer used (which may vary over the
|
||||
* course of a server, which should leak minimal information). */
|
||||
sentauthmethod = p ? p->authmethods : last_authmethod ? last_authmethod : (IAX_AUTH_MD5 | IAX_AUTH_PLAINTEXT);
|
||||
if (!p) {
|
||||
iaxs[callno]->authmethods = sentauthmethod;
|
||||
}
|
||||
iax_ie_append_short(&ied, IAX_IE_AUTHMETHODS, sentauthmethod);
|
||||
if (sentauthmethod & (IAX_AUTH_RSA | IAX_AUTH_MD5)) {
|
||||
/* Build the challenge */
|
||||
@@ -9501,8 +9528,9 @@ retryowner2:
|
||||
ast_mutex_unlock(&iaxsl[fr->callno]);
|
||||
return 1;
|
||||
}
|
||||
if ((ast_strlen_zero(iaxs[fr->callno]->secret) && ast_strlen_zero(iaxs[fr->callno]->inkeys)) ||
|
||||
ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_AUTHENTICATED | IAX_STATE_UNCHANGED)) {
|
||||
if ((ast_strlen_zero(iaxs[fr->callno]->secret) && ast_strlen_zero(iaxs[fr->callno]->inkeys)) ||
|
||||
ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_AUTHENTICATED)) {
|
||||
|
||||
if (f.subclass == IAX_COMMAND_REGREL)
|
||||
memset(&sin, 0, sizeof(sin));
|
||||
if (update_registry(&sin, fr->callno, ies.devicetype, fd, ies.refresh))
|
||||
|
||||
@@ -48,7 +48,7 @@ reference purposes.
|
||||
\input{../../LICENSE}
|
||||
\subsection{Hold Music}
|
||||
Digium has licensed the music included with
|
||||
the Asterisk distribution From FreePlayMusic
|
||||
the Asterisk distribution From opsound.org
|
||||
for use and distribution with Asterisk. It
|
||||
is licensed ONLY for use as hold music within
|
||||
an Asterisk based PBX.
|
||||
|
||||
@@ -1790,6 +1790,9 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
|
||||
|
||||
rtp->f.subclass = AST_FORMAT_T140;
|
||||
header_end = memchr(data, ((*data) & 0x7f), rtp->f.datalen);
|
||||
if (header_end == NULL) {
|
||||
return &ast_null_frame;
|
||||
}
|
||||
header_end++;
|
||||
|
||||
header_length = header_end - data;
|
||||
|
||||
@@ -43,7 +43,7 @@ MES:=$(subst -G729,-g729,$(MES))
|
||||
MES:=$(subst -G722,-g722,$(MES))
|
||||
EXTRA_SOUNDS:=$(MES:EXTRA-SOUNDS-%=asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION).tar.gz)
|
||||
EXTRA_SOUND_TAGS:=$(MES:EXTRA-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION))
|
||||
MM:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
|
||||
MM:=$(subst -OPSOUND-,-opsound-,$(MENUSELECT_MOH))
|
||||
MM:=$(subst -WAV,-wav,$(MM))
|
||||
MM:=$(subst -ULAW,-ulaw,$(MM))
|
||||
MM:=$(subst -ALAW,-alaw,$(MM))
|
||||
|
||||
@@ -44,20 +44,20 @@
|
||||
</member>
|
||||
</category>
|
||||
<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
|
||||
<member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
|
||||
<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
|
||||
<defaultenabled>yes</defaultenabled>
|
||||
</member>
|
||||
<member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
|
||||
<member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
|
||||
</member>
|
||||
<member name="MOH-FREEPLAY-ALAW" displayname="FreePlay Music On Hold Files, a-Law format" >
|
||||
<member name="MOH-OPSOUND-ALAW" displayname="opsound.org Music On Hold Files, a-Law format" >
|
||||
</member>
|
||||
<member name="MOH-FREEPLAY-GSM" displayname="FreePlay Music On Hold Files, GSM format" >
|
||||
<member name="MOH-OPSOUND-GSM" displayname="opsound.org Music On Hold Files, GSM format" >
|
||||
</member>
|
||||
<member name="MOH-FREEPLAY-G729" displayname="FreePlay Music On Hold Files, G.729 format" >
|
||||
<member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" >
|
||||
</member>
|
||||
<member name="MOH-FREEPLAY-G722" displayname="FreePlay Music On Hold Files, G.722 format" >
|
||||
<member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" >
|
||||
</member>
|
||||
<member name="MOH-FREEPLAY-SLN16" displayname="FreePlay Music On Hold Files, Signed-linear 16kHz format" >
|
||||
<member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" >
|
||||
</member>
|
||||
</category>
|
||||
<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
|
||||
|
||||
Reference in New Issue
Block a user