diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2011-11-07 19:58:44 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2011-11-07 19:58:44 +0000 |
| commit | 00a522c0004341fb1e83b66606ff108611aa5040 (patch) | |
| tree | a445064d4b8ff2cdf04d9e502eda5178d0a6adc7 /main/udptl.c | |
| parent | 7a5f6684f05e03c51b5d004156dba9df2711dd50 (diff) | |
Correct the default udptl port range.
The udptl port range was defined as 4000-4999 in the udptl.conf.sample,
as 4500-4599 if you didn't have a config and 4500-4999 if your config
was broken. Default is now 4000-4999.
(closes issue ASTERISK-16250)
Reviewed by: Tilghman Lesher
Review: https://reviewboard.asterisk.org/r/1565
........
Merged revisions 343580 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@343581 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/udptl.c')
| -rw-r--r-- | main/udptl.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/main/udptl.c b/main/udptl.c index bac6c704e..3fc5b5b9e 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -79,8 +79,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define LOG_TAG(u) S_OR(u->tag, "no tag") -static int udptlstart = 4500; -static int udptlend = 4599; +#define DEFAULT_UDPTLSTART 4000 +#define DEFAULT_UDPTLEND 4999 + +static int udptlstart = DEFAULT_UDPTLSTART; +static int udptlend = DEFAULT_UDPTLEND; static int udptldebug; /*!< Are we debugging? */ static struct ast_sockaddr udptldebugaddr; /*!< Debug packets to/from this host */ #ifdef SO_NO_CHECK @@ -1315,8 +1318,8 @@ static void __ast_udptl_reload(int reload) return; } - udptlstart = 4500; - udptlend = 4999; + udptlstart = DEFAULT_UDPTLSTART; + udptlend = DEFAULT_UDPTLEND; udptlfecentries = 0; udptlfecspan = 0; use_even_ports = 0; @@ -1388,18 +1391,18 @@ static void __ast_udptl_reload(int reload) } ast_config_destroy(cfg); } - if (udptlstart >= udptlend) { - ast_log(LOG_WARNING, "Unreasonable values for UDPTL start/end ports; defaulting to 4500-4999.\n"); - udptlstart = 4500; - udptlend = 4999; - } if (use_even_ports && (udptlstart & 1)) { ++udptlstart; ast_log(LOG_NOTICE, "Odd numbered udptlstart specified but use_even_ports enabled. udptlstart is now %d\n", udptlstart); } + if (udptlstart > udptlend) { + ast_log(LOG_WARNING, "Unreasonable values for UDPTL start/end ports; defaulting to %d-%d.\n", DEFAULT_UDPTLSTART, DEFAULT_UDPTLEND); + udptlstart = DEFAULT_UDPTLSTART; + udptlend = DEFAULT_UDPTLEND; + } if (use_even_ports && (udptlend & 1)) { --udptlend; - ast_log(LOG_NOTICE, "Odd numbered udptlend specified but use_event_ports enabled. udptlend is now %d\n", udptlend); + ast_log(LOG_NOTICE, "Odd numbered udptlend specified but use_even_ports enabled. udptlend is now %d\n", udptlend); } ast_verb(2, "UDPTL allocating from port range %d -> %d\n", udptlstart, udptlend); } |