diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-31 18:43:45 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-31 18:43:45 +0000 |
| commit | de7c25764c7068cfc2997720aaba31d8f3113be6 (patch) | |
| tree | 1567d2bc2c2d30c4b4944a1be5bb53fbca0df681 /channels | |
| parent | 9f975a210ca9ee3985164fd37905b97c6f9bb89a (diff) | |
Merged revisions 16744 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r16744 | russell | 2006-03-31 13:42:09 -0500 (Fri, 31 Mar 2006) | 2 lines
fix the situation where bindport is specified but bindaddr is not (issue #6616)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@16745 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 33c140630..8f90c81d8 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -9208,6 +9208,18 @@ static int set_config(char *config_file, int reload) /* ast_log(LOG_WARNING, "Ignoring %s\n", v->name); */ v = v->next; } + + if (defaultsockfd < 0) { + if (!(ns = ast_netsock_bind(netsock, io, "0.0.0.0", portno, tos, socket_read, NULL))) { + ast_log(LOG_ERROR, "Unable to create network socket: %s\n", strerror(errno)); + } else { + if (option_verbose > 1) + ast_verbose(VERBOSE_PREFIX_2 "Binding IAX2 to default address 0.0.0.0:%d\n", portno); + defaultsockfd = ast_netsock_sockfd(ns); + ast_netsock_unref(ns); + } + } + if (min_reg_expire > max_reg_expire) { ast_log(LOG_WARNING, "Minimum registration interval of %d is more than maximum of %d, resetting minimum to %d\n", min_reg_expire, max_reg_expire, max_reg_expire); @@ -9988,9 +10000,6 @@ int load_module(void) struct iax2_registry *reg; struct iax2_peer *peer; - struct ast_netsock *ns; - struct sockaddr_in sin; - ast_custom_function_register(&iaxpeer_function); iax_set_output(iax_debug_output); @@ -9999,10 +10008,6 @@ int load_module(void) jb_setoutput(jb_error_output, jb_warning_output, NULL); #endif - sin.sin_family = AF_INET; - sin.sin_port = htons(IAX_DEFAULT_PORTNO); - sin.sin_addr.s_addr = INADDR_ANY; - #ifdef IAX_TRUNKING #ifdef ZT_TIMERACK timingfd = open("/dev/zap/timer", O_RDWR); @@ -10055,19 +10060,7 @@ int load_module(void) if (ast_register_switch(&iax2_switch)) ast_log(LOG_ERROR, "Unable to register IAX switch\n"); - - if (defaultsockfd < 0) { - if (!(ns = ast_netsock_bindaddr(netsock, io, &sin, tos, socket_read, NULL))) { - ast_log(LOG_ERROR, "Unable to create network socket: %s\n", strerror(errno)); - return -1; - } else { - if (option_verbose > 1) - ast_verbose(VERBOSE_PREFIX_2 "Binding IAX2 to default address 0.0.0.0:%d\n", IAX_DEFAULT_PORTNO); - defaultsockfd = ast_netsock_sockfd(ns); - ast_netsock_unref(ns); - } - } - + res = start_network_thread(); if (!res) { if (option_verbose > 1) |