Permalink
Browse files

Move Asterisk-addons modules into the main Asterisk source tree.

Someone asked yesterday, "is there a good reason why we can't just put these
modules in Asterisk?".  After a brief discussion, as long as the modules are
clearly set aside in their own directory and not enabled by default, it is
perfectly fine.

For more information about why a module goes in addons, see README-addons.txt.

chan_ooh323 does not currently compile as it is behind some trunk API updates.
However, it will not build by default, so it should be okay for now.


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@204413 f38db490-d61c-443f-a65b-d21fe96a405b
  • Loading branch information...
1 parent e5c0783 commit 358628a84864c1ff7f49a6e40696ed5d6b3fd9e8 @russellb russellb committed Jun 30, 2009
Showing with 190,907 additions and 32 deletions.
  1. +1 −1 Makefile
  2. +27 −0 README-addons.txt
  3. +5 −0 UPGRADE.txt
  4. +43 −0 addons/Makefile
  5. +611 −0 addons/app_addon_sql_mysql.c
  6. +136 −0 addons/app_saycountpl.c
  7. +641 −0 addons/cdr_addon_mysql.c
  8. +4,266 −0 addons/chan_mobile.c
  9. +3,162 −0 addons/chan_ooh323.c
  10. +113 −0 addons/chan_ooh323.h
  11. +336 −0 addons/format_mp3.c
  12. +39 −0 addons/mp3/MPGLIB_README
  13. +2 −0 addons/mp3/MPGLIB_TODO
  14. +24 −0 addons/mp3/Makefile
  15. +24 −0 addons/mp3/README
  16. +267 −0 addons/mp3/common.c
  17. +335 −0 addons/mp3/dct64_i386.c
  18. +153 −0 addons/mp3/decode_i386.c
  19. +219 −0 addons/mp3/decode_ntom.c
  20. +332 −0 addons/mp3/huffman.h
  21. +323 −0 addons/mp3/interface.c
  22. +2,029 −0 addons/mp3/layer3.c
  23. +132 −0 addons/mp3/mpg123.h
  24. +75 −0 addons/mp3/mpglib.h
  25. +81 −0 addons/mp3/tabinit.c
  26. +341 −0 addons/ooh323c/COPYING
  27. +95 −0 addons/ooh323c/README
  28. +564 −0 addons/ooh323c/src/Makefile.in
  29. +140 −0 addons/ooh323c/src/context.c
  30. +1,050 −0 addons/ooh323c/src/decode.c
  31. +256 −0 addons/ooh323c/src/dlist.c
  32. +204 −0 addons/ooh323c/src/dlist.h
  33. +1,103 −0 addons/ooh323c/src/encode.c
  34. +261 −0 addons/ooh323c/src/errmgmt.c
  35. +122 −0 addons/ooh323c/src/eventHandler.c
  36. +284 −0 addons/ooh323c/src/eventHandler.h
  37. +690 −0 addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
  38. +1,782 −0 addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
  39. +1,269 −0 addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
  40. +112 −0 addons/ooh323c/src/h323/H323-MESSAGES.c
  41. +6,510 −0 addons/ooh323c/src/h323/H323-MESSAGES.h
  42. +27,199 −0 addons/ooh323c/src/h323/H323-MESSAGESDec.c
  43. +22,596 −0 addons/ooh323c/src/h323/H323-MESSAGESEnc.c
  44. +40 −0 addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
  45. +10,937 −0 addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
  46. +42,170 −0 addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c
  47. +26,599 −0 addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c
  48. +1,331 −0 addons/ooh323c/src/memheap.c
  49. +61 −0 addons/ooh323c/src/memheap.h
  50. +820 −0 addons/ooh323c/src/ooCalls.c
  51. +822 −0 addons/ooh323c/src/ooCalls.h
  52. +2,349 −0 addons/ooh323c/src/ooCapability.c
  53. +726 −0 addons/ooh323c/src/ooCapability.h
  54. +193 −0 addons/ooh323c/src/ooCmdChannel.c
  55. +90 −0 addons/ooh323c/src/ooCmdChannel.h
  56. +124 −0 addons/ooh323c/src/ooCommon.h
  57. +175 −0 addons/ooh323c/src/ooDateTime.c
  58. +54 −0 addons/ooh323c/src/ooDateTime.h
  59. +2,443 −0 addons/ooh323c/src/ooGkClient.c
  60. +560 −0 addons/ooh323c/src/ooGkClient.h
  61. +372 −0 addons/ooh323c/src/ooLogChan.c
  62. +190 −0 addons/ooh323c/src/ooLogChan.h
  63. +723 −0 addons/ooh323c/src/ooSocket.c
  64. +403 −0 addons/ooh323c/src/ooSocket.h
  65. +339 −0 addons/ooh323c/src/ooStackCmds.c
  66. +171 −0 addons/ooh323c/src/ooStackCmds.h
  67. +193 −0 addons/ooh323c/src/ooTimer.c
  68. +128 −0 addons/ooh323c/src/ooTimer.h
  69. +40 −0 addons/ooh323c/src/ooUtils.c
  70. +53 −0 addons/ooh323c/src/ooUtils.h
  71. +1,814 −0 addons/ooh323c/src/ooasn1.h
  72. +1,785 −0 addons/ooh323c/src/oochannels.c
  73. +216 −0 addons/ooh323c/src/oochannels.h
  74. +3,686 −0 addons/ooh323c/src/ooh245.c
  75. +636 −0 addons/ooh323c/src/ooh245.h
  76. +1,843 −0 addons/ooh323c/src/ooh323.c
  77. +182 −0 addons/ooh323c/src/ooh323.h
  78. +789 −0 addons/ooh323c/src/ooh323ep.c
  79. +634 −0 addons/ooh323c/src/ooh323ep.h
  80. +15 −0 addons/ooh323c/src/oohdr.h
  81. +22 −0 addons/ooh323c/src/ooper.h
  82. +106 −0 addons/ooh323c/src/ooports.c
  83. +91 −0 addons/ooh323c/src/ooports.h
  84. +3,448 −0 addons/ooh323c/src/ooq931.c
  85. +766 −0 addons/ooh323c/src/ooq931.h
  86. +131 −0 addons/ooh323c/src/ootrace.c
  87. +152 −0 addons/ooh323c/src/ootrace.h
  88. +256 −0 addons/ooh323c/src/ootypes.h
  89. +287 −0 addons/ooh323c/src/perutil.c
  90. +273 −0 addons/ooh323c/src/printHandler.c
  91. +47 −0 addons/ooh323c/src/printHandler.h
  92. +168 −0 addons/ooh323c/src/rtctype.c
  93. +86 −0 addons/ooh323c/src/rtctype.h
  94. +361 −0 addons/ooh323cDriver.c
  95. +39 −0 addons/ooh323cDriver.h
  96. +1,752 −0 addons/res_config_mysql.c
  97. +1 −1 autoconf/ast_ext_tool_check.m4
  98. +2 −0 build_tools/menuselect-deps.in
  99. +58 −0 configs/cdr_mysql.conf.sample
  100. +68 −0 configs/mobile.conf.sample
  101. +24 −0 configs/mysql.conf.sample
  102. +173 −0 configs/ooh323.conf.sample
  103. +40 −0 configs/res_mysql.conf.sample
  104. +545 −22 configure
  105. +12 −6 configure.ac
  106. +1 −1 doc/tex/Makefile
  107. +3 −1 doc/tex/asterisk.tex
  108. +32 −0 doc/tex/cdrdriver.tex
  109. +262 −0 doc/tex/chan_mobile.tex
  110. +9 −0 include/asterisk/autoconfig.h.in
  111. +1 −0 include/asterisk/mod_format.h
  112. +25 −0 main/file.c
  113. +6 −0 makeopts.in
View
@@ -293,7 +293,7 @@ endif
# 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:=addons channels pbx apps codecs formats cdr cel bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
View
@@ -0,0 +1,27 @@
+===============================================================================
+=== Asterisk Add-on Modules ===
+===============================================================================
+
+ This document pertains to the modules that reside in the addons/
+subdirectory of the source tree. By default, these modules are not compiled
+and installed. If you choose to enable them, you must be aware of what
+potential licensing and/or patent implications that has on your usage and
+distribution of Asterisk.
+
+ Even though Asterisk is released as open source under the terms of the
+GPLv2 (see LICENSE for details), no core functionality in Asterisk has any
+dependencies on libraries that are licensed under the GPL. One reason a module
+may be in the add-ons category is that it may have a GPL dependency. Since
+these dependencies are not compatible with dual licensing of Asterisk, the
+dependant modules are set aside to make it clear that they may not be used
+with commercial versions of Asterisk, unless other licensing arrangements are
+made with the copyright holders of those dependencies.
+
+ Another reason that modules may be set aside is that there may be
+additional restrictions on the usage of the code imposed by the license or
+related patents. The MySQL and MP3 modules are examples of this.
+
+ If you have any questions, contact your lawyer.
+
+===============================================================================
+===============================================================================
View
@@ -20,6 +20,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
(in cases where the same message was already generated to another channel).
View
@@ -0,0 +1,43 @@
+#
+# Asterisk -- A telephony toolkit for Linux.
+#
+# Makefile for Add-on Modules
+#
+# Copyright (C) 2009, Digium, Inc.
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License
+#
+
+-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
+
+MODULE_PREFIX=app bridge cdr cel chan codec format func pbx res test
+MENUSELECT_CATEGORY=Addons
+MENUSELECT_DESCRIPTION=Add-ons (See README-addons.txt)
+
+H323OBJS:=ooCmdChannel.o ooLogChan.o ooUtils.o ooGkClient.o context.o \
+ ooDateTime.o decode.o dlist.o encode.o errmgmt.o \
+ memheap.o ootrace.o oochannels.o ooh245.o ooports.o \
+ ooq931.o ooCapability.o ooSocket.o perutil.o eventHandler.o \
+ ooCalls.o ooStackCmds.o ooh323.o ooh323ep.o printHandler.o \
+ rtctype.o ooTimer.o h323/H235-SECURITY-MESSAGESDec.o \
+ h323/H235-SECURITY-MESSAGESEnc.o h323/H323-MESSAGES.o h323/H323-MESSAGESDec.o \
+ h323/H323-MESSAGESEnc.o h323/MULTIMEDIA-SYSTEM-CONTROL.o \
+ h323/MULTIMEDIA-SYSTEM-CONTROLDec.o h323/MULTIMEDIA-SYSTEM-CONTROLEnc.o
+
+H323CFLAGS:=-Iooh323c/src -Iooh323c/src/h323
+
+all: _all
+
+include $(ASTTOPDIR)/Makefile.moddir_rules
+
+clean::
+ $(MAKE) -C mp3 clean
+ rm -f $(addprefix ooh323c/src/,$(H323OBJS))
+
+$(if $(filter format_mp3,$(EMBEDDED_MODS)),modules.link,format_mp3.so): mp3/common.o mp3/dct64_i386.o mp3/decode_ntom.o mp3/layer3.o mp3/tabinit.o mp3/interface.o
+
+chan_ooh323.o: ASTCFLAGS+=$(H323CFLAGS)
+
+$(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): ASTCFLAGS+=$(H323CFLAGS)
+$(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): $(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o
Oops, something went wrong.

0 comments on commit 358628a

Please sign in to comment.