From: Alexander Traud <pabstraud@compuserve.com>
Date: Mon, 20 Jun 2016 13:05:09 +0000 (+0200)
Subject: http: leverage 'bindaddr' for TLS in http.conf
X-Git-Tag: 11.23.0-rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F3042%2F1;p=thirdparty%2Fasterisk.git

http: leverage 'bindaddr' for TLS in http.conf

The internal HTTP/WebSocket server supports both TCP and TLS, which can be
activated separately via the file http.conf. The source code intends to re-use
the TCP parameter 'bindaddr' for TLS, even if 'tlsbindaddr' is not specified
explicitly. This did not work because of a typo. This change resolves this typo.

ASTERISK-26126 #close

Change-Id: I5efb0409ae12044dfb3495b6b97b6d40a8c9c51f
---

diff --git a/main/http.c b/main/http.c
index 5133dfa94a..c2bcbae49d 100644
--- a/main/http.c
+++ b/main/http.c
@@ -1195,7 +1195,7 @@ static int __ast_http_load(int reload)
 		 * the non-TLS bindaddress here.
 		 */
 		if (ast_sockaddr_isnull(&https_desc.local_address) && http_desc.accept_fd != -1) {
-			ast_sockaddr_copy(&https_desc.local_address, &https_desc.local_address);
+			ast_sockaddr_copy(&https_desc.local_address, &http_desc.local_address);
 			/* Of course, we can't use the same port though.
 			 * Since no bind address was specified, we just use the
 			 * default TLS port