diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-02-02 18:55:05 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-02-02 18:55:05 +0000 |
| commit | 0f4489dc0f76b92d95592cc0b726cb98f781881e (patch) | |
| tree | 34f5a4cb79b7376abc97765dc09f019d2175031d /include/asterisk/manager.h | |
| parent | 516419697278a9d029825b17f55a25302bf3fc0d (diff) | |
Fix TLS port binding behavior as well as reload behavior:
* Removes references to tlsbindport from http.conf.sample and manager.conf.sample
* Properly bind to port specified in tlsbindaddr, using the default port if specified.
* On a reload, properly close socket if the service has been disabled.
A note has been added to UPGRADE.txt to indicate how ports must be set for TLS.
(closes issue ASTERISK-16959)
reported by Olaf Holthausen
(closes issue ASTERISK-19201)
reported by Chris Mylonas
(closes issue ASTERISK-19204)
reported by Chris Mylonas
Review: https://reviewboard.asterisk.org/r/1709
........
Merged revisions 353770 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 353820 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/manager.h')
| -rw-r--r-- | include/asterisk/manager.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index eaf48cecf..534e43f90 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -56,6 +56,7 @@ #define AMI_VERSION "1.2" #define DEFAULT_MANAGER_PORT 5038 /* Default port for Asterisk management via TCP */ +#define DEFAULT_MANAGER_TLS_PORT 5039 /* Default port for Asterisk management via TCP */ /*! \name Constant return values *\note Currently, returning anything other than zero causes the session to terminate. |