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 4047d1c..2bc6f1e 100644 (file)
--- 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 c379843..561e3d3 100644 (file)
--- a/doc/appdocsxml.dtd
+++ b/doc/appdocsxml.dtd
@@ -48,6 +48,7 @@
 
   <!ELEMENT ref (#PCDATA)>
   <!ATTLIST ref type (application|function|astcli|link|manpage|filename|agi|manager|managerEvent) #REQUIRED>
+  <!ATTLIST ref module CDATA #IMPLIED>
 
   <!ELEMENT synopsis (#PCDATA)>
 

diff --git a/main/logger.c b/main/logger.c
index b406960..3caea6c 100644 (file)
--- 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 fe05274..e8e7905 100644 (file)
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -101,8 +101,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <replaceable>asterisk</replaceable>, configured in jabber.conf.</para>
                </description>
                <see-also>
-                       <ref type="function">JABBER_STATUS</ref>
-                       <ref type="function">JABBER_RECEIVE</ref>
+                       <ref type="function" module="res_jabber">JABBER_STATUS</ref>
+                       <ref type="function" module="res_jabber">JABBER_RECEIVE</ref>
                </see-also>
        </application>
        <function name="JABBER_RECEIVE" language="en_US" module="res_jabber">
@@ -130,8 +130,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        the <replaceable>asterisk</replaceable> XMPP account configured in jabber.conf.</para>
                </description>
                <see-also>
-                       <ref type="function">JABBER_STATUS</ref>
-                       <ref type="application">JabberSend</ref>
+                       <ref type="function" module="res_jabber">JABBER_STATUS</ref>
+                       <ref type="application" module="res_jabber">JabberSend</ref>
                </see-also>
        </function>
        <function name="JABBER_STATUS" language="en_US" module="res_jabber">
@@ -160,8 +160,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        the associated XMPP account configured in jabber.conf.</para>
                </description>
                <see-also>
-                       <ref type="function">JABBER_RECEIVE</ref>
-                       <ref type="application">JabberSend</ref>
+                       <ref type="function" module="res_jabber">JABBER_RECEIVE</ref>
+                       <ref type="application" module="res_jabber">JabberSend</ref>
                </see-also>
        </function>
        <application name="JabberSendGroup" language="en_US" module="res_jabber">
@@ -269,7 +269,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                </enum>
                        </enumlist>
                </description>
-        </application>
+       </application>
        <manager name="JabberSend" language="en_US" module="res_jabber">
                <synopsis>
                        Sends a message to a Jabber Client.

diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index c924080..3e84e41 100644 (file)
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -90,8 +90,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <replaceable>asterisk</replaceable>, configured in xmpp.conf.</para>
                </description>
                <see-also>
-                       <ref type="function">JABBER_STATUS</ref>
-                       <ref type="function">JABBER_RECEIVE</ref>
+                       <ref type="function" module="res_xmpp">JABBER_STATUS</ref>
+                       <ref type="function" module="res_xmpp">JABBER_RECEIVE</ref>
                </see-also>
        </application>
        <function name="JABBER_RECEIVE" language="en_US" module="res_xmpp">
@@ -119,8 +119,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        the <replaceable>asterisk</replaceable> XMPP account configured in xmpp.conf.</para>
                </description>
                <see-also>
-                       <ref type="function">JABBER_STATUS</ref>
-                       <ref type="application">JabberSend</ref>
+                       <ref type="function" module="res_xmpp">JABBER_STATUS</ref>
+                       <ref type="application" module="res_xmpp">JabberSend</ref>
                </see-also>
        </function>
        <function name="JABBER_STATUS" language="en_US" module="res_xmpp">
@@ -149,8 +149,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        the associated XMPP account configured in xmpp.conf.</para>
                </description>
                <see-also>
-                       <ref type="function">JABBER_RECEIVE</ref>
-                       <ref type="application">JabberSend</ref>
+                       <ref type="function" module="res_xmpp">JABBER_RECEIVE</ref>
+                       <ref type="application" module="res_xmpp">JabberSend</ref>
                </see-also>
        </function>
        <application name="JabberSendGroup" language="en_US" module="res_xmpp">