dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

re-bind the socket if the bindaddr option is changed during reload (issue #5435) 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6762 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2005-10-13 20:17:21 +00:00
parent 57ae02b3c2
commit 9ba261ff56
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_sip.c
View File

@ -851,7 +851,7 @@ static int __sip_do_register(struct sip_registry *r);
static int sipsock = -1;
static struct sockaddr_in bindaddr;
static struct sockaddr_in bindaddr = { 0, };
static struct sockaddr_in externip;
static char externhost[MAXHOSTNAMELEN] = "";
static time_t externexpire = 0;
@ -12079,12 +12079,11 @@ static int reload_config(void)
char *utype;
struct hostent *hp;
int format;
int oldport = ntohs(bindaddr.sin_port);
char iabuf[INET_ADDRSTRLEN];
struct ast_flags dummy;
int auto_sip_domains = 0;
struct sockaddr_in old_bindaddr = bindaddr;
cfg = ast_config_load(config);
/* We *must* have a config file otherwise stop immediately */
@ -12389,7 +12388,7 @@ static int reload_config(void)
bindaddr.sin_port = ntohs(DEFAULT_SIP_PORT);
bindaddr.sin_family = AF_INET;
ast_mutex_lock(&netlock);
if ((sipsock > -1) && (ntohs(bindaddr.sin_port) != oldport)) {
if ((sipsock > -1) && (memcmp(&old_bindaddr, &bindaddr, sizeof(struct sockaddr_in)))) {
close(sipsock);
sipsock = -1;
}
@ -12406,8 +12405,8 @@ static int reload_config(void)
if (bind(sipsock, (struct sockaddr *)&bindaddr, sizeof(bindaddr)) < 0) {
ast_log(LOG_WARNING, "Failed to bind to %s:%d: %s\n",
ast_inet_ntoa(iabuf, sizeof(iabuf), bindaddr.sin_addr), ntohs(bindaddr.sin_port),
strerror(errno));
ast_inet_ntoa(iabuf, sizeof(iabuf), bindaddr.sin_addr), ntohs(bindaddr.sin_port),
strerror(errno));
close(sipsock);
sipsock = -1;
} else {