[asterisk-commits] bebuild: tag 11.0.1 r375834 - in /tags/11.0.1: ./ channels/ configs/ res/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Nov 5 10:29:50 CST 2012
Author: bebuild
Date: Mon Nov 5 10:29:46 2012
New Revision: 375834
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375834
Log:
Update 11.0.1 with merged changes
Merged r375559 for ASTERISK-20631
Merged r375575 for ASTERISK-20611
Modified:
tags/11.0.1/ (props changed)
tags/11.0.1/.version
tags/11.0.1/ChangeLog
tags/11.0.1/channels/chan_sip.c
tags/11.0.1/configs/sip.conf.sample
tags/11.0.1/res/res_http_websocket.exports.in
Propchange: tags/11.0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 5 10:29:46 2012
@@ -1,1 +1,1 @@
-/branches/11:374792,374842,374850-374851,374877,375051,375148
+/branches/11:374792,374842,374850-374851,374877,375051,375148,375559,375575
Modified: tags/11.0.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/11.0.1/.version?view=diff&rev=375834&r1=375833&r2=375834
==============================================================================
--- tags/11.0.1/.version (original)
+++ tags/11.0.1/.version Mon Nov 5 10:29:46 2012
@@ -1,1 +1,1 @@
-11.0.0
+11.0.1
Modified: tags/11.0.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/11.0.1/ChangeLog?view=diff&rev=375834&r1=375833&r2=375834
==============================================================================
--- tags/11.0.1/ChangeLog (original)
+++ tags/11.0.1/ChangeLog Mon Nov 5 10:29:46 2012
@@ -1,3 +1,25 @@
+2012-11-05 Asterisk Development Team <asteriskteam at digium.com>
+
+ * Asterisk 11.0.1 Released.
+
+ * Fix a bug causing SIP reloads to remove all entries from the registry
+
+ (closes issue ASTERISK-20611)
+ Reported by: Alisher
+
+ * Fix an issue with res_http_websocket where the chan_sip WebSocket
+ handler could not be registered.
+
+ On some systems the optional API support uses the GCC compiler
+ attribute "weakref" to provide its functionality. This code changes
+ the function names and prefixes "__" to the front. The
+ res_http_websocket exports file did not take this into account,
+ thereby not allowing those functions to be global and ultimately
+ found.
+
+ (closes issue ASTERISK-20631)
+ Reported by: danjenkins
+
2012-10-25 Asterisk Development Team <asteriskteam at digium.com>
* Asterisk 11.0.0 Released.
Modified: tags/11.0.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.0.1/channels/chan_sip.c?view=diff&rev=375834&r1=375833&r2=375834
==============================================================================
--- tags/11.0.1/channels/chan_sip.c (original)
+++ tags/11.0.1/channels/chan_sip.c Mon Nov 5 10:29:46 2012
@@ -30496,7 +30496,16 @@
static int peer_markall_func(void *device, void *arg, int flags)
{
struct sip_peer *peer = device;
- if (!peer->selfdestruct || sip_cfg.autocreatepeer != AUTOPEERS_PERSIST) {
+ if (!peer->selfdestruct) {
+ peer->the_mark = 1;
+ }
+ return 0;
+}
+
+static int peer_markall_autopeers_func(void *device, void *arg, int flags)
+{
+ struct sip_peer *peer = device;
+ if (peer->selfdestruct) {
peer->the_mark = 1;
}
return 0;
@@ -30638,6 +30647,11 @@
ast_mutex_unlock(&authl_lock);
cleanup_all_regs();
+
+ /* Then, actually destroy users and registry */
+ ASTOBJ_CONTAINER_DESTROYALL(®l, sip_registry_destroy);
+ ast_debug(4, "--------------- Done destroying registry list\n");
+ ao2_t_callback(peers, OBJ_NODATA, peer_markall_func, NULL, "callback to mark all peers");
}
/* Reset certificate handling for TLS sessions */
@@ -31364,11 +31378,8 @@
max_subexpiry = max_expiry;
}
- if (reason != CHANNEL_MODULE_LOAD) {
- /* Then, actually destroy users and registry */
- ASTOBJ_CONTAINER_DESTROYALL(®l, sip_registry_destroy);
- ast_debug(4, "--------------- Done destroying registry list\n");
- ao2_t_callback(peers, OBJ_NODATA, peer_markall_func, NULL, "callback to mark all peers");
+ if (reason != CHANNEL_MODULE_LOAD && sip_cfg.autocreatepeer != AUTOPEERS_PERSIST) {
+ ao2_t_callback(peers, OBJ_NODATA, peer_markall_autopeers_func, NULL, "callback to mark autopeers for destruction");
}
if (subscribe_network_change) {
Modified: tags/11.0.1/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/tags/11.0.1/configs/sip.conf.sample?view=diff&rev=375834&r1=375833&r2=375834
==============================================================================
--- tags/11.0.1/configs/sip.conf.sample (original)
+++ tags/11.0.1/configs/sip.conf.sample Mon Nov 5 10:29:46 2012
@@ -510,14 +510,14 @@
;
;refer_addheaders=yes ; on by default
-;autocreatepeers=no ; Allow any not exsplicitly defined here UAC to register
- ; WITHOUT AUTHENTICATION. Enabling this options poses a high
- ; potential security risk and should be avoided unless the
- ; server is behind a trusted firewall.
- ; When enabled by setting to "yes", the autocreated peers are
- ; pruned immediately when the "sip reload" command is issued
- ; through CLI. When enabled by setting to "persist", the auto-
- ; created peers survive the "sip reload" command.
+;autocreatepeer=no ; Allow any UAC not explicitly defined to register
+ ; WITHOUT AUTHENTICATION. Enabling this options poses a high
+ ; potential security risk and should be avoided unless the
+ ; server is behind a trusted firewall.
+ ; If set to "yes", then peers created in this fashion
+ ; are purged during SIP reloads.
+ ; When set to "persist", the peers created in this fashion
+ ; are not purged during SIP reloads.
;
;------------------------ TLS settings ------------------------------------------------------------
Modified: tags/11.0.1/res/res_http_websocket.exports.in
URL: http://svnview.digium.com/svn/asterisk/tags/11.0.1/res/res_http_websocket.exports.in?view=diff&rev=375834&r1=375833&r2=375834
==============================================================================
--- tags/11.0.1/res/res_http_websocket.exports.in (original)
+++ tags/11.0.1/res/res_http_websocket.exports.in Mon Nov 5 10:29:46 2012
@@ -1,18 +1,18 @@
{
global:
- LINKER_SYMBOL_PREFIXast_websocket_add_protocol;
- LINKER_SYMBOL_PREFIXast_websocket_remove_protocol;
- LINKER_SYMBOL_PREFIXast_websocket_read;
- LINKER_SYMBOL_PREFIXast_websocket_write;
- LINKER_SYMBOL_PREFIXast_websocket_close;
- LINKER_SYMBOL_PREFIXast_websocket_reconstruct_enable;
- LINKER_SYMBOL_PREFIXast_websocket_reconstruct_disable;
- LINKER_SYMBOL_PREFIXast_websocket_ref;
- LINKER_SYMBOL_PREFIXast_websocket_unref;
- LINKER_SYMBOL_PREFIXast_websocket_fd;
- LINKER_SYMBOL_PREFIXast_websocket_remote_address;
- LINKER_SYMBOL_PREFIXast_websocket_is_secure;
- LINKER_SYMBOL_PREFIXast_websocket_set_nonblock;
+ LINKER_SYMBOL_PREFIX*ast_websocket_add_protocol;
+ LINKER_SYMBOL_PREFIX*ast_websocket_remove_protocol;
+ LINKER_SYMBOL_PREFIX*ast_websocket_read;
+ LINKER_SYMBOL_PREFIX*ast_websocket_write;
+ LINKER_SYMBOL_PREFIX*ast_websocket_close;
+ LINKER_SYMBOL_PREFIX*ast_websocket_reconstruct_enable;
+ LINKER_SYMBOL_PREFIX*ast_websocket_reconstruct_disable;
+ LINKER_SYMBOL_PREFIX*ast_websocket_ref;
+ LINKER_SYMBOL_PREFIX*ast_websocket_unref;
+ LINKER_SYMBOL_PREFIX*ast_websocket_fd;
+ LINKER_SYMBOL_PREFIX*ast_websocket_remote_address;
+ LINKER_SYMBOL_PREFIX*ast_websocket_is_secure;
+ LINKER_SYMBOL_PREFIX*ast_websocket_set_nonblock;
local:
*;
};
More information about the asterisk-commits
mailing list