[asterisk-commits] branch tilghman/res_odbc_rewrite r9587 - in
/team/tilghman/res_odbc_rewrite: ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Feb 11 11:49:02 MST 2006
Author: tilghman
Date: Sat Feb 11 12:48:39 2006
New Revision: 9587
URL: http://svn.digium.com/view/asterisk?rev=9587&view=rev
Log:
Merged revisions 9468-9469,9471-9472,9490,9506-9508,9529,9548-9549,9551-9552,9564-9569,9582,9585 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r9468 | kpfleming | 2006-02-10 21:13:25 -0600 (Fri, 10 Feb 2006) | 2 lines
fix compiler warnings
................
r9469 | kpfleming | 2006-02-10 21:14:05 -0600 (Fri, 10 Feb 2006) | 2 lines
build function modules independently (no more pbx_functions.so)
................
r9471 | kpfleming | 2006-02-10 21:21:09 -0600 (Fri, 10 Feb 2006) | 2 lines
remove last vestiges of pbx_functions
................
r9472 | kpfleming | 2006-02-10 21:28:59 -0600 (Fri, 10 Feb 2006) | 2 lines
doh!
................
r9490 | kpfleming | 2006-02-10 22:02:50 -0600 (Fri, 10 Feb 2006) | 2 lines
ignore archives in this directory
................
r9506 | markster | 2006-02-11 01:05:49 -0600 (Sat, 11 Feb 2006) | 2 lines
Fix SMDI to not blow up asterisk when there's no config file.
................
r9507 | markster | 2006-02-11 01:06:23 -0600 (Sat, 11 Feb 2006) | 2 lines
Make IAX2 not try to authenticate when registration info is not changing
................
r9508 | markster | 2006-02-11 01:06:47 -0600 (Sat, 11 Feb 2006) | 2 lines
Add capability to retrieve list of channel types
................
r9529 | kpfleming | 2006-02-11 09:27:38 -0600 (Sat, 11 Feb 2006) | 16 lines
Merged revisions 9493,9528 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r9493 | bweschke | 2006-02-11 00:29:34 -0600 (Sat, 11 Feb 2006) | 3 lines
kpfleming's fix from r9472 backported to 1.2
........
r9528 | kpfleming | 2006-02-11 09:22:55 -0600 (Sat, 11 Feb 2006) | 2 lines
clean up my mess from thread-starting change
........
................
r9548 | tilghman | 2006-02-11 10:13:03 -0600 (Sat, 11 Feb 2006) | 2 lines
Fix compile time warnings
................
r9549 | kpfleming | 2006-02-11 10:15:11 -0600 (Sat, 11 Feb 2006) | 2 lines
set standard properties on all non-binary files
................
r9551 | kpfleming | 2006-02-11 10:30:23 -0600 (Sat, 11 Feb 2006) | 2 lines
prepare to use auto-build rules in other Makefiles
................
r9552 | kpfleming | 2006-02-11 10:44:15 -0600 (Sat, 11 Feb 2006) | 2 lines
use auto-build for res modules too
................
r9564 | kpfleming | 2006-02-11 11:12:05 -0600 (Sat, 11 Feb 2006) | 2 lines
use auto-build for apps, simplify variable setting
................
r9565 | kpfleming | 2006-02-11 11:24:44 -0600 (Sat, 11 Feb 2006) | 2 lines
use auto-build for cdr modules
................
r9566 | kpfleming | 2006-02-11 11:41:36 -0600 (Sat, 11 Feb 2006) | 2 lines
use auto-build for codecs
................
r9567 | kpfleming | 2006-02-11 11:43:54 -0600 (Sat, 11 Feb 2006) | 2 lines
use auto-build for formats
................
r9568 | kpfleming | 2006-02-11 11:48:44 -0600 (Sat, 11 Feb 2006) | 3 lines
use auto-build for pbx modules
correct install variable for format modules
................
r9569 | kpfleming | 2006-02-11 11:58:21 -0600 (Sat, 11 Feb 2006) | 3 lines
remove unused header and channel module
use auto-build for channels
................
r9582 | russell | 2006-02-11 12:31:59 -0600 (Sat, 11 Feb 2006) | 10 lines
Merged revisions 9581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r9581 | russell | 2006-02-11 13:15:00 -0500 (Sat, 11 Feb 2006) | 2 lines
now that CDR is a loadable module, don't depend on it elsewhere (issue #6460)
........
................
r9585 | russell | 2006-02-11 12:40:42 -0600 (Sat, 11 Feb 2006) | 2 lines
don't try to build a chan_misdn_config.so
................
Removed:
team/tilghman/res_odbc_rewrite/channels/adtranvofr.h
team/tilghman/res_odbc_rewrite/channels/chan_oss_old.c
team/tilghman/res_odbc_rewrite/funcs/pbx_functions.c
Modified:
team/tilghman/res_odbc_rewrite/ (props changed)
team/tilghman/res_odbc_rewrite/UPGRADE.txt
team/tilghman/res_odbc_rewrite/apps/Makefile
team/tilghman/res_odbc_rewrite/apps/app_morsecode.c (contents, props changed)
team/tilghman/res_odbc_rewrite/apps/app_osplookup.c
team/tilghman/res_odbc_rewrite/apps/app_setcallerid.c (contents, props changed)
team/tilghman/res_odbc_rewrite/build_tools/make_svn_branch_name (props changed)
team/tilghman/res_odbc_rewrite/cdr.c
team/tilghman/res_odbc_rewrite/cdr/Makefile
team/tilghman/res_odbc_rewrite/channel.c
team/tilghman/res_odbc_rewrite/channels/Makefile
team/tilghman/res_odbc_rewrite/channels/chan_iax2.c
team/tilghman/res_odbc_rewrite/channels/chan_sip.c
team/tilghman/res_odbc_rewrite/channels/misdn/ (props changed)
team/tilghman/res_odbc_rewrite/channels/misdn/fac.c (props changed)
team/tilghman/res_odbc_rewrite/channels/misdn/fac.h (props changed)
team/tilghman/res_odbc_rewrite/codecs/Makefile
team/tilghman/res_odbc_rewrite/configs/func_odbc.conf.sample (props changed)
team/tilghman/res_odbc_rewrite/configs/smdi.conf.sample (props changed)
team/tilghman/res_odbc_rewrite/configs/udptl.conf.sample (props changed)
team/tilghman/res_odbc_rewrite/contrib/scripts/safe_asterisk_restart (props changed)
team/tilghman/res_odbc_rewrite/dnsmgr.c
team/tilghman/res_odbc_rewrite/doc/00README.1st (props changed)
team/tilghman/res_odbc_rewrite/doc/callingpres.txt (props changed)
team/tilghman/res_odbc_rewrite/doc/smdi.txt (props changed)
team/tilghman/res_odbc_rewrite/formats/Makefile
team/tilghman/res_odbc_rewrite/formats/format_h264.c (contents, props changed)
team/tilghman/res_odbc_rewrite/funcs/Makefile
team/tilghman/res_odbc_rewrite/funcs/func_base64.c (contents, props changed)
team/tilghman/res_odbc_rewrite/funcs/func_callerid.c
team/tilghman/res_odbc_rewrite/funcs/func_cdr.c
team/tilghman/res_odbc_rewrite/funcs/func_cut.c
team/tilghman/res_odbc_rewrite/funcs/func_db.c
team/tilghman/res_odbc_rewrite/funcs/func_enum.c
team/tilghman/res_odbc_rewrite/funcs/func_env.c
team/tilghman/res_odbc_rewrite/funcs/func_groupcount.c
team/tilghman/res_odbc_rewrite/funcs/func_language.c
team/tilghman/res_odbc_rewrite/funcs/func_logic.c
team/tilghman/res_odbc_rewrite/funcs/func_math.c
team/tilghman/res_odbc_rewrite/funcs/func_md5.c
team/tilghman/res_odbc_rewrite/funcs/func_moh.c
team/tilghman/res_odbc_rewrite/funcs/func_odbc.c (contents, props changed)
team/tilghman/res_odbc_rewrite/funcs/func_rand.c (contents, props changed)
team/tilghman/res_odbc_rewrite/funcs/func_sha1.c (contents, props changed)
team/tilghman/res_odbc_rewrite/funcs/func_strings.c
team/tilghman/res_odbc_rewrite/funcs/func_timeout.c
team/tilghman/res_odbc_rewrite/funcs/func_uri.c
team/tilghman/res_odbc_rewrite/include/asterisk/channel.h
team/tilghman/res_odbc_rewrite/include/asterisk/manager.h
team/tilghman/res_odbc_rewrite/include/asterisk/pbx.h
team/tilghman/res_odbc_rewrite/include/asterisk/sha1.h (props changed)
team/tilghman/res_odbc_rewrite/include/asterisk/smdi.h (props changed)
team/tilghman/res_odbc_rewrite/include/asterisk/stringfields.h (props changed)
team/tilghman/res_odbc_rewrite/include/asterisk/udptl.h (props changed)
team/tilghman/res_odbc_rewrite/manager.c
team/tilghman/res_odbc_rewrite/pbx.c
team/tilghman/res_odbc_rewrite/pbx/Makefile
team/tilghman/res_odbc_rewrite/pbx/pbx_spool.c
team/tilghman/res_odbc_rewrite/res/Makefile
team/tilghman/res_odbc_rewrite/res/res_clioriginate.c (contents, props changed)
team/tilghman/res_odbc_rewrite/res/res_smdi.c (contents, props changed)
team/tilghman/res_odbc_rewrite/sha1.c (props changed)
team/tilghman/res_odbc_rewrite/udptl.c (contents, props changed)
Propchange: team/tilghman/res_odbc_rewrite/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/tilghman/res_odbc_rewrite/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 11 12:48:39 2006
@@ -1,1 +1,1 @@
-/trunk:1-9463
+/trunk:1-9585
Modified: team/tilghman/res_odbc_rewrite/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/UPGRADE.txt?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/UPGRADE.txt (original)
+++ team/tilghman/res_odbc_rewrite/UPGRADE.txt Sat Feb 11 12:48:39 2006
@@ -35,6 +35,11 @@
* The function ${CHECK_MD5()} has been deprecated in favor of using an
expression: $[${MD5(<string>)} = ${saved_md5}].
+* The 'builtin' functions that used to be combined in pbx_functions.so are
+ now built as separate modules. If you are not using 'autoload=yes' in your
+ modules.conf file then you will need to explicitly load the modules that
+ contain the functions you want to use.
+
The SIP channel:
* The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf.
Modified: team/tilghman/res_odbc_rewrite/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/apps/Makefile?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/apps/Makefile (original)
+++ team/tilghman/res_odbc_rewrite/apps/Makefile Sat Feb 11 12:48:39 2006
@@ -3,7 +3,7 @@
#
# Makefile for PBX applications
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -11,58 +11,45 @@
# the GNU General Public License
#
-APPS=app_adsiprog.so app_alarmreceiver.so app_authenticate.so app_cdr.so \
- app_chanisavail.so app_chanspy.so app_controlplayback.so app_db.so \
- app_dial.so app_dictate.so app_directed_pickup.so app_directory.so \
- app_disa.so app_dumpchan.so app_echo.so app_exec.so app_externalivr.so \
- app_festival.so app_forkcdr.so app_getcpeid.so app_hasnewvoicemail.so \
- app_ices.so app_image.so app_lookupblacklist.so app_lookupcidname.so \
- app_macro.so app_milliwatt.so app_mixmonitor.so app_mp3.so app_nbscat.so \
- app_parkandannounce.so app_playback.so app_privacy.so app_queue.so \
- app_random.so app_read.so app_readfile.so app_realtime.so app_record.so \
- app_sayunixtime.so app_senddtmf.so app_sendtext.so app_setcallerid.so \
- app_setcdruserfield.so app_settransfercapability.so app_softhangup.so \
- app_stack.so app_system.so app_talkdetect.so app_test.so app_transfer.so \
- app_userevent.so app_url.so app_verbose.so app_voicemail.so \
- app_waitforring.so app_waitforsilence.so app_while.so app_zapateller.so \
- app_morsecode.so
+MODS:=$(patsubst %.c,%.so,$(wildcard app_*.c))
#
# Experimental things
#
-#APPS+=app_ivrdemo.so
-#APPS+=app_skel.so
-#APPS+=app_rpt.so
+MODS:=$(filter-out app_ivrdemo.so,$(MODS))
+MODS:=$(filter-out app_skel.so,$(MODS))
+MODS:=$(filter-out app_rpt.so,$(MODS))
ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
- APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so
-endif
-endif # WITHOUT_ZAPTEL
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
-APPS+=app_osplookup.so
+ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)
endif
-CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
+ifeq (${ZAPAVAIL},)
+ MODS:=$(filter-out app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+ MODS:=$(filter-out app_osplookup.so,$(MODS))
+endif
+
ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
- ifneq (${CURLLIBS},)
- APPS+=app_curl.so
- endif
+ CURLLIBS:=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
+endif
+
+ifeq (${CURLLIBS},)
+ MODS:=$(filter-out app_curl.so,$(MODS))
+endif
+
+ifneq (${WITH_SMDI},)
+ CFLAGS+=-DWITH_SMDI
endif
ifeq (${OSARCH},CYGWIN)
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so -lres_adsi.so -lres_monitor.so
+ CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
+ CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so -lres_adsi.so -lres_monitor.so
+ MODS:=$(filter-out app_sms.so,$(MODS))
else
-CFLAGS+=-fPIC
-APPS+=app_sms.so
-endif
-
-# Asterisk SMDI integration
-#
-ifeq (${WITH_SMDI},1)
-CFLAGS+=-DWITH_SMDI
+ CFLAGS+=-fPIC
endif
# If you have UnixODBC you can use ODBC voicemail
@@ -74,7 +61,7 @@
#CFLAGS+=-DEXTENDED_ODBC_STORAGE
# See doc/README.odbcstorage for more information
-all: $(APPS)
+all: $(MODS)
clean:
rm -f *.so *.o look .depend
@@ -86,7 +73,7 @@
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone
install: all
- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
rm -f $(DESTDIR)$(MODULES_DIR)/app_cut.so
rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so
Modified: team/tilghman/res_odbc_rewrite/apps/app_morsecode.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/apps/app_morsecode.c?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/apps/app_morsecode.c (original)
+++ team/tilghman/res_odbc_rewrite/apps/app_morsecode.c Sat Feb 11 12:48:39 2006
@@ -31,7 +31,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7221 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/file.h"
#include "asterisk/logger.h"
Propchange: team/tilghman/res_odbc_rewrite/apps/app_morsecode.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/apps/app_morsecode.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/tilghman/res_odbc_rewrite/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/apps/app_osplookup.c?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/apps/app_osplookup.c (original)
+++ team/tilghman/res_odbc_rewrite/apps/app_osplookup.c Sat Feb 11 12:48:39 2006
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
*
@@ -184,6 +184,7 @@
int res=0;
struct localuser *u;
char *temp;
+ const char *val;
int cause;
struct ast_osp_result result;
int priority_jump = 0;
@@ -212,11 +213,11 @@
}
cause = str2cause(args.cause);
- temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
+ val = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
result.handle = -1;
- if (!ast_strlen_zero(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
- temp = pbx_builtin_getvar_helper(chan, "OSPRESULTS");
- if (ast_strlen_zero(temp) || (sscanf(temp, "%d", &result.numresults) != 1)) {
+ if (!ast_strlen_zero(val) && (sscanf(val, "%d", &result.handle) == 1) && (result.handle > -1)) {
+ val = pbx_builtin_getvar_helper(chan, "OSPRESULTS");
+ if (ast_strlen_zero(val) || (sscanf(val, "%d", &result.numresults) != 1)) {
result.numresults = 0;
}
if ((res = ast_osp_next(&result, cause)) > 0) {
@@ -255,6 +256,7 @@
int res=0;
struct localuser *u;
char *temp;
+ const char *val;
int cause;
time_t start=0, duration=0;
struct ast_osp_result result;
@@ -293,9 +295,9 @@
ast_log(LOG_WARNING, "OSPFinish called on channel '%s' with no CDR!\n", chan->name);
cause = str2cause(args.status);
- temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
+ val = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
result.handle = -1;
- if (!ast_strlen_zero(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
+ if (!ast_strlen_zero(val) && (sscanf(val, "%d", &result.handle) == 1) && (result.handle > -1)) {
if (!ast_osp_terminate(result.handle, cause, start, duration)) {
pbx_builtin_setvar_helper(chan, "_OSPHANDLE", "");
pbx_builtin_setvar_helper(chan, "OSPFINISHSTATUS", "SUCCESS");
Modified: team/tilghman/res_odbc_rewrite/apps/app_setcallerid.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/apps/app_setcallerid.c?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/apps/app_setcallerid.c (original)
+++ team/tilghman/res_odbc_rewrite/apps/app_setcallerid.c Sat Feb 11 12:48:39 2006
@@ -31,7 +31,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7221 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/file.h"
Propchange: team/tilghman/res_odbc_rewrite/apps/app_setcallerid.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/apps/app_setcallerid.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/tilghman/res_odbc_rewrite/build_tools/make_svn_branch_name
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/build_tools/make_svn_branch_name
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/tilghman/res_odbc_rewrite/cdr.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/cdr.c?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/cdr.c (original)
+++ team/tilghman/res_odbc_rewrite/cdr.c Sat Feb 11 12:48:39 2006
@@ -1120,7 +1120,6 @@
int was_enabled;
int was_batchmode;
int res=0;
- pthread_attr_t attr;
ast_mutex_lock(&cdr_batch_lock);
@@ -1181,7 +1180,7 @@
if it does not exist */
if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
ast_cond_init(&cdr_pending_cond, NULL);
- if (ast_pthread_create(&cdr_thread, &attr, do_cdr, NULL) < 0) {
+ if (ast_pthread_create(&cdr_thread, NULL, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);
} else {
Modified: team/tilghman/res_odbc_rewrite/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/cdr/Makefile?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/cdr/Makefile (original)
+++ team/tilghman/res_odbc_rewrite/cdr/Makefile Sat Feb 11 12:48:39 2006
@@ -1,9 +1,9 @@
#
# Asterisk -- A telephony toolkit for Linux.
#
-# Makefile for CDR backends (dynamically loaded)
+# Makefile for CDR backends
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -11,13 +11,30 @@
# the GNU General Public License
#
-MODS=cdr_csv.so cdr_manager.so cdr_custom.so
+MODS:=$(patsubst %.c,%.so,$(wildcard cdr_*.c))
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
+ MODS:=$(filter-out cdr_odbc.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include $(CROSS_COMPILE_TARGET)/usr/include/pgsql $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql $(CROSS_COMPILE_TARGET)/opt/pgsql/include $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
+ MODS:=$(filter-out cdr_pgsql.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite.h),)
+ MODS:=$(filter-out cdr_sqlite.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
+ MODS:=$(filter-out cdr_tds.so,$(MODS))
+ NOTDS=1
+endif
ifeq (${OSARCH},CYGWIN)
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-CYGSOLIB=-L.. -L. -lasterisk.dll
+ CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
+ CYGSOLIB=-L.. -L. -lasterisk.dll
else
-CFLAGS+=-fPIC
+ CFLAGS+=-fPIC
endif
ifeq ($(findstring BSD,${OSARCH}),BSD)
@@ -31,21 +48,11 @@
#So we go lowest common available by gcc and go a step down, still a step up from
#the default as we now have a better instruction set to work with. - Belgarath
ifeq ($(PROC),sparc64)
- PROC=ultrasparc
+ PROC=ultrasparc
CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
endif
-#
-# unixODBC stuff...
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
- MODS+=cdr_odbc.so
-endif
-
-#
-# FreeTDS stuff...
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
+ifeq (${NOTDS},)
ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
CFLAGS += -DFREETDS_0_63
else
@@ -55,14 +62,6 @@
CFLAGS += -DFREETDS_PRE_0_62
endif
endif
- MODS+=cdr_tds.so
-endif
-
-#
-# PGSQL stuff... Autoconf anyone??
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
- MODS+=cdr_pgsql.so
endif
MLFLAGS=
@@ -100,13 +99,6 @@
MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib
endif
-#
-# SQLite stuff...
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite.h),)
- MODS+=cdr_sqlite.so
-endif
-
all: depend $(MODS)
install: all
Modified: team/tilghman/res_odbc_rewrite/channel.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/channel.c?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/channel.c (original)
+++ team/tilghman/res_odbc_rewrite/channel.c Sat Feb 11 12:48:39 2006
@@ -164,6 +164,22 @@
{ AST_CAUSE_INTERWORKING, "Interworking, unspecified" },
};
+
+struct ast_variable *ast_channeltype_list(void)
+{
+ struct chanlist *cl;
+ struct ast_variable *var=NULL, *prev = NULL;
+ AST_LIST_TRAVERSE(&backends, cl, list) {
+ if (prev) {
+ if ((prev->next = ast_variable_new(cl->tech->type, cl->tech->description)))
+ prev = prev->next;
+ } else {
+ var = ast_variable_new(cl->tech->type, cl->tech->description);
+ prev = var;
+ }
+ }
+ return var;
+}
static int show_channeltypes(int fd, int argc, char *argv[])
{
@@ -2418,6 +2434,8 @@
ast_set_callerid(chan, oh->cid_num, oh->cid_name, oh->cid_num);
if (oh->parent_channel)
ast_channel_inherit_variables(oh->parent_channel, chan);
+ if (oh->account)
+ ast_cdr_setaccount(chan, oh->account);
}
ast_set_callerid(chan, cid_num, cid_name, cid_num);
Modified: team/tilghman/res_odbc_rewrite/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/channels/Makefile?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/channels/Makefile (original)
+++ team/tilghman/res_odbc_rewrite/channels/Makefile Sat Feb 11 12:48:39 2006
@@ -3,7 +3,7 @@
#
# Makefile for channel drivers
#
-# Copyright (C) 1999-2005, Mark Spencer
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -14,7 +14,10 @@
# the GNU General Public License
#
-CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
+MODS:=$(patsubst %.c,%.so,$(wildcard chan_*.c))
+
+# This should be renamed :)
+MODS:=$(filter-out chan_misdn_config.so,$(MODS))
ifeq (${OSARCH},OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r
@@ -28,9 +31,9 @@
endif
ifeq (${OSARCH},CYGWIN)
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so
-CYG_CHAN_AGENT=-lres_monitor.so
+ CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
+ CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so
+ CYG_CHAN_AGENT=-lres_monitor.so
endif
ifeq ($(PROC),sparc64)
@@ -49,52 +52,51 @@
H323LIB=-lh323_NetBSD_x86_r
endif
-ifneq (${OSARCH},Darwin)
- ifneq (${OSARCH},SunOS)
- ifneq (${OSARCH},CYGWIN)
- CHANNEL_LIBS+=chan_oss.so
- endif
- endif
+ifeq (${OSARCH},Darwin)
+ MODS:=$(filter-out chan_oss.so,$(MODS))
endif
ifeq (${OSARCH},SunOS)
+ MODS:=$(filter-out chan_oss.so,$(MODS))
SOLINK+=-lrt
endif
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
- CHANNEL_LIBS+=chan_phone.so
-endif
-
-#
-# Asterisk SMDI integration
-#
+ifeq (${OSARCH},CYGWIN)
+ MODS:=$(filter-out chan_oss.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
+ MODS:=$(filter-out chan_phone.so,$(MODS))
+endif
+
ifeq (${WITH_SMDI},1)
CFLAGS+=-DWITH_SMDI
endif
-ifneq ($(wildcard h323/libchanh323.a),)
- CHANNEL_LIBS+=chan_h323.so
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
- CHANNEL_LIBS+=chan_misdn.so
+ifeq ($(wildcard h323/libchanh323.a),)
+ MODS:=$(filter-out chan_h323.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
+ MODS:=$(filter-out chan_misdn.so,$(MODS))
+else
CFLAGS+=-Imisdn
endif
CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
- CHANNEL_LIBS+=chan_alsa.so
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
+ MODS:=$(filter-out chan_alsa.so,$(MODS))
endif
ifndef WITHOUT_PRI
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1 $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
CFLAGS+=-DZAPATA_PRI
ZAPPRI=-lpri
endif
endif # WITHOUT_PRI
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1 $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
CFLAGS+=-DZAPATA_R2
ZAPR2=-lmfcr2
endif
@@ -107,7 +109,12 @@
endif
ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
+ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)
+endif
+
+ifeq (${ZAPAVAIL},)
+ MODS:=$(filter-out chan_zap.so,$(MODS))
+else
ifeq (${OSARCH},NetBSD)
SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
endif
@@ -115,27 +122,26 @@
SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
CFLAGS+=-DIAX_TRUNKING
- CHANNEL_LIBS+=chan_zap.so
-endif
-endif # WITHOUT_ZAPTEL
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
- CHANNEL_LIBS+=chan_vpb.so
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
+ MODS:=$(filter-out chan_vpb.so,$(MODS))
+else
CFLAGS+=-DLINUX
endif
CFLAGS+=-DCRYPTO
ifneq ($(OSARCH),CYGWIN)
-CFLAGS+=-fPIC
+ CFLAGS+=-fPIC
endif
CFLAGS+=#-DVOFRDUMPER
ZAPDIR=/usr/lib
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
- CHANNEL_LIBS+=chan_nbs.so
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
+ MODS:=$(filter-out chan_nbs.so,$(MODS))
endif
ifndef OPENH323DIR
@@ -146,9 +152,7 @@
PWLIBDIR=$(HOME)/pwlib
endif
-#CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")
-
-all: depend $(CHANNEL_LIBS)
+all: depend $(MODS)
clean:
rm -f *.so *.o .depend
@@ -245,8 +249,7 @@
install: all
- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
+ for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
uninstall:
Modified: team/tilghman/res_odbc_rewrite/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/channels/chan_iax2.c?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/channels/chan_iax2.c (original)
+++ team/tilghman/res_odbc_rewrite/channels/chan_iax2.c Sat Feb 11 12:48:39 2006
@@ -234,7 +234,8 @@
enum {
IAX_STATE_STARTED = (1 << 0),
IAX_STATE_AUTHENTICATED = (1 << 1),
- IAX_STATE_TBD = (1 << 2)
+ IAX_STATE_TBD = (1 << 2),
+ IAX_STATE_UNCHANGED = (1 << 3),
} iax2_state;
struct iax2_context {
@@ -5011,7 +5012,7 @@
int x;
int expire = 0;
- ast_clear_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED);
+ ast_clear_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED | IAX_STATE_UNCHANGED);
iaxs[callno]->peer[0] = '\0';
if (ies->username)
ast_copy_string(peer, ies->username, sizeof(peer));
@@ -5056,6 +5057,8 @@
destroy_peer(p);
return -1;
}
+ if (!inaddrcmp(&p->addr, sin))
+ ast_set_flag(&iaxs[callno]->state, IAX_STATE_UNCHANGED);
ast_copy_string(iaxs[callno]->secret, p->secret, sizeof(iaxs[callno]->secret));
ast_copy_string(iaxs[callno]->inkeys, p->inkeys, sizeof(iaxs[callno]->inkeys));
/* Check secret against what we have on file */
@@ -7362,7 +7365,8 @@
auth_fail(fr.callno, IAX_COMMAND_REGREJ);
break;
}
- if ((ast_strlen_zero(iaxs[fr.callno]->secret) && ast_strlen_zero(iaxs[fr.callno]->inkeys)) || ast_test_flag(&iaxs[fr.callno]->state, IAX_STATE_AUTHENTICATED)) {
+ if ((ast_strlen_zero(iaxs[fr.callno]->secret) && ast_strlen_zero(iaxs[fr.callno]->inkeys)) ||
+ ast_test_flag(&iaxs[fr.callno]->state, IAX_STATE_AUTHENTICATED | IAX_STATE_UNCHANGED)) {
if (f.subclass == IAX_COMMAND_REGREL)
memset(&sin, 0, sizeof(sin));
if (update_registry(iaxs[fr.callno]->peer, &sin, fr.callno, ies.devicetype, fd, ies.refresh))
Modified: team/tilghman/res_odbc_rewrite/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/channels/chan_sip.c?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/channels/chan_sip.c (original)
+++ team/tilghman/res_odbc_rewrite/channels/chan_sip.c Sat Feb 11 12:48:39 2006
@@ -11447,7 +11447,6 @@
/*! \brief Start the channel monitor thread */
static int restart_monitor(void)
{
- pthread_attr_t attr;
/* If we're supposed to be stopped -- stay stopped */
if (monitor_thread == AST_PTHREADT_STOP)
return 0;
@@ -11465,7 +11464,7 @@
pthread_kill(monitor_thread, SIGURG);
} else {
/* Start a new monitor */
- if (ast_pthread_create(&monitor_thread, &attr, do_monitor, NULL) < 0) {
+ if (ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL) < 0) {
ast_mutex_unlock(&monlock);
ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
return -1;
Propchange: team/tilghman/res_odbc_rewrite/channels/misdn/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 11 12:48:39 2006
@@ -1,0 +1,1 @@
+*.a
Propchange: team/tilghman/res_odbc_rewrite/channels/misdn/fac.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/channels/misdn/fac.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/tilghman/res_odbc_rewrite/channels/misdn/fac.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/channels/misdn/fac.h
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/tilghman/res_odbc_rewrite/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/codecs/Makefile?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/codecs/Makefile (original)
+++ team/tilghman/res_odbc_rewrite/codecs/Makefile Sat Feb 11 12:48:39 2006
@@ -3,7 +3,7 @@
#
# Makefile for codec modules
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -11,74 +11,57 @@
# the GNU General Public License
#
+MODS:=$(patsubst %.c,%.so,$(wildcard codec_*.c))
+
ifeq (${OSARCH},CYGWIN)
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-CYGSOLIB=-L.. -L. -lasterisk.dll
+ CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
+ CYGSOLIB=-L.. -L. -lasterisk.dll
else
-CFLAGS+=-fPIC
+ CFLAGS+=-fPIC
endif
-ifneq ($(wildcard g723.1/coder.c),)
- MODG723=codec_g723_1.so
+ifeq ($(wildcard g723.1/coder.c),)
+ MODS:=$(filter-out codec_g723_1.so,$(MODS))
+else
LIBG723=g723.1/libg723.a
endif
-ifneq ($(wildcard g723.1b/coder2.c),)
- MODG723+=codec_g723_1b.so
+ifeq ($(wildcard g723.1b/coder2.c),)
+ MODS:=$(filter-out codec_g723_1b.so,$(MODS))
+else
LIBG723B=g723.1b/libg723b.a
endif
-UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h)
-UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h)
-ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h)
-ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h)
-ifneq (${UI_SPEEX},)
- MODSPEEX=codec_speex.so
- LIBSPEEX+=-lspeex -lm
-endif
-ifneq (${UIS_SPEEX},)
- MODSPEEX=codec_speex.so
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex
- LIBSPEEX+=-lspeex -lm
-endif
-ifneq (${ULI_SPEEX},)
- MODSPEEX=codec_speex.so
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
- LIBSPEEX+=-lspeex -lm
-endif
-ifneq (${ULIS_SPEEX},)
- MODSPEEX=codec_speex.so
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex
- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
- LIBSPEEX+=-lspeex -lm
+SPEEX_PATH:=/usr/local/include /usr/include /usr/include/speex /usr/local/include/speex
+SPEEX_SYSTEM_HEADERS:=$(wildcard $(SPEEX_PATH:%=$(CROSS_COMPILE_TARGET)%/speex.h))
+ifeq (${SPEEX_SYSTEM_HEADERS},)
+ MODS:=$(filter-out codec_speex.so,$(MODS))
+else
+ CFLAGS+=-I$(subst /speex.h,,${SPEEX_SYSTEM_HEADERS})
+ LIBSPEEX=-lspeex -lm
endif
-ifneq ($(wildcard ilbc/iLBC_decode.h),)
- MODILBC=codec_ilbc.so
+ifeq ($(wildcard ilbc/iLBC_decode.h),)
+ MODS:=$(filter-out codec_ilbc.so,$(MODS))
+else
LIBILBC=ilbc/libilbc.a
endif
-
LIBGSM_PATH:=/usr/local/include /usr/include
LIBGSM_SYSTEM_HEADERS:=$(wildcard $(LIBGSM_PATH:%=$(CROSS_COMPILE_TARGET)%/gsm/gsm.h))
-ifneq (,$(LIBGSM_SYSTEM_HEADERS))
-LIBGSM=-lgsm
-LIBGSMT=
-CFLAGS+=-DUSE_EXTERNAL_GSM_LIB
+ifneq ($(LIBGSM_SYSTEM_HEADERS),)
+ LIBGSM=-lgsm
+ LIBGSMT=
+ CFLAGS+=-DUSE_EXTERNAL_GSM_LIB
else
-LIBGSM=gsm/lib/libgsm.a
-LIBGSMT=$(LIBGSM)
-CFLAGS+=-I.
+ LIBGSM=gsm/lib/libgsm.a
+ LIBGSMT=$(LIBGSM)
+ CFLAGS+=-I.
endif
LIBLPC10=lpc10/liblpc10.a
-CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \
- codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
- codec_g726.so
-
-all: depend $(CODECS)
+all: depend $(MODS)
clean:
rm -f *.so *.o .depend
@@ -118,7 +101,7 @@
codec_gsm.so: codec_gsm.o $(LIBGSMT)
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBGSM)
-$(MODSPEEX): codec_speex.o
+codec_speex.so: codec_speex.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBSPEEX)
codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
@@ -132,7 +115,7 @@
endif
install: all
- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
uninstall:
Propchange: team/tilghman/res_odbc_rewrite/configs/func_odbc.conf.sample
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/configs/func_odbc.conf.sample
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/tilghman/res_odbc_rewrite/configs/smdi.conf.sample
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/configs/smdi.conf.sample
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/tilghman/res_odbc_rewrite/configs/udptl.conf.sample
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/configs/udptl.conf.sample
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/tilghman/res_odbc_rewrite/contrib/scripts/safe_asterisk_restart
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tilghman/res_odbc_rewrite/contrib/scripts/safe_asterisk_restart
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/tilghman/res_odbc_rewrite/dnsmgr.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/res_odbc_rewrite/dnsmgr.c?rev=9587&r1=9586&r2=9587&view=diff
==============================================================================
--- team/tilghman/res_odbc_rewrite/dnsmgr.c (original)
+++ team/tilghman/res_odbc_rewrite/dnsmgr.c Sat Feb 11 12:48:39 2006
@@ -303,7 +303,6 @@
const char *enabled_value;
int interval;
int was_enabled;
- pthread_attr_t attr;
int res = -1;
/* ensure that no refresh cycles run while the reload is in progress */
Propchange: team/tilghman/res_odbc_rewrite/doc/00README.1st
------------------------------------------------------------------------------
svn:eol-style = native
[... 2885 lines stripped ...]
More information about the asterisk-commits
mailing list