diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-18 22:04:33 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-18 22:04:33 +0000 |
| commit | d6e19bdc91b0c4c6b5a069e11898741ec082b289 (patch) | |
| tree | d0cb360114e418a612eb2025d270801a1388cd7f /main/Makefile | |
| parent | cc1fcc753900c912d856f3f0498a4f7bfd8344a6 (diff) | |
Merge changes from team/group/sip-tcptls
This set of changes introduces TCP and TLS support for chan_sip. There are various
new options in configs/sip.conf.sample that are used to enable these features. Also,
there is a document, doc/siptls.txt that describes some things in more detail.
This code was implemented by Brett Bryant and James Golovich. It was reviewed
by Joshua Colp and myself. A number of other people participated in the testing
of this code, but since it was done outside of the bug tracker, I do not have their
names. If you were one of them, thanks a lot for the help!
(closes issue #4903, but with completely different code that what exists there.)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@99085 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index 9389ee3f6..3504b547b 100644 --- a/main/Makefile +++ b/main/Makefile @@ -19,7 +19,7 @@ include $(ASTTOPDIR)/Makefile.moddir_rules RESAMPLE_OBJS:=libresample/src/resample.o libresample/src/resamplesubs.o libresample/src/filterkit.o -OBJS= io.o sched.o logger.o frame.o loader.o config.o channel.o \ +OBJS= tcptls.o 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 \ |