[asterisk-commits] http: leverage 'bindaddr' for TLS in http.conf (asterisk[13])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Jun 20 12:03:46 CDT 2016


Joshua Colp has submitted this change and it was merged.

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


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
---
M main/http.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mark Michelson: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/main/http.c b/main/http.c
index c343cb2..b2b35ff 100644
--- a/main/http.c
+++ b/main/http.c
@@ -2220,7 +2220,7 @@
 		 * 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

-- 
To view, visit https://gerrit.asterisk.org/3043
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5efb0409ae12044dfb3495b6b97b6d40a8c9c51f
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>



More information about the asterisk-commits mailing list