[asterisk-commits] [svn-commits] seanbright: branch group/cdr_backend_ast_str r111015 - in /team/group/cdr_bac...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Mar 26 13:41:45 CDT 2008
Author: seanbright
Date: Wed Mar 26 13:41:44 2008
New Revision: 111015
URL: http://svn.digium.com/view/asterisk?view=rev&rev=111015
Log:
Merged revisions 110780,110831,110881,110911,110930,110963 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r110780 | qwell | 2008-03-25 18:51:55 -0400 (Tue, 25 Mar 2008) | 14 lines
Merged revisions 110779 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r110779 | qwell | 2008-03-25 17:51:17 -0500 (Tue, 25 Mar 2008) | 6 lines
Make file access in cdr_custom similar to cdr_csv.
Fixes issue #12268.
Patch borrowed from r82344
........
................
r110831 | mmichelson | 2008-03-25 20:02:31 -0400 (Tue, 25 Mar 2008) | 6 lines
This ensures that the manager interface is not enabled by default. Prior to this
change, it was possible to start Asterisk with the manager interface enabled, then
either comment out the enabled option or make manager.conf unopenable and the manager
interface would still be enabled.
................
r110881 | kpfleming | 2008-03-26 13:10:28 -0400 (Wed, 26 Mar 2008) | 18 lines
Merged revisions 110880 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r110880 | kpfleming | 2008-03-26 09:42:35 -0700 (Wed, 26 Mar 2008) | 10 lines
Merged revisions 110869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r110869 | kpfleming | 2008-03-26 08:53:46 -0700 (Wed, 26 Mar 2008) | 2 lines
due to licensing restrictions, we cannot distribute the source code for iLBC encoding and decoding... so remove it, and add instructions on how the user can obtain it themselves
........
................
................
r110911 | juggie | 2008-03-26 13:24:54 -0400 (Wed, 26 Mar 2008) | 8 lines
update documentation to reflect the changes in the way configure detects net-snmp.
(closes issue #12067)
Reported by: juggie
Patches:
12067_snmp_doc.patch uploaded by juggie (license 24)
Tested by: juggie
................
r110930 | juggie | 2008-03-26 13:28:49 -0400 (Wed, 26 Mar 2008) | 1 line
revert something dumb, because i was running svn diff in a subfolder not the root of trunk, before doing my commit and did not see it
................
r110963 | kpfleming | 2008-03-26 13:44:09 -0400 (Wed, 26 Mar 2008) | 10 lines
Merged revisions 110962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r110962 | kpfleming | 2008-03-26 12:43:02 -0500 (Wed, 26 Mar 2008) | 2 lines
add note that the user will need to enable codec_ilbc to get it to build
........
................
Removed:
team/group/cdr_backend_ast_str/codecs/ilbc/FrameClassify.c
team/group/cdr_backend_ast_str/codecs/ilbc/FrameClassify.h
team/group/cdr_backend_ast_str/codecs/ilbc/LPCdecode.c
team/group/cdr_backend_ast_str/codecs/ilbc/LPCdecode.h
team/group/cdr_backend_ast_str/codecs/ilbc/LPCencode.c
team/group/cdr_backend_ast_str/codecs/ilbc/LPCencode.h
team/group/cdr_backend_ast_str/codecs/ilbc/StateConstructW.c
team/group/cdr_backend_ast_str/codecs/ilbc/StateConstructW.h
team/group/cdr_backend_ast_str/codecs/ilbc/StateSearchW.c
team/group/cdr_backend_ast_str/codecs/ilbc/StateSearchW.h
team/group/cdr_backend_ast_str/codecs/ilbc/anaFilter.c
team/group/cdr_backend_ast_str/codecs/ilbc/anaFilter.h
team/group/cdr_backend_ast_str/codecs/ilbc/constants.c
team/group/cdr_backend_ast_str/codecs/ilbc/constants.h
team/group/cdr_backend_ast_str/codecs/ilbc/createCB.c
team/group/cdr_backend_ast_str/codecs/ilbc/createCB.h
team/group/cdr_backend_ast_str/codecs/ilbc/doCPLC.c
team/group/cdr_backend_ast_str/codecs/ilbc/doCPLC.h
team/group/cdr_backend_ast_str/codecs/ilbc/enhancer.c
team/group/cdr_backend_ast_str/codecs/ilbc/enhancer.h
team/group/cdr_backend_ast_str/codecs/ilbc/filter.c
team/group/cdr_backend_ast_str/codecs/ilbc/filter.h
team/group/cdr_backend_ast_str/codecs/ilbc/gainquant.c
team/group/cdr_backend_ast_str/codecs/ilbc/gainquant.h
team/group/cdr_backend_ast_str/codecs/ilbc/getCBvec.c
team/group/cdr_backend_ast_str/codecs/ilbc/getCBvec.h
team/group/cdr_backend_ast_str/codecs/ilbc/helpfun.c
team/group/cdr_backend_ast_str/codecs/ilbc/helpfun.h
team/group/cdr_backend_ast_str/codecs/ilbc/hpInput.c
team/group/cdr_backend_ast_str/codecs/ilbc/hpInput.h
team/group/cdr_backend_ast_str/codecs/ilbc/hpOutput.c
team/group/cdr_backend_ast_str/codecs/ilbc/hpOutput.h
team/group/cdr_backend_ast_str/codecs/ilbc/iCBConstruct.c
team/group/cdr_backend_ast_str/codecs/ilbc/iCBConstruct.h
team/group/cdr_backend_ast_str/codecs/ilbc/iCBSearch.c
team/group/cdr_backend_ast_str/codecs/ilbc/iCBSearch.h
team/group/cdr_backend_ast_str/codecs/ilbc/iLBC_decode.c
team/group/cdr_backend_ast_str/codecs/ilbc/iLBC_decode.h
team/group/cdr_backend_ast_str/codecs/ilbc/iLBC_define.h
team/group/cdr_backend_ast_str/codecs/ilbc/iLBC_encode.c
team/group/cdr_backend_ast_str/codecs/ilbc/iLBC_encode.h
team/group/cdr_backend_ast_str/codecs/ilbc/libilbc.vcproj
team/group/cdr_backend_ast_str/codecs/ilbc/lsf.c
team/group/cdr_backend_ast_str/codecs/ilbc/lsf.h
team/group/cdr_backend_ast_str/codecs/ilbc/packing.c
team/group/cdr_backend_ast_str/codecs/ilbc/packing.h
team/group/cdr_backend_ast_str/codecs/ilbc/syntFilter.c
team/group/cdr_backend_ast_str/codecs/ilbc/syntFilter.h
Modified:
team/group/cdr_backend_ast_str/ (props changed)
team/group/cdr_backend_ast_str/CHANGES
team/group/cdr_backend_ast_str/UPGRADE.txt
team/group/cdr_backend_ast_str/cdr/cdr_custom.c
team/group/cdr_backend_ast_str/codecs/Makefile
team/group/cdr_backend_ast_str/codecs/codec_ilbc.c
team/group/cdr_backend_ast_str/doc/snmp.txt
team/group/cdr_backend_ast_str/main/manager.c
Propchange: team/group/cdr_backend_ast_str/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/cdr_backend_ast_str/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 26 13:41:44 2008
@@ -1,1 +1,1 @@
-/trunk:1-110736
+/trunk:1-111011
Modified: team/group/cdr_backend_ast_str/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/CHANGES?view=diff&rev=111015&r1=111014&r2=111015
==============================================================================
--- team/group/cdr_backend_ast_str/CHANGES (original)
+++ team/group/cdr_backend_ast_str/CHANGES Wed Mar 26 13:41:44 2008
@@ -594,4 +594,4 @@
* Added a compiler flag, CHANNEL_TRACE, which permits channel tracing to be
turned on, via the CHANNEL(trace) dialplan function. Could be useful for
dialplan debugging.
-
+ * iLBC source code no longer included (see UPGRADE.txt for details)
Modified: team/group/cdr_backend_ast_str/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/UPGRADE.txt?view=diff&rev=111015&r1=111014&r2=111015
==============================================================================
--- team/group/cdr_backend_ast_str/UPGRADE.txt (original)
+++ team/group/cdr_backend_ast_str/UPGRADE.txt Wed Mar 26 13:41:44 2008
@@ -187,3 +187,23 @@
* The Originate command now requires the Originate write permission. For
Originate with the Application parameter, you need the additional System
privilege if you want to do anything that calls out to a subshell.
+
+iLBC Codec:
+
+* Previously, the Asterisk source code distribution included the iLBC
+ encoder/decoder source code, from Global IP Solutions
+ (http://www.gipscorp.com). This code is not licensed for
+ distribution, and thus has been removed from the Asterisk source
+ code distribution. If you wish to use codec_ilbc to support iLBC
+ channels in Asterisk, you must go to:
+
+ http://ilbcfreeware.org
+
+ and obtain the iLBC source code from that site, including agreeing
+ to the license agreement specified. The site has instructions on how
+ to extract the source code from the RFC file where it has been
+ published; after you have done that, copy the resulting *.c and *.h
+ files into the codecs/ilbc directory of the Asterisk source code
+ tree and follow your normal steps of building Asterisk. You will
+ need to run 'menuselect' and enable the iLBC codec in the 'Codec
+ Translators' category.
Modified: team/group/cdr_backend_ast_str/cdr/cdr_custom.c
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/cdr/cdr_custom.c?view=diff&rev=111015&r1=111014&r2=111015
==============================================================================
--- team/group/cdr_backend_ast_str/cdr/cdr_custom.c (original)
+++ team/group/cdr_backend_ast_str/cdr/cdr_custom.c Wed Mar 26 13:41:44 2008
@@ -43,16 +43,16 @@
#include "asterisk/config.h"
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
+#include "asterisk/lock.h"
#define CUSTOM_LOG_DIR "/cdr_custom"
#define DATE_FORMAT "%Y-%m-%d %T"
AST_MUTEX_DEFINE_STATIC(lock);
+AST_MUTEX_DEFINE_STATIC(mf_lock);
static char *name = "cdr-custom";
-
-static FILE *mf = NULL;
static char master[PATH_MAX];
static char format[1024]="";
@@ -104,6 +104,8 @@
static int custom_log(struct ast_cdr *cdr)
{
+ FILE *mf = NULL;
+
/* Make sure we have a big enough buf */
char buf[2048];
struct ast_channel dummy;
@@ -120,23 +122,24 @@
/* because of the absolutely unconditional need for the
highest reliability possible in writing billing records,
we open write and close the log file each time */
+ ast_mutex_lock(&mf_lock);
mf = fopen(master, "a");
- if (!mf) {
- ast_log(LOG_ERROR, "Unable to re-open master file %s : %s\n", master, strerror(errno));
- }
if (mf) {
fputs(buf, mf);
fflush(mf); /* be particularly anal here */
fclose(mf);
mf = NULL;
+ ast_mutex_unlock(&mf_lock);
+ } else {
+ ast_log(LOG_ERROR, "Unable to re-open master file %s : %s\n", master, strerror(errno));
+ ast_mutex_unlock(&mf_lock);
}
+
return 0;
}
static int unload_module(void)
{
- if (mf)
- fclose(mf);
ast_cdr_unregister(name);
return 0;
}
@@ -149,8 +152,6 @@
res = ast_cdr_register(name, ast_module_info->description, custom_log);
if (res)
ast_log(LOG_ERROR, "Unable to register custom CDR handling\n");
- if (mf)
- fclose(mf);
return res;
} else
return AST_MODULE_LOAD_DECLINE;
Modified: team/group/cdr_backend_ast_str/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/codecs/Makefile?view=diff&rev=111015&r1=111014&r2=111015
==============================================================================
--- team/group/cdr_backend_ast_str/codecs/Makefile (original)
+++ team/group/cdr_backend_ast_str/codecs/Makefile Wed Mar 26 13:41:44 2008
@@ -46,7 +46,7 @@
$(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10)
$(LIBILBC):
- @$(MAKE) -C ilbc all ASTCFLAGS="$(ASTCFLAGS) $(AST_NO_STRICT_OVERFLOW)"
+ @$(MAKE) -C ilbc all ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)"
$(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC)
Modified: team/group/cdr_backend_ast_str/codecs/codec_ilbc.c
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/codecs/codec_ilbc.c?view=diff&rev=111015&r1=111014&r2=111015
==============================================================================
--- team/group/cdr_backend_ast_str/codecs/codec_ilbc.c (original)
+++ team/group/cdr_backend_ast_str/codecs/codec_ilbc.c Wed Mar 26 13:41:44 2008
@@ -24,6 +24,10 @@
*
* \ingroup codecs
*/
+
+/*** MODULEINFO
+ <defaultenabled>no</defaultenabled>
+ ***/
#include "asterisk.h"
Modified: team/group/cdr_backend_ast_str/doc/snmp.txt
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/doc/snmp.txt?view=diff&rev=111015&r1=111014&r2=111015
==============================================================================
--- team/group/cdr_backend_ast_str/doc/snmp.txt (original)
+++ team/group/cdr_backend_ast_str/doc/snmp.txt Wed Mar 26 13:41:44 2008
@@ -6,10 +6,24 @@
the build system, including any libraries Net-SNMP depends on.
Note that on some (many?) Linux-distributions the dependency list in
-the net-snmp-devel list is not complete, and additional RPMs will need
-to be installed. This is typically seen as attempts to build res_snmp
-as net-snmp-devel is available, but then fails to find certain
-libraries. The packages may include the following:
+the net-snmp-devel list is not complete, and additional packages will
+need to be installed. This is usually seen as configure failing to
+detect net-snmp-devel as the configure script does a sanity check of
+the net-snmp build environment, based on the output of
+'net-snmp-config --agent-libs'.
+
+To see what your distribution requires, run 'net-snmp-config --agent-libs'.
+
+You will receive a response similar to the following:
+-L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -ldl
+-lrpm -lrpmio -lpopt -lz -lcrypto -lm -lsensors -L/usr/lib/lib -lwrap
+-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.8.8/i386-linux-thread-multi/CORE
+-L/usr/local/lib
+/usr/lib/perl5/5.8.8/i386-linux-thread-multi/auto/DynaLoader/DynaLoader.a
+-L/usr/lib/perl5/5.8.8/i386-linux-thread-multi/CORE -lperl -lresolv -lnsl
+-ldl -lm -lcrypt -lutil -lpthread -lc
+
+The packages required may include the following:
* bzip2-devel
* lm_sensors-devel
* newt-devel
Modified: team/group/cdr_backend_ast_str/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/main/manager.c?view=diff&rev=111015&r1=111014&r2=111015
==============================================================================
--- team/group/cdr_backend_ast_str/main/manager.c (original)
+++ team/group/cdr_backend_ast_str/main/manager.c Wed Mar 26 13:41:44 2008
@@ -3714,6 +3714,8 @@
struct ast_variable *var;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
+ manager_enabled = 0;
+
if (!registered) {
/* Register default actions */
ast_manager_register2("Ping", 0, action_ping, "Keepalive command", mandescr_ping);
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
More information about the asterisk-commits
mailing list