2006-08-21 02:11:39 +00:00
|
|
|
#
|
|
|
|
# Asterisk -- A telephony toolkit for Linux.
|
|
|
|
#
|
|
|
|
# Makefile to build main Asterisk binary
|
|
|
|
#
|
|
|
|
# Copyright (C) 1999-2006, Digium, Inc.
|
|
|
|
#
|
|
|
|
# Mark Spencer <markster@digium.com>
|
|
|
|
#
|
|
|
|
# This program is free software, distributed under the terms of
|
|
|
|
# the GNU General Public License
|
|
|
|
#
|
|
|
|
|
2006-08-26 23:58:47 +00:00
|
|
|
-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts.embed_rules
|
2006-08-21 02:11:39 +00:00
|
|
|
|
|
|
|
all: asterisk
|
|
|
|
|
|
|
|
include $(ASTTOPDIR)/Makefile.moddir_rules
|
|
|
|
|
|
|
|
OBJS= io.o sched.o logger.o frame.o loader.o config.o channel.o \
|
|
|
|
translate.o file.o pbx.o cli.o md5.o term.o \
|
|
|
|
ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
|
|
|
|
cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
|
|
|
|
dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
|
|
|
|
astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
|
|
|
|
utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
|
|
|
|
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
|
2006-09-15 17:16:00 +00:00
|
|
|
cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \
|
Merged revisions 80362 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80362 | russell | 2007-08-22 15:21:36 -0500 (Wed, 22 Aug 2007) | 34 lines
Merge changes from team/russell/iax_refcount.
This set of changes fixes problems with the handling of iax2_user and iax2_peer
objects. It was very possible for a thread to still hold a reference to one of
these objects while a reload operation tries to delete them. The fix here is to
ensure that all references to these objects are tracked so that they can't go away
while still in use.
To accomplish this, I used the astobj2 reference counted object model. This
code has been in one of Luigi Rizzo's branches for a long time and was primarily
developed by one of his students, Marta Carbone. I wanted to go ahead and bring
this in to 1.4 because there are other problems similar to the ones fixed by these
changes, so we might as well go ahead and use the new astobj if we're going to go
through all of the work necessary to fix the problems.
As a nice side benefit of these changes, peer and user handling got more efficient.
Using astobj2 lets us not hold the container lock for peers or users nearly as long
while iterating. Also, by changing a define at the top of chan_iax2.c, the objects
will be distributed in a hash table, drastically increasing lookup speed in these
containers, which will have a very big impact on systems that have a large number of
users or peers.
The use of the hash table will be made the default in trunk. It is not the default
in 1.4 because it changes the behavior slightly. Previously, since peers and users
were stored in memory in the same order they were specified in the configuration file,
you could influence peer and user matching order based on the order they are specified
in the configuration. The hash table does not guarantee any order in the container,
so this behavior will be going away. It just means that you have to be a little
more careful ensuring that peers and users are matched explicitly and not forcing
chan_iax2 to have to guess which user is the right one based on secret, host, and
access list settings, instead of simply using the username.
If you have any questions, feel free to ask on the asterisk-dev list.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80387 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-22 20:44:23 +00:00
|
|
|
strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \
|
This is the perhaps the biggest, boldest, most daring change I've ever committed to trunk. Forgive me in advance any disruption this may cause, and please, report any problems via the bugtracker. The upside is that this can speed up large dialplans by 20 times (or more). Context, extension, and priority matching are all fairly constant-time searches. I introduce here my hashtables (hashtabs), and a regression for them. I would have used the ast_obj2 tables, but mine are resizeable, and don't need the object destruction capability. The hashtab stuff is well tested and stable. I introduce a data structure, a trie, for extension pattern matching, in which knowledge of all patterns is accumulated, and all matches can be found via a single traversal of the tree. This is per-context. The trie is formed on the first lookup attempt, and stored in the context for future lookups. Destruction routines are in place for hashtabs and the pattern match trie. You can see the contents of the pattern match trie by using the 'dialplan show' cli command when 'core set debug' has been done to put it in debug mode. The pattern tree traversal only traverses those parts of the tree that are interesting. It uses a scoreboard sort of approach to find the best match. The speed of the traversal is more a function of the length of the pattern than the number of patterns in the tree. The tree also contains the CID matching patterns. See the source code comments for details on how everything works. I believe the approach general enough that any issues that might come up involving fine points in the pattern matching algorithm, can be solved by just tweaking things. We shall see. The current pattern matcher is fairly involved, and replicating every nuance of it is difficult. If you find and report problems, I will try to resolve than as quickly as I can. The trie and hashtabs are added to the existing context and exten structs, and none of the old machinery has been removed for the sake of the multitude of functions that use them. In the future, we can (maybe) weed out the linked lists and save some space.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89129 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-09 16:00:22 +00:00
|
|
|
astobj2.o hashtab.o
|
2006-08-21 02:11:39 +00:00
|
|
|
|
|
|
|
# we need to link in the objects statically, not as a library, because
|
|
|
|
# otherwise modules will not have them available if none of the static
|
|
|
|
# objects use it.
|
|
|
|
OBJS+=stdtime/localtime.o
|
|
|
|
|
|
|
|
# At the moment say.o is an optional component which can be overridden
|
|
|
|
# by a module.
|
|
|
|
OBJS+=say.o
|
|
|
|
|
2006-10-22 19:09:25 +00:00
|
|
|
AST_LIBS += $(SSL_LIB)
|
2007-01-19 16:51:31 +00:00
|
|
|
AST_LIBS += $(BKTR_LIB)
|
2006-10-22 19:09:25 +00:00
|
|
|
|
2007-11-17 03:07:06 +00:00
|
|
|
ifeq ($(POLL_AVAILABLE),)
|
2006-08-21 02:11:39 +00:00
|
|
|
OBJS+=poll.o
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(wildcard /usr/include/dlfcn.h),)
|
|
|
|
OBJS+=dlfcn.o
|
|
|
|
endif
|
|
|
|
|
2007-03-30 22:54:01 +00:00
|
|
|
ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc ),)
|
2006-08-21 02:11:39 +00:00
|
|
|
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
|
|
|
|
AST_LIBS+=-ldl
|
|
|
|
endif
|
2006-09-27 21:48:01 +00:00
|
|
|
ifneq (x$(CAP_LIB),x)
|
|
|
|
AST_LIBS+=$(CAP_LIB)
|
|
|
|
endif
|
2006-08-21 02:11:39 +00:00
|
|
|
AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv
|
|
|
|
else
|
|
|
|
AST_LIBS+=$(EDITLINE_LIB) -lm
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(findstring darwin,$(OSARCH)),)
|
|
|
|
AST_LIBS+=-lresolv
|
2006-08-26 16:45:35 +00:00
|
|
|
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
|
|
|
|
ASTLINK=-Wl,-dynamic
|
|
|
|
endif
|
2006-08-21 02:11:39 +00:00
|
|
|
else
|
|
|
|
# These are used for all but Darwin
|
2006-08-26 16:45:35 +00:00
|
|
|
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
|
2006-09-21 16:09:31 +00:00
|
|
|
ASTLINK+=-Wl,--export-dynamic
|
2006-08-26 16:45:35 +00:00
|
|
|
else
|
|
|
|
ASTLINK+=${GC_LDFLAGS}
|
|
|
|
endif
|
2006-08-21 02:11:39 +00:00
|
|
|
ifneq ($(findstring BSD,$(OSARCH)),)
|
|
|
|
LDFLAGS+=-L/usr/local/lib
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(OSARCH),FreeBSD)
|
2007-11-05 21:27:04 +00:00
|
|
|
# -V is understood by BSD Make, not by GNU make.
|
|
|
|
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
|
|
|
|
AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
|
2006-08-21 02:11:39 +00:00
|
|
|
AST_LIBS+=-lcrypto
|
|
|
|
endif
|
|
|
|
|
2007-11-17 10:54:52 +00:00
|
|
|
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
|
|
|
|
AST_LIBS+=-lminires -ldl
|
|
|
|
ASTLINK+= -shared -Wl,--out-implib,asterisk.dll
|
|
|
|
endif
|
2006-08-21 02:11:39 +00:00
|
|
|
ifeq ($(OSARCH),NetBSD)
|
|
|
|
AST_LIBS+=-lpthread -lcrypto -lm -L/usr/pkg/lib $(EDITLINE_LIB)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(OSARCH),OpenBSD)
|
|
|
|
AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(OSARCH),SunOS)
|
|
|
|
AST_LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L/opt/ssl/lib -L/usr/local/ssl/lib
|
|
|
|
ASTLINK=
|
|
|
|
endif
|
|
|
|
|
2007-06-29 20:33:35 +00:00
|
|
|
CHECK_SUBDIR: # do nothing, just make sure that we recurse in the subdir/
|
|
|
|
|
|
|
|
editline/libedit.a: CHECK_SUBDIR
|
2007-01-29 22:58:35 +00:00
|
|
|
cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(ASTCFLAGS:-Werror=)" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
|
2006-08-21 02:11:39 +00:00
|
|
|
$(MAKE) -C editline libedit.a
|
|
|
|
|
2007-06-29 20:33:35 +00:00
|
|
|
db1-ast/libdb1.a: CHECK_SUBDIR
|
2006-09-29 18:54:21 +00:00
|
|
|
CFLAGS="$(ASTCFLAGS)" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
|
2006-08-21 02:11:39 +00:00
|
|
|
|
|
|
|
ast_expr2.c ast_expr2.h:
|
|
|
|
bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
|
|
|
|
|
|
|
|
ast_expr2f.c:
|
|
|
|
flex -o $@ --full ast_expr2.fl
|
2007-10-23 20:44:58 +00:00
|
|
|
sed 's@free( (char \*) ptr );@if(ptr) free( (char *) ptr );@' ast_expr2f.c > zz
|
|
|
|
mv zz ast_expr2f.c
|
2006-08-21 02:11:39 +00:00
|
|
|
|
|
|
|
testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
|
|
|
|
$(CC) -g -c -Iinclude -DSTANDALONE ast_expr2f.c
|
|
|
|
$(CC) -g -c -Iinclude -DSTANDALONE ast_expr2.c
|
2007-07-02 21:50:15 +00:00
|
|
|
$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
|
2006-08-21 02:11:39 +00:00
|
|
|
rm ast_expr2.o ast_expr2f.o
|
|
|
|
|
2006-09-29 18:54:21 +00:00
|
|
|
channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
|
2006-08-21 02:11:39 +00:00
|
|
|
|
|
|
|
AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
|
|
|
|
AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
|
|
|
|
AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
|
|
|
|
OBJS:=$(sort $(OBJS))
|
|
|
|
|
2006-09-19 17:07:22 +00:00
|
|
|
ifneq ($(wildcard ../channels/h323/Makefile.ast),)
|
|
|
|
include ../channels/h323/Makefile.ast
|
|
|
|
else
|
|
|
|
H323LDFLAGS=
|
|
|
|
H323LDLIBS=
|
|
|
|
endif
|
|
|
|
|
2007-06-29 20:33:35 +00:00
|
|
|
minimime/libmmime.a: CHECK_SUBDIR
|
2007-04-06 21:16:38 +00:00
|
|
|
@cd minimime && $(MAKE) libmmime.a
|
|
|
|
|
2007-11-17 12:33:15 +00:00
|
|
|
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
|
|
|
|
MAIN_TGT:=asterisk.dll
|
|
|
|
asterisk: cygload
|
|
|
|
mv cygload.exe asterisk.exe
|
|
|
|
|
|
|
|
cygload: asterisk.dll
|
|
|
|
else
|
|
|
|
MAIN_TGT:=asterisk
|
|
|
|
endif
|
|
|
|
|
|
|
|
$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS)
|
2006-09-29 18:54:21 +00:00
|
|
|
@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
|
2006-08-21 02:11:39 +00:00
|
|
|
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
|
2007-08-29 15:59:10 +00:00
|
|
|
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
|
|
|
|
$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
|
|
|
|
else
|
2006-09-29 18:54:21 +00:00
|
|
|
$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
|
2007-08-29 15:59:10 +00:00
|
|
|
endif
|
2006-09-21 21:22:34 +00:00
|
|
|
@$(ASTTOPDIR)/build_tools/strip_nonapi $@
|
2006-08-21 02:11:39 +00:00
|
|
|
|
|
|
|
clean::
|
|
|
|
rm -f asterisk
|
2006-12-18 11:59:48 +00:00
|
|
|
rm -f db1-ast/.*.d
|
2007-02-07 20:09:58 +00:00
|
|
|
@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
|
2006-08-21 02:11:39 +00:00
|
|
|
@$(MAKE) -C db1-ast clean
|
|
|
|
@$(MAKE) -C stdtime clean
|
2007-04-06 21:16:38 +00:00
|
|
|
@$(MAKE) -C minimime clean
|