diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-01-18 22:04:33 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-01-18 22:04:33 +0000 |
| commit | b995c78c31a98e2f762d2a3006c27df14e9c5ede (patch) | |
| tree | d0cb360114e418a612eb2025d270801a1388cd7f /main/manager.c | |
| parent | 1807acb9b0a4bed6ec1ad8f7b713663bfccf5447 (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: https://origsvn.digium.com/svn/asterisk/trunk@99085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 8e87af713..c9e69eb5b 100644 --- a/main/manager.c +++ b/main/manager.c @@ -65,6 +65,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/md5.h" #include "asterisk/acl.h" #include "asterisk/utils.h" +#include "asterisk/tcptls.h" #include "asterisk/http.h" #include "asterisk/version.h" #include "asterisk/threadstorage.h" @@ -3425,7 +3426,7 @@ static void purge_old_stuff(void *data) purge_events(); } -struct tls_config ami_tls_cfg; +struct ast_tls_config ami_tls_cfg; static struct server_args ami_desc = { .accept_fd = -1, .master = AST_PTHREADT_NULL, |