From: Automerge script Date: Wed, 16 Jan 2013 18:20:38 +0000 (+0000) Subject: Merged revisions 379229,379231,379233 via svnmerge from X-Git-Tag: 13.0.0-beta1~2194^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=108f5cc5991a774d255c5168a7764a337e1f77d4;p=thirdparty%2Fasterisk.git Merged revisions 379229,379231,379233 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379229 | mjordan | 2013-01-16 11:46:15 -0600 (Wed, 16 Jan 2013) | 10 lines Let documentation reference links specify which module they're linking to Again, since res_jabber/res_xmpp have duplicate APIs, their documentation ref links have to specify which reference they're referring to. The various documentation parsers can interpret the module attribute however they want in order to construct the appropriate links. ........ Merged revisions 379228 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ r379231 | rmudgett | 2013-01-16 11:49:52 -0600 (Wed, 16 Jan 2013) | 10 lines chan_misdn: Fix compile error. (issue ASTERISK-15456) ........ Merged revisions 379226 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379230 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ r379233 | rmudgett | 2013-01-16 12:09:28 -0600 (Wed, 16 Jan 2013) | 8 lines Reduce call-id logging resource usage. Since there is no need for the call-id logging ao2 object to have a lock, don't create it with one. ........ Merged revisions 379232 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379243 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 4047d1c3e1..2bc6f1e35e 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -10096,7 +10096,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) ast_log(LOG_WARNING, "Extension '%s@%s' can never match. Jumping to 'i' extension. port:%d\n", bc->dialed.number, ch->context, bc->port); - pbx_builtin_setvar_helper(ch->ast, "INVALID_EXTEN", bc->dad); + pbx_builtin_setvar_helper(ch->ast, "INVALID_EXTEN", bc->dialed.number); ast_channel_exten_set(ch->ast, "i"); ch->state = MISDN_DIALING; start_pbx(ch, bc, ch->ast); @@ -10354,7 +10354,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) ast_log(LOG_WARNING, "Extension '%s@%s' can never match. Jumping to 'i' extension. port:%d\n", bc->dialed.number, ch->context, bc->port); - pbx_builtin_setvar_helper(ch->ast, "INVALID_EXTEN", bc->dad); + pbx_builtin_setvar_helper(ch->ast, "INVALID_EXTEN", bc->dialed.number); ast_channel_exten_set(ch->ast, "i"); misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE); ch->state = MISDN_DIALING; diff --git a/doc/appdocsxml.dtd b/doc/appdocsxml.dtd index c379843d3f..561e3d38cd 100644 --- a/doc/appdocsxml.dtd +++ b/doc/appdocsxml.dtd @@ -48,6 +48,7 @@ + diff --git a/main/logger.c b/main/logger.c index b4069605d1..3caea6cc53 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1306,16 +1306,14 @@ void ast_callid_strnprint(char *buffer, size_t buffer_size, struct ast_callid *c struct ast_callid *ast_create_callid(void) { struct ast_callid *call; - int using; - if (!(call = ao2_alloc(sizeof(struct ast_callid), NULL))) { + call = ao2_alloc_options(sizeof(struct ast_callid), NULL, AO2_ALLOC_OPT_LOCK_NOLOCK); + if (!call) { ast_log(LOG_ERROR, "Could not allocate callid struct.\n"); return NULL; } - using = ast_atomic_fetchadd_int(&next_unique_callid, +1); - - call->call_identifier = using; + call->call_identifier = ast_atomic_fetchadd_int(&next_unique_callid, +1); ast_debug(3, "CALL_ID [C-%08x] created by thread.\n", call->call_identifier); return call; } diff --git a/res/res_jabber.c b/res/res_jabber.c index fe05274ef3..e8e79051e4 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -101,8 +101,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") asterisk, configured in jabber.conf. - JABBER_STATUS - JABBER_RECEIVE + JABBER_STATUS + JABBER_RECEIVE @@ -130,8 +130,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") the asterisk XMPP account configured in jabber.conf. - JABBER_STATUS - JabberSend + JABBER_STATUS + JabberSend @@ -160,8 +160,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") the associated XMPP account configured in jabber.conf. - JABBER_RECEIVE - JabberSend + JABBER_RECEIVE + JabberSend @@ -269,7 +269,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - + Sends a message to a Jabber Client. diff --git a/res/res_xmpp.c b/res/res_xmpp.c index c924080981..3e84e41932 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -90,8 +90,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") asterisk, configured in xmpp.conf. - JABBER_STATUS - JABBER_RECEIVE + JABBER_STATUS + JABBER_RECEIVE @@ -119,8 +119,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") the asterisk XMPP account configured in xmpp.conf. - JABBER_STATUS - JabberSend + JABBER_STATUS + JabberSend @@ -149,8 +149,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") the associated XMPP account configured in xmpp.conf. - JABBER_RECEIVE - JabberSend + JABBER_RECEIVE + JabberSend