[svn-commits] file: trunk r180369 - in /trunk: ./ apps/ bridges/ channels/ include/asterisk...

[SVN commits to the Digium repositories]

Author: file
Date: Thu Mar  5 12:18:27 2009
New Revision: 180369

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180369
Log:
Merge phase 1 support for the new bridging architecture.

This commit brings in the bridging core, bridging technologies,
and the ConfBridge application.

For usage information on the ConfBridge application please see
the output of "core show application ConfBridge" from the CLI.

For API documentation please see the doxygen page describing the
architecture and the documentation for each API call.

Review: http://reviewboard.digium.com/r/93/

Added:
    trunk/apps/app_confbridge.c
      - copied unchanged from r180368, team/file/bridging/apps/app_confbridge.c
    trunk/bridges/   (props changed)
      - copied from r180368, team/file/bridging/bridges/
    trunk/bridges/Makefile
      - copied unchanged from r180368, team/file/bridging/bridges/Makefile
    trunk/bridges/bridge_builtin_features.c
      - copied unchanged from r180368, team/file/bridging/bridges/bridge_builtin_features.c
    trunk/bridges/bridge_multiplexed.c
      - copied unchanged from r180368, team/file/bridging/bridges/bridge_multiplexed.c
    trunk/bridges/bridge_simple.c
      - copied unchanged from r180368, team/file/bridging/bridges/bridge_simple.c
    trunk/bridges/bridge_softmix.c
      - copied unchanged from r180368, team/file/bridging/bridges/bridge_softmix.c
    trunk/channels/chan_bridge.c
      - copied unchanged from r180368, team/file/bridging/channels/chan_bridge.c
    trunk/include/asterisk/bridging.h
      - copied unchanged from r180368, team/file/bridging/include/asterisk/bridging.h
    trunk/include/asterisk/bridging_features.h
      - copied unchanged from r180368, team/file/bridging/include/asterisk/bridging_features.h
    trunk/include/asterisk/bridging_technology.h
      - copied unchanged from r180368, team/file/bridging/include/asterisk/bridging_technology.h
    trunk/main/bridging.c
      - copied unchanged from r180368, team/file/bridging/main/bridging.c
Modified:
    trunk/CHANGES
    trunk/Makefile
    trunk/include/asterisk/channel.h
    trunk/main/Makefile

Modified: trunk/CHANGES
URL: http://svn.digium.com/svn-view/asterisk/trunk/CHANGES?view=diff&rev=180369&r1=180368&r2=180369
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Thu Mar  5 12:18:27 2009
@@ -117,6 +117,9 @@
    call origination from the dialplan.
  * Voicemail now permits setting the emailsubject and emailbody per mailbox,
    in addition to the setting in the "general" context.
+ * Added ConfBridge dialplan application which does conference bridges without
+   DAHDI. For information on its use, please see the output of
+   "core show application ConfBridge" from the CLI.
 
 Miscellaneous
 -------------

Modified: trunk/Makefile
URL: http://svn.digium.com/svn-view/asterisk/trunk/Makefile?view=diff&rev=180369&r1=180368&r2=180369
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Mar  5 12:18:27 2009
@@ -293,7 +293,7 @@
 #	value directly to ASTCFLAGS
 ASTCFLAGS+=$(MALLOC_DEBUG)$(OPTIONS)
 
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
 OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)

Propchange: trunk/bridges/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar  5 12:18:27 2009
@@ -1,0 +1,11 @@
+*.a
+*.d
+*.eo
+*.eoo
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
+

Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=180369&r1=180368&r2=180369
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Thu Mar  5 12:18:27 2009
@@ -496,7 +496,13 @@
 
 	unsigned short transfercapability;		/*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
 
-	char unused_old_dtmfq[AST_MAX_EXTENSION];			/*!< (deprecated, use readq instead) Any/all queued DTMF characters */
+	union {
+		char unused_old_dtmfq[AST_MAX_EXTENSION];			/*!< (deprecated, use readq instead) Any/all queued DTMF characters */
+		struct {
+			struct ast_bridge *bridge;                                      /*!< Bridge this channel is participating in */
+		};
+	};
+
 	char context[AST_MAX_CONTEXT];			/*!< Dialplan: Current extension context */
 	char exten[AST_MAX_EXTENSION];			/*!< Dialplan: Current extension number */
 	char macrocontext[AST_MAX_CONTEXT];		/*!< Macro: Current non-macro context. See app_macro.c */

Modified: trunk/main/Makefile
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/Makefile?view=diff&rev=180369&r1=180368&r2=180369
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Thu Mar  5 12:18:27 2009
@@ -29,7 +29,7 @@
 	strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \
 	astobj2.o hashtab.o global_datastores.o version.o \
 	features.o taskprocessor.o timing.o datastore.o xml.o xmldoc.o \
-	strings.o
+	strings.o bridging.o
 
 # we need to link in the objects statically, not as a library, because
 # otherwise modules will not have them available if none of the static