diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 4047d1c3e16e1159fe9c2a2ef5e5c617d5e1b383..2bc6f1e35e2b696eeae9763450aefb8d8f997469 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 c379843d3f5d4fd26814fa6d95efd417ed1f06f6..561e3d38cd4322843954760f7e8ae758d38bdfcd 100644
--- 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 b4069605d1613827e4066ebbb3b1a0f1f4bd1571..3caea6cc53604203c824bf7df620364b705ebf49 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 fe05274ef398fdf5fa979c772322c41a39141974..e8e79051e4b4f3d00046102ade7aa6bedcaa6278 100644
--- 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 c924080981b4a31c1824165ccf09f47905b1d6e3..3e84e4193209b8e87e4ef38b0fd813908f63ae8e 100644
--- 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">