mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
add a new http.conf option, sslbindaddr.
Because https is more secure than http, it usually makes sense to keep this service more open than the one on the unencrypted port. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
13
main/http.c
13
main/http.c
@@ -824,6 +824,7 @@ static int __ast_http_load(int reload)
|
||||
struct hostent *hp;
|
||||
struct ast_hostent ahp;
|
||||
char newprefix[MAX_PREFIX];
|
||||
int have_sslbindaddr = 0;
|
||||
|
||||
/* default values */
|
||||
memset(&http_desc.sin, 0, sizeof(http_desc.sin));
|
||||
@@ -862,10 +863,16 @@ static int __ast_http_load(int reload)
|
||||
newenablestatic = ast_true(v->value);
|
||||
else if (!strcasecmp(v->name, "bindport"))
|
||||
http_desc.sin.sin_port = htons(atoi(v->value));
|
||||
else if (!strcasecmp(v->name, "bindaddr")) {
|
||||
else if (!strcasecmp(v->name, "sslbindaddr")) {
|
||||
if ((hp = ast_gethostbyname(v->value, &ahp))) {
|
||||
memcpy(&https_desc.sin.sin_addr, hp->h_addr, sizeof(https_desc.sin.sin_addr));
|
||||
have_sslbindaddr = 1;
|
||||
} else {
|
||||
ast_log(LOG_WARNING, "Invalid bind address '%s'\n", v->value);
|
||||
}
|
||||
} else if (!strcasecmp(v->name, "bindaddr")) {
|
||||
if ((hp = ast_gethostbyname(v->value, &ahp))) {
|
||||
memcpy(&http_desc.sin.sin_addr, hp->h_addr, sizeof(http_desc.sin.sin_addr));
|
||||
memcpy(&https_desc.sin.sin_addr, hp->h_addr, sizeof(https_desc.sin.sin_addr));
|
||||
} else {
|
||||
ast_log(LOG_WARNING, "Invalid bind address '%s'\n", v->value);
|
||||
}
|
||||
@@ -882,6 +889,8 @@ static int __ast_http_load(int reload)
|
||||
}
|
||||
ast_config_destroy(cfg);
|
||||
}
|
||||
if (!have_sslbindaddr)
|
||||
https_desc.sin.sin_addr = http_desc.sin.sin_addr;
|
||||
if (enabled)
|
||||
http_desc.sin.sin_family = https_desc.sin.sin_family = AF_INET;
|
||||
if (strcmp(prefix, newprefix))
|
||||
|
Reference in New Issue
Block a user