From b995c78c31a98e2f762d2a3006c27df14e9c5ede Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 18 Jan 2008 22:04:33 +0000 Subject: 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: https://origsvn.digium.com/svn/asterisk/trunk@99085 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/Makefile') 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 \ -- cgit v1.2.3