[svn-commits] russell: branch group/security_events r204453 - in /team/group/security_event...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jun 30 12:27:58 CDT 2009
Author: russell
Date: Tue Jun 30 12:27:52 2009
New Revision: 204453
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=204453
Log:
resolve, reset
Added:
team/group/security_events/README-addons.txt
- copied unchanged from r204440, trunk/README-addons.txt
team/group/security_events/addons/ (props changed)
- copied from r204440, trunk/addons/
team/group/security_events/addons/Makefile
- copied unchanged from r204440, trunk/addons/Makefile
team/group/security_events/addons/app_mysql.c
- copied unchanged from r204440, trunk/addons/app_mysql.c
team/group/security_events/addons/app_saycountpl.c
- copied unchanged from r204440, trunk/addons/app_saycountpl.c
team/group/security_events/addons/cdr_mysql.c
- copied unchanged from r204440, trunk/addons/cdr_mysql.c
team/group/security_events/addons/chan_mobile.c
- copied unchanged from r204440, trunk/addons/chan_mobile.c
team/group/security_events/addons/chan_ooh323.c
- copied unchanged from r204440, trunk/addons/chan_ooh323.c
team/group/security_events/addons/chan_ooh323.h
- copied unchanged from r204440, trunk/addons/chan_ooh323.h
team/group/security_events/addons/format_mp3.c
- copied unchanged from r204440, trunk/addons/format_mp3.c
team/group/security_events/addons/mp3/
- copied from r204440, trunk/addons/mp3/
team/group/security_events/addons/mp3/MPGLIB_README
- copied unchanged from r204440, trunk/addons/mp3/MPGLIB_README
team/group/security_events/addons/mp3/MPGLIB_TODO
- copied unchanged from r204440, trunk/addons/mp3/MPGLIB_TODO
team/group/security_events/addons/mp3/Makefile
- copied unchanged from r204440, trunk/addons/mp3/Makefile
team/group/security_events/addons/mp3/README
- copied unchanged from r204440, trunk/addons/mp3/README
team/group/security_events/addons/mp3/common.c
- copied unchanged from r204440, trunk/addons/mp3/common.c
team/group/security_events/addons/mp3/dct64_i386.c
- copied unchanged from r204440, trunk/addons/mp3/dct64_i386.c
team/group/security_events/addons/mp3/decode_i386.c
- copied unchanged from r204440, trunk/addons/mp3/decode_i386.c
team/group/security_events/addons/mp3/decode_ntom.c
- copied unchanged from r204440, trunk/addons/mp3/decode_ntom.c
team/group/security_events/addons/mp3/huffman.h
- copied unchanged from r204440, trunk/addons/mp3/huffman.h
team/group/security_events/addons/mp3/interface.c
- copied unchanged from r204440, trunk/addons/mp3/interface.c
team/group/security_events/addons/mp3/layer3.c
- copied unchanged from r204440, trunk/addons/mp3/layer3.c
team/group/security_events/addons/mp3/mpg123.h
- copied unchanged from r204440, trunk/addons/mp3/mpg123.h
team/group/security_events/addons/mp3/mpglib.h
- copied unchanged from r204440, trunk/addons/mp3/mpglib.h
team/group/security_events/addons/mp3/tabinit.c
- copied unchanged from r204440, trunk/addons/mp3/tabinit.c
team/group/security_events/addons/ooh323c/
- copied from r204440, trunk/addons/ooh323c/
team/group/security_events/addons/ooh323c/COPYING
- copied unchanged from r204440, trunk/addons/ooh323c/COPYING
team/group/security_events/addons/ooh323c/README
- copied unchanged from r204440, trunk/addons/ooh323c/README
team/group/security_events/addons/ooh323c/src/
- copied from r204440, trunk/addons/ooh323c/src/
team/group/security_events/addons/ooh323c/src/Makefile.in
- copied unchanged from r204440, trunk/addons/ooh323c/src/Makefile.in
team/group/security_events/addons/ooh323c/src/context.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/context.c
team/group/security_events/addons/ooh323c/src/decode.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/decode.c
team/group/security_events/addons/ooh323c/src/dlist.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/dlist.c
team/group/security_events/addons/ooh323c/src/dlist.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/dlist.h
team/group/security_events/addons/ooh323c/src/encode.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/encode.c
team/group/security_events/addons/ooh323c/src/errmgmt.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/errmgmt.c
team/group/security_events/addons/ooh323c/src/eventHandler.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/eventHandler.c
team/group/security_events/addons/ooh323c/src/eventHandler.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/eventHandler.h
team/group/security_events/addons/ooh323c/src/h323/
- copied from r204440, trunk/addons/ooh323c/src/h323/
team/group/security_events/addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
team/group/security_events/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
team/group/security_events/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
team/group/security_events/addons/ooh323c/src/h323/H323-MESSAGES.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/H323-MESSAGES.c
team/group/security_events/addons/ooh323c/src/h323/H323-MESSAGES.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/H323-MESSAGES.h
team/group/security_events/addons/ooh323c/src/h323/H323-MESSAGESDec.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/H323-MESSAGESDec.c
team/group/security_events/addons/ooh323c/src/h323/H323-MESSAGESEnc.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/H323-MESSAGESEnc.c
team/group/security_events/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
team/group/security_events/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
team/group/security_events/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c
team/group/security_events/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c
team/group/security_events/addons/ooh323c/src/memheap.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/memheap.c
team/group/security_events/addons/ooh323c/src/memheap.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/memheap.h
team/group/security_events/addons/ooh323c/src/ooCalls.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooCalls.c
team/group/security_events/addons/ooh323c/src/ooCalls.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooCalls.h
team/group/security_events/addons/ooh323c/src/ooCapability.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooCapability.c
team/group/security_events/addons/ooh323c/src/ooCapability.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooCapability.h
team/group/security_events/addons/ooh323c/src/ooCmdChannel.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooCmdChannel.c
team/group/security_events/addons/ooh323c/src/ooCmdChannel.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooCmdChannel.h
team/group/security_events/addons/ooh323c/src/ooCommon.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooCommon.h
team/group/security_events/addons/ooh323c/src/ooDateTime.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooDateTime.c
team/group/security_events/addons/ooh323c/src/ooDateTime.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooDateTime.h
team/group/security_events/addons/ooh323c/src/ooGkClient.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooGkClient.c
team/group/security_events/addons/ooh323c/src/ooGkClient.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooGkClient.h
team/group/security_events/addons/ooh323c/src/ooLogChan.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooLogChan.c
team/group/security_events/addons/ooh323c/src/ooLogChan.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooLogChan.h
team/group/security_events/addons/ooh323c/src/ooSocket.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooSocket.c
team/group/security_events/addons/ooh323c/src/ooSocket.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooSocket.h
team/group/security_events/addons/ooh323c/src/ooStackCmds.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooStackCmds.c
team/group/security_events/addons/ooh323c/src/ooStackCmds.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooStackCmds.h
team/group/security_events/addons/ooh323c/src/ooTimer.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooTimer.c
team/group/security_events/addons/ooh323c/src/ooTimer.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooTimer.h
team/group/security_events/addons/ooh323c/src/ooUtils.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooUtils.c
team/group/security_events/addons/ooh323c/src/ooUtils.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooUtils.h
team/group/security_events/addons/ooh323c/src/ooasn1.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooasn1.h
team/group/security_events/addons/ooh323c/src/oochannels.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/oochannels.c
team/group/security_events/addons/ooh323c/src/oochannels.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/oochannels.h
team/group/security_events/addons/ooh323c/src/ooh245.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooh245.c
team/group/security_events/addons/ooh323c/src/ooh245.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooh245.h
team/group/security_events/addons/ooh323c/src/ooh323.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooh323.c
team/group/security_events/addons/ooh323c/src/ooh323.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooh323.h
team/group/security_events/addons/ooh323c/src/ooh323ep.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooh323ep.c
team/group/security_events/addons/ooh323c/src/ooh323ep.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooh323ep.h
team/group/security_events/addons/ooh323c/src/oohdr.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/oohdr.h
team/group/security_events/addons/ooh323c/src/ooper.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooper.h
team/group/security_events/addons/ooh323c/src/ooports.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooports.c
team/group/security_events/addons/ooh323c/src/ooports.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooports.h
team/group/security_events/addons/ooh323c/src/ooq931.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooq931.c
team/group/security_events/addons/ooh323c/src/ooq931.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ooq931.h
team/group/security_events/addons/ooh323c/src/ootrace.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/ootrace.c
team/group/security_events/addons/ooh323c/src/ootrace.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ootrace.h
team/group/security_events/addons/ooh323c/src/ootypes.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/ootypes.h
team/group/security_events/addons/ooh323c/src/perutil.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/perutil.c
team/group/security_events/addons/ooh323c/src/printHandler.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/printHandler.c
team/group/security_events/addons/ooh323c/src/printHandler.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/printHandler.h
team/group/security_events/addons/ooh323c/src/rtctype.c
- copied unchanged from r204440, trunk/addons/ooh323c/src/rtctype.c
team/group/security_events/addons/ooh323c/src/rtctype.h
- copied unchanged from r204440, trunk/addons/ooh323c/src/rtctype.h
team/group/security_events/addons/ooh323cDriver.c
- copied unchanged from r204440, trunk/addons/ooh323cDriver.c
team/group/security_events/addons/ooh323cDriver.h
- copied unchanged from r204440, trunk/addons/ooh323cDriver.h
team/group/security_events/addons/res_config_mysql.c
- copied unchanged from r204440, trunk/addons/res_config_mysql.c
team/group/security_events/configs/app_mysql.conf.sample
- copied unchanged from r204440, trunk/configs/app_mysql.conf.sample
team/group/security_events/configs/cdr_mysql.conf.sample
- copied unchanged from r204440, trunk/configs/cdr_mysql.conf.sample
team/group/security_events/configs/chan_mobile.conf.sample
- copied unchanged from r204440, trunk/configs/chan_mobile.conf.sample
team/group/security_events/configs/chan_ooh323.conf.sample
- copied unchanged from r204440, trunk/configs/chan_ooh323.conf.sample
team/group/security_events/configs/res_config_mysql.conf.sample
- copied unchanged from r204440, trunk/configs/res_config_mysql.conf.sample
team/group/security_events/configs/res_config_sqlite.conf.sample
- copied unchanged from r204440, trunk/configs/res_config_sqlite.conf.sample
team/group/security_events/doc/tex/chan_mobile.tex
- copied unchanged from r204440, trunk/doc/tex/chan_mobile.tex
Removed:
team/group/security_events/configs/res_config_sqlite.conf
Modified:
team/group/security_events/ (props changed)
team/group/security_events/Makefile
team/group/security_events/Makefile.moddir_rules
team/group/security_events/UPGRADE.txt
team/group/security_events/autoconf/ast_ext_tool_check.m4
team/group/security_events/build_tools/embed_modules.xml
team/group/security_events/build_tools/menuselect-deps.in
team/group/security_events/configure
team/group/security_events/configure.ac
team/group/security_events/doc/tex/Makefile
team/group/security_events/doc/tex/asterisk.tex
team/group/security_events/doc/tex/cdrdriver.tex
team/group/security_events/include/asterisk/autoconfig.h.in
team/group/security_events/include/asterisk/mod_format.h
team/group/security_events/main/file.c
team/group/security_events/makeopts.in
Propchange: team/group/security_events/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/security_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 30 12:27:52 2009
@@ -1,1 +1,1 @@
-/trunk:1-204365
+/trunk:1-204451
Modified: team/group/security_events/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/Makefile?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/Makefile (original)
+++ team/group/security_events/Makefile Tue Jun 30 12:27:52 2009
@@ -293,7 +293,7 @@
# value directly to ASTCFLAGS
ASTCFLAGS+=$(MALLOC_DEBUG)$(OPTIONS)
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr cel bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr cel bridges funcs tests main res addons $(LOCAL_MOD_SUBDIRS)
OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
Modified: team/group/security_events/Makefile.moddir_rules
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/Makefile.moddir_rules?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/Makefile.moddir_rules (original)
+++ team/group/security_events/Makefile.moddir_rules Tue Jun 30 12:27:52 2009
@@ -38,19 +38,18 @@
ifneq ($(MODULE_PREFIX),)
ALL_C_MODS:=
+ ALL_CC_MODS:=
ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
- ALL_CC_MODS:=
ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))
+endif
- C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
- CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
+C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
- # and store in the list of embedded or loadable modules
- ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
- EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
- else
- LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
- endif
+ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
+ EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
+else
+ LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
endif
# Both C++ and C++ sources need their module name in AST_MODULE
Modified: team/group/security_events/UPGRADE.txt
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/UPGRADE.txt?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/UPGRADE.txt (original)
+++ team/group/security_events/UPGRADE.txt Tue Jun 30 12:27:52 2009
@@ -19,6 +19,11 @@
===========================================================
From 1.6.2 to 1.6.3:
+
+* Asterisk-addons no longer exists as an independent package. Those modules
+ now live in the addons directory of the main Asterisk source tree. They
+ are not enabled by default. For more information about why modules live in
+ addons, see README-addons.txt.
* The rarely used 'event_log' and LOG_EVENT channel have been removed; the few
users of this channel in the tree have been converted to LOG_NOTICE or removed
Propchange: team/group/security_events/addons/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 30 12:27:52 2009
@@ -1,0 +1,11 @@
+*.a
+*.d
+*.eo
+*.eoo
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
+
Modified: team/group/security_events/autoconf/ast_ext_tool_check.m4
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/autoconf/ast_ext_tool_check.m4?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/autoconf/ast_ext_tool_check.m4 (original)
+++ team/group/security_events/autoconf/ast_ext_tool_check.m4 Tue Jun 30 12:27:52 2009
@@ -7,7 +7,7 @@
[
if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
PBX_$1=0
- AC_CHECK_TOOL(CONFIG_$1, $2-config, No)
+ AC_CHECK_TOOL(CONFIG_$1, $2, No)
if test ! "x${CONFIG_$1}" = xNo; then
if test x"$3" = x ; then A=--cflags ; else A="$3" ; fi
$1_INCLUDE=$(${CONFIG_$1} $A)
Modified: team/group/security_events/build_tools/embed_modules.xml
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/build_tools/embed_modules.xml?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/build_tools/embed_modules.xml (original)
+++ team/group/security_events/build_tools/embed_modules.xml Tue Jun 30 12:27:52 2009
@@ -1,32 +1,35 @@
<category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk">
- <member name="APPS" displayname="Applications" remove_on_change="apps/*.o">
+ <member name="ADDONS" displayname="Add-ons" remove_on_change="addons/*.o addons/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="BRIDGES" displayname="Bridging Technologies" remove_on_change="bridges/*.o">
+ <member name="APPS" displayname="Applications" remove_on_change="apps/*.o apps/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
+ <member name="BRIDGES" displayname="Bridging Technologies" remove_on_change="bridges/*.o bridges/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o">
+ <member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o cdr/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a">
+ <member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o channels/*.oo channels/*/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o">
+ <member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a codecs/*.oo codecs/*/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
+ <member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o formats/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o">
+ <member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o funcs/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o">
+ <member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o pbx/*.oo pbx/*/*.oo">
<depend>gnu_ld</depend>
</member>
- <member name="TEST" displayname="Test Modules" remove_on_change="tests/*.o">
+ <member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o res/*.oo res/*/*.oo">
+ <depend>gnu_ld</depend>
+ </member>
+ <member name="TEST" displayname="Test Modules" remove_on_change="tests/*.o tests/*.oo">
<depend>gnu_ld</depend>
</member>
</category>
Modified: team/group/security_events/build_tools/menuselect-deps.in
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/build_tools/menuselect-deps.in?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/build_tools/menuselect-deps.in (original)
+++ team/group/security_events/build_tools/menuselect-deps.in Tue Jun 30 12:27:52 2009
@@ -1,4 +1,5 @@
ALSA=@PBX_ALSA@
+BLUETOOTH=@PBX_BLUETOOTH@
CRYPTO=@PBX_CRYPTO@
CURL=@PBX_CURL@
DAHDI=@PBX_DAHDI@
@@ -24,6 +25,7 @@
LTDL=@PBX_LTDL@
LUA=@PBX_LUA@
MISDN=@PBX_MISDN@
+MYSQLCLIENT=@PBX_MYSQLCLIENT@
NBS=@PBX_NBS@
NETSNMP=@PBX_NETSNMP@
NEWT=@PBX_NEWT@
Modified: team/group/security_events/configure.ac
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/configure.ac?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/configure.ac (original)
+++ team/group/security_events/configure.ac Tue Jun 30 12:27:52 2009
@@ -233,6 +233,7 @@
# BKTR is used for backtrace support on platforms that do not
# have it natively.
AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace support], [execinfo])
+AST_EXT_LIB_SETUP([BLUETOOTH], [Bluetooth Support], [bluetooth])
AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
@@ -257,6 +258,7 @@
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
+AST_EXT_LIB_SETUP([MYSQLCLIENT], [mysqlclient], [mysqlclient])
AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
AST_EXT_LIB_SETUP([NEON], [neon], [neon])
@@ -1327,7 +1329,7 @@
esac], [disable_xmldoc=no])
if test "${disable_xmldoc}" != "yes"; then
- AST_EXT_TOOL_CHECK([LIBXML2], [xml2], , ,
+ AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
[#include <libxml/tree.h>
#include <libxml/parser.h>],
[LIBXML_TEST_VERSION])
@@ -1349,13 +1351,15 @@
AC_CHECK_HEADER([linux/mISDNdsp.h], [AC_DEFINE_UNQUOTED([MISDN_1_2], 1, [Build chan_misdn for mISDN 1.2 or later.])])
fi
+AST_EXT_TOOL_CHECK([MYSQLCLIENT], [mysql_config])
+
AST_EXT_LIB_CHECK([NBS], [nbs], [nbs_connect], [nbs.h])
AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
-AST_EXT_TOOL_CHECK([NEON], [neon])
-
-AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-libs],
+AST_EXT_TOOL_CHECK([NEON], [neon-config])
+
+AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--agent-libs],
[#include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/agent/net-snmp-agent-includes.h>],
@@ -1371,6 +1375,8 @@
AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h])
# Linux, however, has backtrace directly in glibc
AST_EXT_LIB_CHECK([BKTR], [c], [backtrace], [execinfo.h])
+
+AST_EXT_LIB_CHECK([BLUETOOTH], [bluetooth], [ba2str], [bluetooth/bluetooth.h])
# possible places for oss definitions
AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [linux/soundcard.h])
@@ -1563,7 +1569,7 @@
AST_CHECK_OSPTK([3], [5], [0])
fi
-AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
+AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
@@ -1664,7 +1670,7 @@
])
AC_SUBST(PBX_IXJUSER)
-AST_EXT_TOOL_CHECK([SDL], [sdl])
+AST_EXT_TOOL_CHECK([SDL], [sdl-config])
AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
@@ -1682,7 +1688,7 @@
fi
PBX_GTK=0
-AST_EXT_TOOL_CHECK([GTK], [gtk], [--cflags gthread], [--libs gthread])
+AST_EXT_TOOL_CHECK([GTK], [gtk-config], [--cflags gthread], [--libs gthread])
PBX_GTK2=0
AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
Modified: team/group/security_events/doc/tex/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/doc/tex/Makefile?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/doc/tex/Makefile (original)
+++ team/group/security_events/doc/tex/Makefile Tue Jun 30 12:27:52 2009
@@ -26,7 +26,7 @@
@cp asterisk.tex asterisk.tex.orig
@sed -e 's/ASTERISKVERSION/$(shell echo $(ASTERISKVERSION) | sed -e 's/\//\\\//g' | sed -e 's/_/\\\\_/g')/' asterisk.tex > asterisk_local.tex
@mv asterisk_local.tex asterisk.tex
- @$(RUBBER) --pdf asterisk.tex
+ -@$(RUBBER) --pdf asterisk.tex
@mv asterisk.tex.orig asterisk.tex
endif
Modified: team/group/security_events/doc/tex/asterisk.tex
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/doc/tex/asterisk.tex?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/doc/tex/asterisk.tex (original)
+++ team/group/security_events/doc/tex/asterisk.tex Tue Jun 30 12:27:52 2009
@@ -32,7 +32,7 @@
\author{Asterisk Development Team \\ Asterisk.org}
-\title{Asterisk Reference Information \\ Version SVN-group-security\_events-r200704M-/trunk}
+\title{Asterisk Reference Information \\ ASTERISKVERSION}
\begin{document}
\maketitle
@@ -99,6 +99,8 @@
\input{misdn.tex}
\section{Local}
\input{localchannel.tex}
+ \section{Mobile}
+ \input{chan_mobile.tex}
\chapter{Distributed Universal Number Discovery (DUNDi)}
\section{Introduction}
Modified: team/group/security_events/doc/tex/cdrdriver.tex
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/doc/tex/cdrdriver.tex?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/doc/tex/cdrdriver.tex (original)
+++ team/group/security_events/doc/tex/cdrdriver.tex Tue Jun 30 12:27:52 2009
@@ -197,7 +197,39 @@
\subsection{MySQL}
+\subsubsection{ODBC}
+
Using MySQL for CDR records is supported by using ODBC and the cdr\_odbc module.
+
+\subsubsection{Native}
+
+Alternatively, there is a native MySQL CDR module.
+
+To use it, configure the module in cdr\_mysql.conf. Create a table called cdr under the database name you will be using the following schema.
+
+\begin{astlisting}
+\begin{verbatim}
+CREATE TABLE cdr (
+ calldate datetime NOT NULL default '0000-00-00 00:00:00',
+ clid varchar(80) NOT NULL default '',
+ src varchar(80) NOT NULL default '',
+ dst varchar(80) NOT NULL default '',
+ dcontext varchar(80) NOT NULL default '',
+ channel varchar(80) NOT NULL default '',
+ dstchannel varchar(80) NOT NULL default '',
+ lastapp varchar(80) NOT NULL default '',
+ lastdata varchar(80) NOT NULL default '',
+ duration int(11) NOT NULL default '0',
+ billsec int(11) NOT NULL default '0',
+ disposition varchar(45) NOT NULL default '',
+ amaflags int(11) NOT NULL default '0',
+ accountcode varchar(20) NOT NULL default '',
+ uniqueid varchar(32) NOT NULL default '',
+ userfield varchar(255) NOT NULL default ''
+);
+\end{verbatim}
+\end{astlisting}
+
\subsection{PostgreSQL}
If you want to go directly to postgresql database, and have the cdr\_pgsql.so
Modified: team/group/security_events/include/asterisk/autoconfig.h.in
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/include/asterisk/autoconfig.h.in?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/include/asterisk/autoconfig.h.in (original)
+++ team/group/security_events/include/asterisk/autoconfig.h.in Tue Jun 30 12:27:52 2009
@@ -132,6 +132,12 @@
/* Define to indicate the ${BKTR_DESCRIP} library version */
#undef HAVE_BKTR_VERSION
+/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
+#undef HAVE_BLUETOOTH
+
+/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
+#undef HAVE_BLUETOOTH_VERSION
+
/* Define to 1 if byteswap.h macros are available. */
#undef HAVE_BYTESWAP_H
@@ -580,6 +586,9 @@
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
+
+/* Define if your system has the MYSQLCLIENT libraries. */
+#undef HAVE_MYSQLCLIENT
/* Define this to indicate the ${NBS_DESCRIP} library */
#undef HAVE_NBS
Modified: team/group/security_events/include/asterisk/mod_format.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/include/asterisk/mod_format.h?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/include/asterisk/mod_format.h (original)
+++ team/group/security_events/include/asterisk/mod_format.h Tue Jun 30 12:27:52 2009
@@ -102,6 +102,7 @@
struct ast_format *fmt; /* need to write to the lock and usecnt */
int flags;
mode_t mode;
+ char *open_filename;
char *filename;
char *realfilename;
/*! Video file stream */
Modified: team/group/security_events/main/file.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/main/file.c?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/main/file.c (original)
+++ team/group/security_events/main/file.c Tue Jun 30 12:27:52 2009
@@ -320,6 +320,7 @@
free(f->filename);
if (f->realfilename)
free(f->realfilename);
+ ast_free(f->open_filename);
if (f->fmt->close) {
void (*closefn)(struct ast_filestream *) = f->fmt->close;
closefn(f);
@@ -472,6 +473,7 @@
s->fmt = f;
s->trans = NULL;
s->filename = NULL;
+ s->open_filename = ast_strdup(fn);;
if (s->fmt->format & AST_FORMAT_AUDIO_MASK) {
if (chan->stream)
ast_closestream(chan->stream);
@@ -826,7 +828,30 @@
int ast_applystream(struct ast_channel *chan, struct ast_filestream *s)
{
+ struct ast_party_connected_line connected;
+ char *fn;
+
+ ast_channel_lock(chan);
+ ast_party_connected_line_set_init(&connected, &chan->connected);
+ if (ast_strlen_zero(chan->connected.id.number)) {
+ connected.id.number = ast_strdupa(chan->exten);
+ }
+ ast_channel_unlock(chan);
+
+ fn = ast_strdupa(s->open_filename);
+ if ((fn = strrchr(fn, '/'))) {
+ char *dot;
+ *fn++ = '\0';
+ if ((dot = strrchr(fn, '.'))) {
+ *dot = '\0';
+ }
+ }
+ connected.id.number = connected.id.name = fn;
+
+ ast_channel_update_connected_line(chan, &connected);
+
s->owner = chan;
+
return 0;
}
Modified: team/group/security_events/makeopts.in
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/makeopts.in?view=diff&rev=204453&r1=204452&r2=204453
==============================================================================
--- team/group/security_events/makeopts.in (original)
+++ team/group/security_events/makeopts.in Tue Jun 30 12:27:52 2009
@@ -75,6 +75,9 @@
ALSA_INCLUDE=@ALSA_INCLUDE@
ALSA_LIB=@ALSA_LIB@
+BLUETOOTH_INCLUDE=@BLUETOOTH_INCLUDE@
+BLUETOOTH_LIB=@BLUETOOTH_LIB@
+
CURL_INCLUDE=@CURL_INCLUDE@
CURL_LIB=@CURL_LIB@
@@ -128,6 +131,9 @@
LUA_INCLUDE=@LUA_INCLUDE@
LUA_LIB=@LUA_LIB@
+
+MYSQLCLIENT_INCLUDE=@MYSQLCLIENT_INCLUDE@
+MYSQLCLIENT_LIB=@MYSQLCLIENT_LIB@
NBS_INCLUDE=@NBS_INCLUDE@
NBS_LIB=@NBS_LIB@
More information about the svn-commits
mailing list