[asterisk-commits] oej: branch oej/darjeeling-prack-1.8 r369041 - in /team/oej/darjeeling-prack-...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Jun 17 15:32:59 CDT 2012
Author: oej
Date: Sun Jun 17 15:32:54 2012
New Revision: 369041
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369041
Log:
Reset automerge
Added:
team/oej/darjeeling-prack-1.8/build_tools/find_missing_support_level
- copied unchanged from r369002, branches/1.8/build_tools/find_missing_support_level
Modified:
team/oej/darjeeling-prack-1.8/ (props changed)
team/oej/darjeeling-prack-1.8/Makefile
team/oej/darjeeling-prack-1.8/channels/chan_dahdi.c
team/oej/darjeeling-prack-1.8/channels/chan_iax2.c
team/oej/darjeeling-prack-1.8/channels/chan_misdn.c
team/oej/darjeeling-prack-1.8/channels/chan_sip.c
team/oej/darjeeling-prack-1.8/channels/console_board.c
team/oej/darjeeling-prack-1.8/channels/console_gui.c
team/oej/darjeeling-prack-1.8/channels/console_video.c
team/oej/darjeeling-prack-1.8/channels/iax2-parser.c
team/oej/darjeeling-prack-1.8/channels/iax2-provision.c
team/oej/darjeeling-prack-1.8/channels/misdn/ie.c
team/oej/darjeeling-prack-1.8/channels/misdn/isdn_lib.c
team/oej/darjeeling-prack-1.8/channels/misdn/isdn_msg_parser.c
team/oej/darjeeling-prack-1.8/channels/misdn/portinfo.c
team/oej/darjeeling-prack-1.8/channels/misdn_config.c
team/oej/darjeeling-prack-1.8/channels/sig_analog.c
team/oej/darjeeling-prack-1.8/channels/sig_pri.c
team/oej/darjeeling-prack-1.8/channels/sig_ss7.c
team/oej/darjeeling-prack-1.8/channels/sip/config_parser.c
team/oej/darjeeling-prack-1.8/channels/sip/dialplan_functions.c
team/oej/darjeeling-prack-1.8/channels/sip/reqresp_parser.c
team/oej/darjeeling-prack-1.8/channels/sip/sdp_crypto.c
team/oej/darjeeling-prack-1.8/channels/sip/srtp.c
team/oej/darjeeling-prack-1.8/channels/vcodecs.c
team/oej/darjeeling-prack-1.8/channels/vgrabbers.c
team/oej/darjeeling-prack-1.8/funcs/func_volume.c
team/oej/darjeeling-prack-1.8/include/asterisk/channel.h
team/oej/darjeeling-prack-1.8/main/acl.c
team/oej/darjeeling-prack-1.8/main/app.c
team/oej/darjeeling-prack-1.8/main/bridging.c
team/oej/darjeeling-prack-1.8/main/cdr.c
team/oej/darjeeling-prack-1.8/main/channel.c
team/oej/darjeeling-prack-1.8/main/chanvars.c
team/oej/darjeeling-prack-1.8/main/config.c
team/oej/darjeeling-prack-1.8/main/data.c
team/oej/darjeeling-prack-1.8/main/db.c
team/oej/darjeeling-prack-1.8/main/dns.c
team/oej/darjeeling-prack-1.8/main/fskmodem_int.c
team/oej/darjeeling-prack-1.8/main/image.c
team/oej/darjeeling-prack-1.8/main/jitterbuf.c
team/oej/darjeeling-prack-1.8/main/loader.c
team/oej/darjeeling-prack-1.8/main/slinfactory.c
team/oej/darjeeling-prack-1.8/main/stdtime/localtime.c
team/oej/darjeeling-prack-1.8/main/syslog.c
team/oej/darjeeling-prack-1.8/main/tdd.c
team/oej/darjeeling-prack-1.8/main/term.c
team/oej/darjeeling-prack-1.8/main/translate.c
team/oej/darjeeling-prack-1.8/main/utils.c
team/oej/darjeeling-prack-1.8/main/xml.c
team/oej/darjeeling-prack-1.8/pbx/dundi-parser.c
Propchange: team/oej/darjeeling-prack-1.8/
('svnmerge-integrated' removed)
Modified: team/oej/darjeeling-prack-1.8/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/Makefile?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/Makefile (original)
+++ team/oej/darjeeling-prack-1.8/Makefile Sun Jun 17 15:32:54 2012
@@ -466,39 +466,23 @@
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
+ "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
+ "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
+ "$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
+ "$(ASTLOGDIR)" "$(ASTLOGDIR)/cdr-csv" "$(ASTLOGDIR)/cdr-custom" \
+ "$(ASTLOGDIR)/cel-custom" "$(ASTDATADIR)" "$(ASTDATADIR)/documentation" \
+ "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
+ "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
+ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \
+ "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)"
installdirs:
- $(INSTALL) -d "$(DESTDIR)$(MODULES_DIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTSBINDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTVARRUNDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
- $(INSTALL) -d "$(DESTDIR)$(ASTHEADERDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTHEADERDIR)/doxygen"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-csv"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-custom"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cel-custom"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/documentation"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/documentation/thirdparty"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/firmware"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/firmware/iax"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/images"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/keys"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/phoneprov"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/sounds"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/moh"
- $(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
- $(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
+ @for i in $(INSTALLDIRS); do \
+ if [ ! -z "$${i}" -a ! -d "$(DESTDIR)$${i}" ]; then \
+ $(INSTALL) -d "$(DESTDIR)$${i}"; \
+ fi; \
+ done
bininstall: _all installdirs $(SUBDIRS_INSTALL)
$(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
Modified: team/oej/darjeeling-prack-1.8/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/chan_dahdi.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/chan_dahdi.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/chan_dahdi.c Sun Jun 17 15:32:54 2012
@@ -8870,13 +8870,18 @@
f = &p->subs[idx].f;
return f;
}
+
f = dahdi_handle_event(ast);
-
- /* tell the cdr this zap device hung up */
- if (f == NULL) {
- ast_set_hangupsource(ast, ast->name, 0);
- }
-
+ if (!f) {
+ const char *name = ast_strdupa(ast->name);
+
+ /* Tell the CDR this DAHDI device hung up */
+ ast_mutex_unlock(&p->lock);
+ ast_channel_unlock(ast);
+ ast_set_hangupsource(ast, name, 0);
+ ast_channel_lock(ast);
+ ast_mutex_lock(&p->lock);
+ }
return f;
}
Modified: team/oej/darjeeling-prack-1.8/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/chan_iax2.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/chan_iax2.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/chan_iax2.c Sun Jun 17 15:32:54 2012
@@ -9890,11 +9890,20 @@
{
iax2_lock_owner(callno);
if (iaxs[callno] && iaxs[callno]->owner) {
+ struct ast_channel *owner;
+ const char *name;
+
+ owner = iaxs[callno]->owner;
if (causecode) {
- iaxs[callno]->owner->hangupcause = causecode;
- }
- ast_set_hangupsource(iaxs[callno]->owner, iaxs[callno]->owner->name, 0);
- ast_channel_unlock(iaxs[callno]->owner);
+ owner->hangupcause = causecode;
+ }
+ name = ast_strdupa(owner->name);
+ ast_channel_ref(owner);
+ ast_channel_unlock(owner);
+ ast_mutex_unlock(&iaxsl[callno]);
+ ast_set_hangupsource(owner, name, 0);
+ ast_channel_unref(owner);
+ ast_mutex_lock(&iaxsl[callno]);
}
}
Modified: team/oej/darjeeling-prack-1.8/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/chan_misdn.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/chan_misdn.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/chan_misdn.c Sun Jun 17 15:32:54 2012
@@ -55,6 +55,7 @@
<depend>suppserv</depend>
<support_level>extended</support_level>
***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Modified: team/oej/darjeeling-prack-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/chan_sip.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/chan_sip.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/chan_sip.c Sun Jun 17 15:32:54 2012
@@ -16116,10 +16116,11 @@
}
if (!ast_strlen_zero(peer->cid_name))
ast_string_field_set(p, cid_name, peer->cid_name);
- if (!ast_strlen_zero(peer->cid_tag))
- ast_string_field_set(p, cid_tag, peer->cid_tag);
if (peer->callingpres)
p->callingpres = peer->callingpres;
+ }
+ if (!ast_strlen_zero(peer->cid_tag)) {
+ ast_string_field_set(p, cid_tag, peer->cid_tag);
}
ast_string_field_set(p, fullcontact, peer->fullcontact);
@@ -20026,6 +20027,41 @@
}
}
+/*!
+ * \internal
+ * \brief Set hangup source and cause.
+ *
+ * \param p SIP private.
+ * \param cause Hangup cause to queue. Zero if no cause.
+ *
+ * \pre p and p->owner are locked.
+ *
+ * \return Nothing
+ */
+static void sip_queue_hangup_cause(struct sip_pvt *p, int cause)
+{
+ struct ast_channel *owner = p->owner;
+ const char *name = ast_strdupa(owner->name);
+
+ /* Cannot hold any channel/private locks when calling. */
+ ast_channel_ref(owner);
+ ast_channel_unlock(owner);
+ sip_pvt_unlock(p);
+ ast_set_hangupsource(owner, name, 0);
+ if (cause) {
+ ast_queue_hangup_with_cause(owner, cause);
+ } else {
+ ast_queue_hangup(owner);
+ }
+ ast_channel_unref(owner);
+
+ /* Relock things. */
+ owner = sip_pvt_lock_full(p);
+ if (owner) {
+ ast_channel_unref(owner);
+ }
+}
+
/*! \brief Handle SIP response to INVITE dialogue */
static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest, struct sip_request *req, uint32_t seqno)
{
@@ -20370,16 +20406,14 @@
xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
ast_log(LOG_WARNING, "Received response: \"Forbidden\" from '%s'\n", get_header(&p->initreq, "From"));
if (!req->ignore && p->owner) {
- ast_set_hangupsource(p->owner, p->owner->name, 0);
- ast_queue_hangup_with_cause(p->owner, hangup_sip2cause(resp));
+ sip_queue_hangup_cause(p, hangup_sip2cause(resp));
}
break;
case 404: /* Not found */
xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
if (p->owner && !req->ignore) {
- ast_set_hangupsource(p->owner, p->owner->name, 0);
- ast_queue_hangup_with_cause(p->owner, hangup_sip2cause(resp));
+ sip_queue_hangup_cause(p, hangup_sip2cause(resp));
}
break;
@@ -23828,11 +23862,10 @@
stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
if (p->owner) {
- ast_set_hangupsource(p->owner, p->owner->name, 0);
- ast_queue_hangup(p->owner);
- }
- else
+ sip_queue_hangup_cause(p, 0);
+ } else {
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
+ }
if (ast_str_strlen(p->initreq.data) > 0) {
struct sip_pkt *pkt, *prev_pkt;
/* If the CANCEL we are receiving is a retransmission, and we already have scheduled
@@ -23986,8 +24019,7 @@
ast_queue_hangup_with_cause(p->owner, AST_CAUSE_PROTOCOL_ERROR);
}
} else if (p->owner) {
- ast_set_hangupsource(p->owner, p->owner->name, 0);
- ast_queue_hangup(p->owner);
+ sip_queue_hangup_cause(p, 0);
sip_scheddestroy_final(p, DEFAULT_TRANS_TIMEOUT);
ast_debug(3, "Received bye, issuing owner hangup\n");
} else {
Modified: team/oej/darjeeling-prack-1.8/channels/console_board.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/console_board.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/console_board.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/console_board.c Sun Jun 17 15:32:54 2012
@@ -36,6 +36,10 @@
* so the board geometry can be read from the skin or from the
* configuration file).
*/
+
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "asterisk.h" /* ast_strdupa */
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Modified: team/oej/darjeeling-prack-1.8/channels/console_gui.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/console_gui.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/console_gui.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/console_gui.c Sun Jun 17 15:32:54 2012
@@ -77,6 +77,10 @@
*
*/
+
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "asterisk.h"
#include "console_video.h"
Modified: team/oej/darjeeling-prack-1.8/channels/console_video.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/console_video.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/console_video.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/console_video.c Sun Jun 17 15:32:54 2012
@@ -35,6 +35,10 @@
//#define DROP_PACKETS 5 /* if set, drop this % of video packets */
//#define OLD_FFMPEG 1 /* set for old ffmpeg with no swscale */
+
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Modified: team/oej/darjeeling-prack-1.8/channels/iax2-parser.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/iax2-parser.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/iax2-parser.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/iax2-parser.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/iax2-provision.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/iax2-provision.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/iax2-provision.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/iax2-provision.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/misdn/ie.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/misdn/ie.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/misdn/ie.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/misdn/ie.c Sun Jun 17 15:32:54 2012
@@ -24,6 +24,10 @@
if qi is not NULL (TE-mode), offset is set
*/
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
+
#include "asterisk.h"
#include <string.h>
Modified: team/oej/darjeeling-prack-1.8/channels/misdn/isdn_lib.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/misdn/isdn_lib.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/misdn/isdn_lib.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/misdn/isdn_lib.c Sun Jun 17 15:32:54 2012
@@ -16,7 +16,9 @@
* \author Christian Richter <crich at beronet.com>
*/
-
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include <syslog.h>
#include <sys/time.h>
Modified: team/oej/darjeeling-prack-1.8/channels/misdn/isdn_msg_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/misdn/isdn_msg_parser.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/misdn/isdn_msg_parser.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/misdn/isdn_msg_parser.c Sun Jun 17 15:32:54 2012
@@ -16,7 +16,9 @@
* \author Christian Richter <crich at beronet.com>
*/
-
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "isdn_lib_intern.h"
Modified: team/oej/darjeeling-prack-1.8/channels/misdn/portinfo.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/misdn/portinfo.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/misdn/portinfo.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/misdn/portinfo.c Sun Jun 17 15:32:54 2012
@@ -3,6 +3,9 @@
* \author Christian Richter <crich at beronet.com>
*/
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "isdn_lib.h"
#include "isdn_lib_intern.h"
Modified: team/oej/darjeeling-prack-1.8/channels/misdn_config.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/misdn_config.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/misdn_config.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/misdn_config.c Sun Jun 17 15:32:54 2012
@@ -25,6 +25,10 @@
*
* \ingroup channel_drivers
*/
+
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/sig_analog.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/sig_analog.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/sig_analog.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Matthew Fredrickson <creslin at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
@@ -3617,7 +3621,18 @@
f = &p->subs[idx].f;
return f;
}
+
f = __analog_handle_event(p, ast);
+ if (!f) {
+ const char *name = ast_strdupa(ast->name);
+
+ /* Tell the CDR this DAHDI device hung up */
+ analog_unlock_private(p);
+ ast_channel_unlock(ast);
+ ast_set_hangupsource(ast, name, 0);
+ ast_channel_lock(ast);
+ analog_lock_private(p);
+ }
return f;
}
Modified: team/oej/darjeeling-prack-1.8/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/sig_pri.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/sig_pri.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/sig_pri.c Sun Jun 17 15:32:54 2012
@@ -23,6 +23,9 @@
* \author Matthew Fredrickson <creslin at digium.com>
*/
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/sig_ss7.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/sig_ss7.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/sig_ss7.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/sig_ss7.c Sun Jun 17 15:32:54 2012
@@ -27,6 +27,9 @@
* \arg \ref AstCREDITS
*/
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/sip/config_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/sip/config_parser.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/sip/config_parser.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/sip/config_parser.c Sun Jun 17 15:32:54 2012
@@ -18,6 +18,10 @@
* \file
* \brief sip config parsing functions and unit tests
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/sip/dialplan_functions.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/sip/dialplan_functions.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/sip/dialplan_functions.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/sip/dialplan_functions.c Sun Jun 17 15:32:54 2012
@@ -18,6 +18,10 @@
* \file
* \brief sip channel dialplan functions and unit tests
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/sip/reqresp_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/sip/reqresp_parser.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/sip/reqresp_parser.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/sip/reqresp_parser.c Sun Jun 17 15:32:54 2012
@@ -18,6 +18,10 @@
* \file
* \brief sip request parsing functions and unit tests
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/sip/sdp_crypto.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/sip/sdp_crypto.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/sip/sdp_crypto.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/sip/sdp_crypto.c Sun Jun 17 15:32:54 2012
@@ -24,6 +24,10 @@
*
* \author Mikael Magnusson <mikma at users.sourceforge.net>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/channels/sip/srtp.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/sip/srtp.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/sip/srtp.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/sip/srtp.c Sun Jun 17 15:32:54 2012
@@ -25,6 +25,10 @@
* \author Mikael Magnusson <mikma at users.sourceforge.net>
*/
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Modified: team/oej/darjeeling-prack-1.8/channels/vcodecs.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/vcodecs.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/vcodecs.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/vcodecs.c Sun Jun 17 15:32:54 2012
@@ -18,6 +18,10 @@
* Video codecs support for console_video.c
* $Revision$
*/
+
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "asterisk.h"
#include "console_video.h"
Modified: team/oej/darjeeling-prack-1.8/channels/vgrabbers.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/vgrabbers.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/vgrabbers.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/vgrabbers.c Sun Jun 17 15:32:54 2012
@@ -43,6 +43,10 @@
* [src]-->--[enc_in]--+
* `->--[enc_out]
*/
+
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Modified: team/oej/darjeeling-prack-1.8/funcs/func_volume.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/funcs/func_volume.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/funcs/func_volume.c (original)
+++ team/oej/darjeeling-prack-1.8/funcs/func_volume.c Sun Jun 17 15:32:54 2012
@@ -90,6 +90,9 @@
struct volume_information *vi = data;
/* Destroy the audiohook, and destroy ourselves */
+ ast_audiohook_lock(&vi->audiohook);
+ ast_audiohook_detach(&vi->audiohook);
+ ast_audiohook_unlock(&vi->audiohook);
ast_audiohook_destroy(&vi->audiohook);
ast_free(vi);
Modified: team/oej/darjeeling-prack-1.8/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/include/asterisk/channel.h?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/include/asterisk/channel.h (original)
+++ team/oej/darjeeling-prack-1.8/include/asterisk/channel.h Sun Jun 17 15:32:54 2012
@@ -1470,6 +1470,8 @@
* \param source a string describing the source of the hangup for this channel
* \param force
*
+ * \note Absolutely _NO_ channel locks should be held before calling this function.
+ *
* \since 1.8
*
* Hangupsource is generally the channel name that caused the bridge to be
Modified: team/oej/darjeeling-prack-1.8/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/acl.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/acl.c (original)
+++ team/oej/darjeeling-prack-1.8/main/acl.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/app.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/app.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/app.c (original)
+++ team/oej/darjeeling-prack-1.8/main/app.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/bridging.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/bridging.c (original)
+++ team/oej/darjeeling-prack-1.8/main/bridging.c Sun Jun 17 15:32:54 2012
@@ -23,6 +23,10 @@
* \author Joshua Colp <jcolp at digium.com>
*/
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Modified: team/oej/darjeeling-prack-1.8/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/cdr.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/cdr.c (original)
+++ team/oej/darjeeling-prack-1.8/main/cdr.c Sun Jun 17 15:32:54 2012
@@ -30,6 +30,10 @@
* isn't properly generated and posted.
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/channel.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/channel.c (original)
+++ team/oej/darjeeling-prack-1.8/main/channel.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
@@ -2731,12 +2735,18 @@
ast_string_field_set(chan, hangupsource, source);
}
bridge = ast_bridged_channel(chan);
+ if (bridge) {
+ ast_channel_ref(bridge);
+ }
ast_channel_unlock(chan);
- if (bridge && (force || ast_strlen_zero(bridge->hangupsource))) {
+ if (bridge) {
ast_channel_lock(bridge);
- ast_string_field_set(chan, hangupsource, source);
+ if (force || ast_strlen_zero(bridge->hangupsource)) {
+ ast_string_field_set(bridge, hangupsource, source);
+ }
ast_channel_unlock(bridge);
+ ast_channel_unref(bridge);
}
}
Modified: team/oej/darjeeling-prack-1.8/main/chanvars.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/chanvars.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/chanvars.c (original)
+++ team/oej/darjeeling-prack-1.8/main/chanvars.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/config.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/config.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/config.c (original)
+++ team/oej/darjeeling-prack-1.8/main/config.c Sun Jun 17 15:32:54 2012
@@ -25,6 +25,10 @@
* Includes the Asterisk Realtime API - ARA
* See http://wiki.asterisk.org
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/data.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/data.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/data.c (original)
+++ team/oej/darjeeling-prack-1.8/main/data.c Sun Jun 17 15:32:54 2012
@@ -21,6 +21,10 @@
* \author Brett Bryant <brettbryant at gmail.com>
* \author Eliel C. Sardanons (LU1ALY) <eliels at gmail.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/db.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/db.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/db.c (original)
+++ team/oej/darjeeling-prack-1.8/main/db.c Sun Jun 17 15:32:54 2012
@@ -26,6 +26,10 @@
* with GPL. To avoid having to make another exception (and complicate
* licensing even further) we elect to use DB1 which is BSD licensed
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/dns.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/dns.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/dns.c (original)
+++ team/oej/darjeeling-prack-1.8/main/dns.c Sun Jun 17 15:32:54 2012
@@ -28,6 +28,10 @@
* - DNR SRV records http://www.ietf.org/rfc/rfc2782.txt
*
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/fskmodem_int.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/fskmodem_int.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/fskmodem_int.c (original)
+++ team/oej/darjeeling-prack-1.8/main/fskmodem_int.c Sun Jun 17 15:32:54 2012
@@ -27,6 +27,10 @@
* \arg Includes code and algorithms from the Zapata library.
*
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/image.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/image.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/image.c (original)
+++ team/oej/darjeeling-prack-1.8/main/image.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/jitterbuf.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/jitterbuf.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/jitterbuf.c (original)
+++ team/oej/darjeeling-prack-1.8/main/jitterbuf.c Sun Jun 17 15:32:54 2012
@@ -26,6 +26,10 @@
* \author Steve Kann <stevek at stevek.com>
*
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/loader.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/loader.c (original)
+++ team/oej/darjeeling-prack-1.8/main/loader.c Sun Jun 17 15:32:54 2012
@@ -26,6 +26,10 @@
* \author Luigi Rizzo <rizzo at icir.org>
* - See ModMngMnt
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/slinfactory.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/slinfactory.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/slinfactory.c (original)
+++ team/oej/darjeeling-prack-1.8/main/slinfactory.c Sun Jun 17 15:32:54 2012
@@ -23,6 +23,10 @@
*
* \author Anthony Minessale <anthmct at yahoo.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/stdtime/localtime.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/stdtime/localtime.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/stdtime/localtime.c (original)
+++ team/oej/darjeeling-prack-1.8/main/stdtime/localtime.c Sun Jun 17 15:32:54 2012
@@ -43,6 +43,10 @@
/* #define DEBUG */
/*LINTLIBRARY*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/syslog.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/syslog.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/syslog.c (original)
+++ team/oej/darjeeling-prack-1.8/main/syslog.c Sun Jun 17 15:32:54 2012
@@ -21,6 +21,10 @@
* \brief Asterisk Syslog Utility Functions
* \author Sean Bright <sean at malleable.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
#include "asterisk/utils.h"
Modified: team/oej/darjeeling-prack-1.8/main/tdd.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/tdd.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/tdd.c (original)
+++ team/oej/darjeeling-prack-1.8/main/tdd.c Sun Jun 17 15:32:54 2012
@@ -26,6 +26,10 @@
*
* \note Includes code and algorithms from the Zapata library.
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/term.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/term.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/term.c (original)
+++ team/oej/darjeeling-prack-1.8/main/term.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/translate.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/translate.c (original)
+++ team/oej/darjeeling-prack-1.8/main/translate.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/utils.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/utils.c (original)
+++ team/oej/darjeeling-prack-1.8/main/utils.c Sun Jun 17 15:32:54 2012
@@ -22,6 +22,10 @@
* so please use them in favour of other routines.
* Please consult the CODING GUIDELINES for more information.
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/darjeeling-prack-1.8/main/xml.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/main/xml.c?view=diff&rev=369041&r1=369040&r2=369041
==============================================================================
--- team/oej/darjeeling-prack-1.8/main/xml.c (original)
+++ team/oej/darjeeling-prack-1.8/main/xml.c Sun Jun 17 15:32:54 2012
@@ -20,6 +20,10 @@
*
* \author Eliel C. Sardanons (LU1ALY) <eliels at gmail.com>
*/
+
+/*** MODULEINFO
[... 23 lines stripped ...]
More information about the asterisk-commits
mailing list