]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge changes for 11.6.0-rc2
authorAsterisk Autobuilder <asteriskteam@digium.com>
Fri, 18 Oct 2013 16:38:45 +0000 (16:38 +0000)
committerAsterisk Autobuilder <asteriskteam@digium.com>
Fri, 18 Oct 2013 16:38:45 +0000 (16:38 +0000)
* Remove old summaries; update version; update ChangeLog
* Merged r399513 for ASTERISK-22560
* Merged r401167 for ASTERISK-22236
* Merged r401179 for ASTERISK-22718
* Merged r401182 for ASTERISK-22729

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc2@401235 65c4cc65-6c06-0410-ace0-fbb531ad65f3

.version
ChangeLog
asterisk-11.6.0-rc1-summary.html [deleted file]
asterisk-11.6.0-rc1-summary.txt [deleted file]
channels/chan_sip.c
main/channel.c
main/logger.c

index 9d9614d3c99867020a45ce8f746d1f852488c3ad..212fff331a918704cc6d059edd92734e810551fa 100644 (file)
--- a/.version
+++ b/.version
@@ -1 +1 @@
-11.6.0-rc1
+11.6.0-rc2
index c6c5e6618bdd376b554dfe93b678070a2edbf0dc..dd9d68d1250e02b4f00a8bb3ea98914241599ad8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2013-10-18  Asterisk Development Team <asteriskteam@digium.com>
+
+       * Asterisk 11.6.0-rc2 Released.
+
+       * Properly copy/remove the device state cache flag over a masquerade.
+
+         In r378303 the AST_FLAG_DISABLE_DEVSTATE_CACHE flag was added that
+         tells the devstate system to not cache states for non-real devices.
+         However, when optimizing away channels (ast_do_masquerade), that\
+         flag wasn't copied.
+
+         In my case, using Local devices as queue members created a situation
+         where the endpoint was considered in use, but the state change of the
+         device being available again was ignored (not cached). The endpoint
+         channel was optimized into the (previously) Local channel, but kept
+         the do-not-cache flag. The end result being that the queue member
+         apparently stayed in use forever.
+
+       * Fix Setting A chan_sip Dialog's SIP_NAT_FORCE_RPORT Flag
+
+         A condition was added in a commit to fix ASTERISK-21374, that, if the
+         SIP_PAGE3_NAT_AUTO_RPORT flag was set, to then copy a peer's
+         SIP_NAT_FORCE_RPORT flag to the dialog.  This condition should not
+         have been there since it assumed that if Asterisk is in an
+         environment where NAT is involved, that the auto_* nat settings or
+         force_rport setting would be on in the global settings. If the nat
+         setting in the global setting is set to 'nat=no' and then turned on
+         for peers (which is not quite the recommended way, although it is
+         allowed) this flag is never copied to the dialog resulting in
+         problems like, REGISTER replies going to the wrong port.
+
+         This patch removes this conditional check and will now always use the
+         peer's flag which by this point in the code the checks on whether the
+         peer is behind NAT or not (if using auto_force_rport) have already
+         been run.
+
+       * Fix memory leak in logger
+
+         Fixed a memory leak discovered in the logger where a temporary string
+         buffer was not being freed.
+
 2013-09-19  Asterisk Development Team <asteriskteam@digium.com>
 
        * Asterisk 11.6.0-rc1 Released.
diff --git a/asterisk-11.6.0-rc1-summary.html b/asterisk-11.6.0-rc1-summary.html
deleted file mode 100644 (file)
index 449121f..0000000
+++ /dev/null
@@ -1,576 +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 - asterisk-11.6.0-rc1</title></head>
-<body>
-<h1 align="center"><a name="top">Release Summary</a></h1>
-<h3 align="center">asterisk-11.6.0-rc1</h3>
-<h3 align="center">Date: 2013-09-19</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, asterisk-11.5.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>
-14 rmudgett<br/>
-12 mjordan<br/>
-12 wdoekes<br/>
-6 elguero<br/>
-6 kharwell<br/>
-5 Corey Farrell<br/>
-5 jrose<br/>
-4 dlee<br/>
-4 kmoore<br/>
-3 coreyfarrell<br/>
-3 igorg<br/>
-2 file<br/>
-2 mmichelson<br/>
-2 newtonr<br/>
-2 russell<br/>
-1 abelbeck<br/>
-1 alecdavis<br/>
-1 Andrew Nagy<br/>
-1 anstein<br/>
-1 Dmitry Melekhov<br/>
-1 Guenther Kelleter<br/>
-1 jbigelow<br/>
-1 jcolp<br/>
-1 may<br/>
-1 moy<br/>
-1 phill<br/>
-1 Richard Miller<br/>
-1 snuffy<br/>
-1 Stefan Wachtler<br/>
-1 varnav<br/>
-</td>
-<td>
-3 Corey Farrell<br/>
-2 wdoekes<br/>
-1 Alex Zarubin<br/>
-1 Alfred Farrugia<br/>
-1 Ariel Wainer<br/>
-1 CGI.NET<br/>
-1 Colin Cutherbertson<br/>
-1 David M. Lee<br/>
-1 Doug Bailey<br/>
-1 Karsten Wemheuer<br/>
-1 Michael Keuter<br/>
-1 mjordan<br/>
-1 Stuart Henderson<br/>
-1 Tony Lewis<br/>
-</td>
-<td>
-9 coreyfarrell<br/>
-3 gkelleter<br/>
-3 mjordan<br/>
-2 dlee<br/>
-2 jrose<br/>
-2 mdavenport<br/>
-1 abelbeck<br/>
-1 adavid<br/>
-1 aepshteyn<br/>
-1 anstein<br/>
-1 aragon<br/>
-1 ariw<br/>
-1 az_tth<br/>
-1 blackaura<br/>
-1 brietz<br/>
-1 colinc<br/>
-1 dbailey<br/>
-1 gentlec<br/>
-1 ivo.andonov<br/>
-1 kenner<br/>
-1 nsnake<br/>
-1 phill<br/>
-1 rafuchoucv<br/>
-1 rnewton<br/>
-1 slesru<br/>
-1 snuffy<br/>
-1 softins<br/>
-1 sthen<br/>
-1 tm1000<br/>
-1 ulogic<br/>
-1 varnav<br/>
-1 wdoekes<br/>
-1 wimpy<br/>
-1 zhanglei<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: Applications/app_confbridge</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21859">ASTERISK-21859</a>: Confbridge doesn't tear down an empty conference bridge when all users were kicked via end_marked=yes. Also, side effect crashes.<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399222">399222</a><br/>
-Reporter: gentlec<br/>
-Coders: kharwell<br/>
-<br/>
-<h3>Category: Applications/app_meetme</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21907">ASTERISK-21907</a>: Crash - segfault - When executing a MeetMeAdmin command that requires a member, without specifying a member<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399034">399034</a><br/>
-Reporter: aepshteyn<br/>
-Coders: kmoore<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22269">ASTERISK-22269</a>: app_meetme: wrong bit value for CONFFLAG_DONT_DENOISE<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396944">396944</a><br/>
-Reporter: softins<br/>
-Coders: mjordan<br/>
-<br/>
-<h3>Category: Applications/app_mixmonitor</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22368">ASTERISK-22368</a>: [patch] mixmonitor_free leaks filename<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398011">398011</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: wdoekes<br/>
-<br/>
-<h3>Category: Applications/app_queue</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21980">ASTERISK-21980</a>: Error message for QUEUE_MEMBER when member is not in queue is unclear<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394345">394345</a><br/>
-Reporter: adavid<br/>
-Coders: mjordan<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22189">ASTERISK-22189</a>: Wrap up time is ignored for queue members who are members in multiple queues<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396948">396948</a><br/>
-Reporter: mjordan<br/>
-Testers: Tony Lewis<br/>
-Coders: mjordan<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22263">ASTERISK-22263</a>: [patch] 'queue add member ...' help text update<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398885">398885</a><br/>
-Reporter: rnewton<br/>
-Coders: newtonr<br/>
-<br/>
-<h3>Category: Applications/app_voicemail</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22414">ASTERISK-22414</a>: [patch] voicemail and test_voicemail_api leaks<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398285">398285</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: coreyfarrell<br/>
-<br/>
-<h3>Category: Bridges/bridge_native_rtp</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22424">ASTERISK-22424</a>: bridge_native_rtp: Asterisk 12 attempts to remotely bridge on 200OK response to invite when the 200 lacks SDP<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398836">398836</a><br/>
-Reporter: jrose<br/>
-Coders: jrose<br/>
-<br/>
-<h3>Category: CEL/General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22259">ASTERISK-22259</a>: [patch] cel segfault on invalid cel.conf<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397034">397034</a><br/>
-Reporter: coreyfarrell<br/>
-Testers: Corey Farrell<br/>
-Coders: Corey Farrell<br/>
-<br/>
-<h3>Category: Channels/chan_dahdi</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21117">ASTERISK-21117</a>: Bad interpretation of the file chan_dahdi.conf when using open r2 parameters<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394173">394173</a><br/>
-Reporter: rafuchoucv<br/>
-Coders: moy<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21847">ASTERISK-21847</a>: Segfault due to dahdi_restart and round robin<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=393628">393628</a><br/>
-Reporter: ivo.andonov<br/>
-Coders: rmudgett<br/>
-<br/>
-<h3>Category: Channels/chan_h323</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22365">ASTERISK-22365</a>: [patch] chan_h323 can't be compiled<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398510">398510</a><br/>
-Reporter: slesru<br/>
-Coders: Dmitry Melekhov<br/>
-<br/>
-<h3>Category: Channels/chan_iax2</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21953">ASTERISK-21953</a>: connectedline parameter not documented<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394890">394890</a><br/>
-Reporter: wimpy<br/>
-Coders: mjordan<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22504">ASTERISK-22504</a>: [patch] chan_iax2: wrong expiry time in astdb<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399159">399159</a><br/>
-Reporter: brietz<br/>
-Coders: Stefan Wachtler<br/>
-<br/>
-<h3>Category: Channels/chan_local</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22221">ASTERISK-22221</a>: The masquerade super-test fails on all Asterisk versions<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397528">397528</a><br/>
-Reporter: mjordan<br/>
-Coders: rmudgett<br/>
-<br/>
-<h3>Category: Channels/chan_sip/General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21064">ASTERISK-21064</a>: Crash when handling ACK on dialog that has no channel<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397712">397712</a><br/>
-Reporter: colinc<br/>
-Testers: wdoekes, Colin Cutherbertson<br/>
-Coders: wdoekes<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22007">ASTERISK-22007</a>: chan_sip: segfault with invalid sdp<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397758">397758</a><br/>
-Reporter: wdoekes<br/>
-Testers: wdoekes<br/>
-Coders: wdoekes<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22071">ASTERISK-22071</a>: chan_sip doesn't respect Via ..completely<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397205">397205</a><br/>
-Reporter: az_tth<br/>
-Testers: Alex Zarubin, Karsten Wemheuer<br/>
-Coders: elguero<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22248">ASTERISK-22248</a>: [patch] test_sip_rtpqos corrupts dialogs container<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397133">397133</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: Corey Farrell<br/>
-<br/>
-<h3>Category: Channels/chan_sip/Messaging</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22185">ASTERISK-22185</a>: Crash in sip_msg_send in chan_sip.c when from parameter is malformed<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397254">397254</a><br/>
-Reporter: zhanglei<br/>
-Coders: mmichelson<br/>
-<br/>
-<h3>Category: Channels/chan_sip/Registration</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21964">ASTERISK-21964</a>: SIP TLS Register statement fails if sip.conf register directive uses peer name. <br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396248">396248</a><br/>
-Reporter: dbailey<br/>
-Testers: Doug Bailey<br/>
-Coders: elguero<br/>
-<br/>
-<h3>Category: Channels/chan_sip/T.38</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22275">ASTERISK-22275</a>: [patch] T.38 Passthrough broken if peer doen't report T38MaxBitRate<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397257">397257</a><br/>
-Reporter: anstein<br/>
-Coders: anstein<br/>
-<br/>
-<h3>Category: Contrib/General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21021">ASTERISK-21021</a>: SQL script to create queue_log table in PostgreSQL<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394897">394897</a><br/>
-Reporter: varnav<br/>
-Coders: varnav<br/>
-<br/>
-<h3>Category: Core/General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22179">ASTERISK-22179</a>: Update copyright headers - they're so last year<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=395033">395033</a><br/>
-Reporter: mdavenport<br/>
-Coders: mjordan<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22238">ASTERISK-22238</a>: [patch] astfd and threadstorage debug cli commands are not unregistered<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397107">397107</a><br/>
-Reporter: coreyfarrell<br/>
-Testers: Corey Farrell<br/>
-Coders: Corey Farrell<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22249">ASTERISK-22249</a>: [patch] xmldoc.c leaks an attribute<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397067">397067</a><br/>
-Reporter: coreyfarrell<br/>
-Testers: Corey Farrell<br/>
-Coders: Corey Farrell<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22536">ASTERISK-22536</a>: MALLOC_DEBUG causes /tmp/refs to be written, even if REF_DEBUG is not defined<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399099">399099</a><br/>
-Reporter: dlee<br/>
-Coders: dlee<br/>
-<br/>
-<h3>Category: Core/HTTP</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21789">ASTERISK-21789</a>: ast_http_get_cookies() fails in the presence of RFC2965 Cookie2 header<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394900">394900</a><br/>
-Reporter: sthen<br/>
-Testers: mjordan, Stuart Henderson<br/>
-Coders: mjordan<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22237">ASTERISK-22237</a>: [patch] http_shutdown incomplete<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397309">397309</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: Corey Farrell<br/>
-<br/>
-<h3>Category: Core/Jitterbuffer</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21036">ASTERISK-21036</a>: Jitter Buffer log file creation doesn't account for multiple slashes in DAHDI channel names<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399403">399403</a><br/>
-Reporter: kenner<br/>
-Coders: kmoore<br/>
-<br/>
-<h3>Category: Core/ManagerInterface</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21789">ASTERISK-21789</a>: ast_http_get_cookies() fails in the presence of RFC2965 Cookie2 header<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394900">394900</a><br/>
-Reporter: sthen<br/>
-Testers: mjordan, Stuart Henderson<br/>
-Coders: mjordan<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22395">ASTERISK-22395</a>: [patch] manager.c and res_agi.c leak results from ast_xmldoc_printable<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398061">398061</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: coreyfarrell<br/>
-<br/>
-<h3>Category: Core/RTP</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22424">ASTERISK-22424</a>: bridge_native_rtp: Asterisk 12 attempts to remotely bridge on 200OK response to invite when the 200 lacks SDP<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398836">398836</a><br/>
-Reporter: jrose<br/>
-Coders: jrose<br/>
-<br/>
-<h3>Category: Documentation</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22308">ASTERISK-22308</a>: Documentation - chan_dahdi, waitfordialtone is not boolean, it's time in milliseconds<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398881">398881</a><br/>
-Reporter: mdavenport<br/>
-Coders: newtonr<br/>
-<br/>
-<h3>Category: Features/Parking</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22413">ASTERISK-22413</a>: [patch] features.c TEST_FRAMEWORK leaks channel reference, preventing graceful shutdown<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398022">398022</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: coreyfarrell<br/>
-<br/>
-<h3>Category: Functions/func_channel</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-20969">ASTERISK-20969</a>: Fix func_channel documentation for sip/iax2/dadhi<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394981">394981</a><br/>
-Reporter: snuffy<br/>
-Coders: snuffy<br/>
-<br/>
-<h3>Category: Functions/func_strings</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21717">ASTERISK-21717</a>: [patch] - Documentation for PASSTHRU function is unclear<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394303">394303</a><br/>
-Reporter: ulogic<br/>
-Coders: Richard Miller<br/>
-<br/>
-<h3>Category: General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22450">ASTERISK-22450</a>: No CLI response from database show<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399267">399267</a><br/>
-Reporter: aragon<br/>
-Coders: kharwell<br/>
-<br/>
-<h3>Category: Resources/res_agi</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21903">ASTERISK-21903</a>: [patch] Return proper result upon error when running some AGI commands<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394641">394641</a><br/>
-Reporter: ariw<br/>
-Testers: Ariel Wainer<br/>
-Coders: elguero<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22395">ASTERISK-22395</a>: [patch] manager.c and res_agi.c leak results from ast_xmldoc_printable<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398061">398061</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: coreyfarrell<br/>
-<br/>
-<h3>Category: Resources/res_features</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22416">ASTERISK-22416</a>: [patch] Segmentation fault (in process_applicationmap_line, at features.c) when using improper feature mapping syntax<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399305">399305</a><br/>
-Reporter: nsnake<br/>
-Testers: CGI.NET<br/>
-Coders: elguero<br/>
-<br/>
-<h3>Category: Resources/res_http_websocket</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21825">ASTERISK-21825</a>: [patch] websocket segmentation fault on certain invalid input<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=391560">391560</a><br/>
-Reporter: blackaura<br/>
-Testers: Alfred Farrugia, David M. Lee<br/>
-Coders: wdoekes<br/>
-<br/>
-<h3>Category: Resources/res_indications</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21997">ASTERISK-21997</a>: [patch] - Incorrect Ring tone for Malaysia<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=394941">394941</a><br/>
-Reporter: phill<br/>
-Coders: phill<br/>
-<br/>
-<h3>Category: Resources/res_jabber</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22435">ASTERISK-22435</a>: [patch] jabber/xmpp MWI distributed pubsub issue where the mailbox and context get swapped at the remote end<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398558">398558</a><br/>
-Reporter: abelbeck<br/>
-Testers: Michael Keuter<br/>
-Coders: abelbeck<br/>
-<br/>
-<h3>Category: Resources/res_xmpp</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22347">ASTERISK-22347</a>: [patch]res_xmpp timeout when google sends blank responses ' '<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398618">398618</a><br/>
-Reporter: tm1000<br/>
-Coders: Andrew Nagy<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22435">ASTERISK-22435</a>: [patch] jabber/xmpp MWI distributed pubsub issue where the mailbox and context get swapped at the remote end<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398558">398558</a><br/>
-Reporter: abelbeck<br/>
-Testers: Michael Keuter<br/>
-Coders: abelbeck<br/>
-<br/>
-<h3>Category: Tests/General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22276">ASTERISK-22276</a>: Test test_hashtab_thrash fails on 32-bit machines when compiled without DEBUG_THREADS<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396620">396620</a><br/>
-Reporter: mjordan<br/>
-Coders: jcolp<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22413">ASTERISK-22413</a>: [patch] features.c TEST_FRAMEWORK leaks channel reference, preventing graceful shutdown<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398022">398022</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: coreyfarrell<br/>
-<br/>
-<h3>Category: Tests/testsuite</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22221">ASTERISK-22221</a>: The masquerade super-test fails on all Asterisk versions<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397528">397528</a><br/>
-Reporter: mjordan<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/asterisk/branches/11?view=revision&revision=391334">391334</a></td><td>alecdavis</td><td>IAX2: Transfer Reject: Lock bridgecallno before touching it, refactor</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=391379">391379</a></td><td>igorg</td><td></td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=391507">391507</a></td><td>mjordan</td><td>Fix memory leak while loading priority modules and adding formats</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=391700">391700</a></td><td>rmudgett</td><td>app_confbridge: Fix memory leak on reload.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=391794">391794</a></td><td>jrose</td><td>app_mixmonitor: Fix crashes caused by unloading app_mixmonitor</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=392810">392810</a></td><td>mjordan</td><td>Fix memory/ref counting leaks in a variety of locations</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-21906">ASTERISK-21906</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=393395">393395</a></td><td>igorg</td><td></td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=393630">393630</a></td><td>rmudgett</td><td>MixMonitor: Fix refleak in manager_stop_mixmonitor() if could not stop monitoring.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=393929">393929</a></td><td>russell</td><td>astobj2-ify the SLA code</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=395020">395020</a></td><td>mjordan</td><td>Add an upgrade note for libuuid dependency; remove note in CHANGES</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396197">396197</a></td><td>elguero</td><td>Adding a note to UPGRADE.txt about a change made to res_agi in order to</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-21903">ASTERISK-21903</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396199">396199</a></td><td>elguero</td><td>Change "from" to "From".</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-21903">ASTERISK-21903</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396287">396287</a></td><td>wdoekes</td><td>Check result of ast_var_assign() calls for memory allocation failure.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396310">396310</a></td><td>wdoekes</td><td>Check result of ast_var_assign() calls for memory allocation failure (2).</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396377">396377</a></td><td>igorg</td><td></td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396441">396441</a></td><td>wdoekes</td><td>Consistent memory allocation by ast_bt_get_symbols.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396580">396580</a></td><td>wdoekes</td><td>chan_sip: Fix IP-addr in warning when rejecting a contact ACL.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396583">396583</a></td><td>wdoekes</td><td>chan_sip: Convert 'just did sched_add waitid...' from warning to debug message.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396657">396657</a></td><td>file</td><td>Tweak comment for why usleep is used.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396746">396746</a></td><td>kmoore</td><td>Remove leading spaces from the CLI command before parsing</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396884">396884</a></td><td>jbigelow</td><td>Add test suite events to indicate when a feature is detected or not</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396961">396961</a></td><td>mjordan</td><td>Fix invalid access to disposed memory in main/data unit test</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=396995">396995</a></td><td>wdoekes</td><td>Add "autoframing" option to sip.conf.sample and h323.conf.sample.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397157">397157</a></td><td>mmichelson</td><td>Remove REF_DEBUG definition.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397378">397378</a></td><td>wdoekes</td><td>Add _IO_stdin_used in version-script to fix SIGBUSes on Sparc.</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-21763">ASTERISK-21763</a>, <a href="https://issues.asterisk.org/jira/browse/ASTERISK-21665">ASTERISK-21665</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397604">397604</a></td><td>file</td><td>Make libuuid an optional dependency for res_rtp_asterisk instead of a requirement.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=397744">397744</a></td><td>rmudgett</td><td>Fix uninitialized value in struct ast_control_pvt_cause_code usage.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398000">398000</a></td><td>kharwell</td><td>Check return value on fwrite</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398019">398019</a></td><td>rmudgett</td><td>test_substituition: Fix failed test reporting to actually report failure.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398103">398103</a></td><td>kharwell</td><td>Fix various memory leaks</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398168">398168</a></td><td>wdoekes</td><td>Be a little more verbose when loading cel_custom.conf.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398214">398214</a></td><td>may</td><td>Fix remote tcs sequence handling on empty tcs received</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398281">398281</a></td><td>jrose</td><td>app_voicemail: Fix leaking config objects when msg_id doesn't match</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398302">398302</a></td><td>rmudgett</td><td>chan_iax2: Add missing control frame names to debug frame decode output.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398305">398305</a></td><td>rmudgett</td><td>chan_iax2: Add missing control frame names to debug frame decode output. (Part 2)</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398380">398380</a></td><td>rmudgett</td><td>chan_iax2: Fix bridgecallno deadlock avoidance.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398417">398417</a></td><td>rmudgett</td><td>chan_iax2: Fix stray reference to worker thread idle_list.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398457">398457</a></td><td>rmudgett</td><td>chan_iax2: Reduce indentation in __attempt_transmit().</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398577">398577</a></td><td>kmoore</td><td>Commit the remainder of r398523</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-22435">ASTERISK-22435</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398721">398721</a></td><td>rmudgett</td><td>MALLOC_DEBUG: Change fence magic number to be completely different from the freed magic number.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398749">398749</a></td><td>dlee</td><td>Fixed utils directory breakage from r398648</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398753">398753</a></td><td>dlee</td><td>Fixed utils directory breakage from r398748, this time with extra hate.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398758">398758</a></td><td>rmudgett</td><td>Fix incorrect usages of ast_realloc().</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398820">398820</a></td><td>russell</td><td>Fix typo in confbridge.conf.sample</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=398986">398986</a></td><td>jrose</td><td>chan_sip: Revert r398835 due to failing tests involving originate</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-22424">ASTERISK-22424</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399353">399353</a></td><td>mjordan</td><td>Add a WARNING in bridge_softmix when a timing module isn't loaded</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399373">399373</a></td><td>mjordan</td><td>Update prep_tarball with new documentation files on the Asterisk wiki</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-22439">ASTERISK-22439</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=399442">399442</a></td><td>rmudgett</td><td>UDPTL: Backport some fixes from v12 that should be in v11.</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>
-CHANGES                                   |   10
-UPGRADE.txt                               |   16
-addons/ooh323c/src/ooh245.c               |    2
-apps/app_confbridge.c                     |    4
-apps/app_dumpchan.c                       |   26
-apps/app_meetme.c                         |  841 +++++++++++++++++++-----------
-apps/app_mixmonitor.c                     |   48 +
-apps/app_playback.c                       |    4
-apps/app_queue.c                          |  181 +++---
-apps/app_stack.c                          |    5
-apps/app_verbose.c                        |   24
-apps/app_voicemail.c                      |    1
-apps/confbridge/conf_config_parser.c      |   26
-apps/confbridge/conf_state_multi_marked.c |    7
-apps/confbridge/include/confbridge.h      |    5
-bridges/bridge_softmix.c                  |    1
-build_tools/prep_tarball                  |    4
-cel/cel_custom.c                          |   10
-channels/chan_dahdi.c                     |   41 -
-channels/chan_h323.c                      |   31 -
-channels/chan_iax2.c                      |  208 ++++---
-channels/chan_misdn.c                     |   14
-channels/chan_motif.c                     |   14
-channels/chan_sip.c                       |   67 +-
-channels/chan_unistim.c                   |   65 +-
-channels/iax2-parser.c                    |   16
-channels/sig_analog.c                     |    1
-channels/sig_pri.c                        |    3
-channels/sig_ss7.c                        |    1
-channels/sip/dialplan_functions.c         |    5
-configs/chan_dahdi.conf.sample            |    3
-configs/confbridge.conf.sample            |    2
-configs/h323.conf.sample                  |    2
-configs/iax.conf.sample                   |    9
-configs/indications.conf.sample           |    2
-configs/sip.conf.sample                   |    3
-configs/sla.conf.sample                   |   11
-contrib/realtime/postgresql/realtime.sql  |   17
-default.exports                           |    4
-funcs/func_channel.c                      |   51 +
-funcs/func_dialgroup.c                    |    8
-funcs/func_global.c                       |   19
-funcs/func_strings.c                      |   17
-include/asterisk/astmm.h                  |    6
-include/asterisk/frame.h                  |    8
-include/asterisk/lock.h                   |   20
-include/asterisk/logger.h                 |    2
-include/asterisk/utils.h                  |   16
-main/abstract_jb.c                        |    4
-main/asterisk.c                           |  269 +++++----
-main/asterisk.exports.in                  |   19
-main/astfd.c                              |    6
-main/astmm.c                              |   27
-main/astobj2.c                            |    4
-main/cdr.c                                |    7
-main/cel.c                                |    2
-main/cli.c                                |   40 +
-main/config.c                             |    4
-main/config_options.c                     |    9
-main/data.c                               |    2
-main/event.c                              |    6
-main/features.c                           |   39 -
-main/format.c                             |    2
-main/heap.c                               |   13
-main/http.c                               |   24
-main/indications.c                        |   10
-main/loader.c                             |    2
-main/lock.c                               |  220 ++++---
-main/logger.c                             |  116 ++--
-main/manager.c                            |   55 +
-main/named_acl.c                          |   10
-main/pbx.c                                |    6
-main/threadstorage.c                      |    6
-main/translate.c                          |   16
-main/udptl.c                              |   12
-main/utils.c                              |   99 ++-
-main/xmldoc.c                             |   14
-pbx/pbx_dundi.c                           |   20
-pbx/pbx_loopback.c                        |   15
-res/Makefile                              |    5
-res/res_agi.c                             |   17
-res/res_calendar.c                        |    2
-res/res_http_websocket.c                  |   14
-res/res_jabber.c                          |   17
-res/res_musiconhold.c                     |   16
-res/res_rtp_asterisk.c                    |   73 ++
-res/res_security_log.c                    |    2
-res/res_xmpp.c                            |   92 ++-
-tests/test_hashtab_thrash.c               |    6
-tests/test_substitution.c                 |   45 -
-tests/test_voicemail_api.c                |   38 -
-utils/ael_main.c                          |    6
-utils/check_expr.c                        |    9
-utils/conf2ael.c                          |    6
-utils/extconf.c                           |    3
-95 files changed, 2173 insertions(+), 1137 deletions(-)
-</pre><br/>
-<hr/>
-</body>
-</html>
diff --git a/asterisk-11.6.0-rc1-summary.txt b/asterisk-11.6.0-rc1-summary.txt
deleted file mode 100644 (file)
index e69de29..0000000
index db48ca1d8369c440b12718d1c678536c295e51ab..18aa100db8b15ed3193e3db4074ecb37f5742b2e 100644 (file)
@@ -16884,9 +16884,8 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sock
                } else {
 
                        set_peer_nat(p, peer);
-                       if (p->natdetected && ast_test_flag(&p->flags[2], SIP_PAGE3_NAT_AUTO_RPORT)) {
-                               ast_copy_flags(&p->flags[0], &peer->flags[0], SIP_NAT_FORCE_RPORT);
-                       }
+
+                       ast_copy_flags(&p->flags[0], &peer->flags[0], SIP_NAT_FORCE_RPORT);
 
                        if (!(res = check_auth(p, req, peer->name, peer->secret, peer->md5secret, SIP_REGISTER, uri2, XMIT_UNRELIABLE))) {
                                if (sip_cancel_destroy(p))
@@ -17938,9 +17937,9 @@ static void check_for_nat(const struct ast_sockaddr *addr, struct sip_pvt *p)
                return;
        }
 
-       if (ast_sockaddr_cmp(addr, &p->recv)) {
-               char *tmp_str = ast_strdupa(ast_sockaddr_stringify(addr));
-               ast_debug(3, "NAT detected for %s / %s\n", tmp_str, ast_sockaddr_stringify(&p->recv));
+       if (ast_sockaddr_cmp_addr(addr, &p->recv)) {
+               char *tmp_str = ast_strdupa(ast_sockaddr_stringify_addr(addr));
+               ast_debug(3, "NAT detected for %s / %s\n", tmp_str, ast_sockaddr_stringify_addr(&p->recv));
                p->natdetected = 1;
                if (ast_test_flag(&p->flags[2], SIP_PAGE3_NAT_AUTO_RPORT)) {
                        ast_set_flag(&p->flags[0], SIP_NAT_FORCE_RPORT);
index 1714d7b7a370969ef91c2bdc58b41e363cb647ec..b623fd53ade60cfae6eebc0bb6f28cc3daafaa58 100644 (file)
@@ -6793,6 +6793,8 @@ int ast_do_masquerade(struct ast_channel *original)
 {
        int x;
        int origstate;
+       unsigned int orig_disablestatecache;
+       unsigned int clone_disablestatecache;
        int visible_indication;
        int clone_was_zombie = 0;/*!< TRUE if the clonechan was a zombie before the masquerade. */
        struct ast_frame *current;
@@ -7029,6 +7031,20 @@ int ast_do_masquerade(struct ast_channel *original)
        ast_channel_state_set(original, ast_channel_state(clonechan));
        ast_channel_state_set(clonechan, origstate);
 
+       /* And the swap the cachable state too. Otherwise we'd start caching
+        * Local channels and ignoring real ones. */
+       orig_disablestatecache = ast_test_flag(ast_channel_flags(original), AST_FLAG_DISABLE_DEVSTATE_CACHE);
+       clone_disablestatecache = ast_test_flag(ast_channel_flags(clonechan), AST_FLAG_DISABLE_DEVSTATE_CACHE);
+       if (orig_disablestatecache != clone_disablestatecache) {
+               if (orig_disablestatecache) {
+                       ast_clear_flag(ast_channel_flags(original), AST_FLAG_DISABLE_DEVSTATE_CACHE);
+                       ast_set_flag(ast_channel_flags(clonechan), AST_FLAG_DISABLE_DEVSTATE_CACHE);
+               } else {
+                       ast_set_flag(ast_channel_flags(original), AST_FLAG_DISABLE_DEVSTATE_CACHE);
+                       ast_clear_flag(ast_channel_flags(clonechan), AST_FLAG_DISABLE_DEVSTATE_CACHE);
+               }
+       }
+
        /* Mangle the name of the clone channel */
        snprintf(zombn, sizeof(zombn), "%s<ZOMBIE>", orig); /* quick, hide the brains! */
        __ast_change_name_nolink(clonechan, zombn);
index 3f9209af52daf30ae22f9cfd2cfa4d3a34e1cf37..77107bf6617183423d0ef424e0955c8986215813 100644 (file)
@@ -1811,6 +1811,7 @@ void __ast_verbose_ap(const char *file, int line, const char *func, int level, s
        res = ast_str_set_va(&buf, 0, fmt, ap);
        /* If the build failed then we can drop this allocated message */
        if (res == AST_DYNSTR_BUILD_FAILED) {
+               ast_free(buf);
                return;
        }
 
@@ -1838,6 +1839,7 @@ void __ast_verbose_ap(const char *file, int line, const char *func, int level, s
        } while (p && *p);
 
        ast_log_callid(__LOG_VERBOSE, file, line, func, callid, "%s", ast_str_buffer(prefixed));
+       ast_free(buf);
 }
 
 void __ast_verbose(const char *file, int line, const char *func, int level, const char *fmt, ...)