[svn-commits] twilson: branch 1.6.1 r169082 - in /branches/1.6.1: ./ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: twilson
Date: Fri Jan 16 19:59:37 2009
New Revision: 169082

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=169082
Log:
Merged revisions 169080 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r169080 | twilson | 2009-01-16 19:56:36 -0600 (Fri, 16 Jan 2009) | 8 lines
  
  Fix qualify for TCP peer
  
  (closes issue #14192)
  Reported by: pabelanger
  Patches: 
        asterisk-bug14192.diff.txt uploaded by jamesgolovich (license 176)
  Tested by: jamesgolovich
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/tcptls.h
    branches/1.6.1/main/http.c
    branches/1.6.1/main/tcptls.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/include/asterisk/tcptls.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/include/asterisk/tcptls.h?view=diff&rev=169082&r1=169081&r2=169082
==============================================================================
--- branches/1.6.1/include/asterisk/tcptls.h (original)
+++ branches/1.6.1/include/asterisk/tcptls.h Fri Jan 16 19:59:37 2009
@@ -114,7 +114,7 @@
  */
 struct ast_tcptls_session_args {
 	struct sockaddr_in local_address;
-	struct sockaddr_in old_local_address;
+	struct sockaddr_in old_address; /*!< copy of the local or remote address depending on if its a client or server session */
 	struct sockaddr_in remote_address;
 	char hostname[MAXHOSTNAMELEN]; /*!< only necessary for SSL clients so we can compare to common name */
 	struct ast_tls_config *tls_cfg; /*!< points to the SSL configuration if any */

Modified: branches/1.6.1/main/http.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/http.c?view=diff&rev=169082&r1=169081&r2=169082
==============================================================================
--- branches/1.6.1/main/http.c (original)
+++ branches/1.6.1/main/http.c Fri Jan 16 19:59:37 2009
@@ -257,13 +257,13 @@
 		       "<h2>&nbsp;&nbsp;Asterisk&trade; HTTP Status</h2></td></tr>\r\n");
 	ast_str_append(&out, 0, "<tr><td><i>Prefix</i></td><td><b>%s</b></td></tr>\r\n", prefix);
 	ast_str_append(&out, 0, "<tr><td><i>Bind Address</i></td><td><b>%s</b></td></tr>\r\n",
-		       ast_inet_ntoa(http_desc.old_local_address.sin_addr));
+		       ast_inet_ntoa(http_desc.old_address.sin_addr));
 	ast_str_append(&out, 0, "<tr><td><i>Bind Port</i></td><td><b>%d</b></td></tr>\r\n",
-		       ntohs(http_desc.old_local_address.sin_port));
+		       ntohs(http_desc.old_address.sin_port));
 
 	if (http_tls_cfg.enabled) {
 		ast_str_append(&out, 0, "<tr><td><i>SSL Bind Port</i></td><td><b>%d</b></td></tr>\r\n",
-			       ntohs(https_desc.old_local_address.sin_port));
+			       ntohs(https_desc.old_address.sin_port));
 	}
 
 	ast_str_append(&out, 0, "<tr><td colspan=\"2\"><hr></td></tr>\r\n");
@@ -973,16 +973,16 @@
 	}
 	ast_cli(a->fd, "HTTP Server Status:\n");
 	ast_cli(a->fd, "Prefix: %s\n", prefix);
-	if (!http_desc.old_local_address.sin_family) {
+	if (!http_desc.old_address.sin_family) {
 		ast_cli(a->fd, "Server Disabled\n\n");
 	} else {
 		ast_cli(a->fd, "Server Enabled and Bound to %s:%d\n\n",
-			ast_inet_ntoa(http_desc.old_local_address.sin_addr),
-			ntohs(http_desc.old_local_address.sin_port));
+			ast_inet_ntoa(http_desc.old_address.sin_addr),
+			ntohs(http_desc.old_address.sin_port));
 		if (http_tls_cfg.enabled) {
 			ast_cli(a->fd, "HTTPS Server Enabled and Bound to %s:%d\n\n",
-				ast_inet_ntoa(https_desc.old_local_address.sin_addr),
-				ntohs(https_desc.old_local_address.sin_port));
+				ast_inet_ntoa(https_desc.old_address.sin_addr),
+				ntohs(https_desc.old_address.sin_port));
 		}
 	}
 

Modified: branches/1.6.1/main/tcptls.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/tcptls.c?view=diff&rev=169082&r1=169081&r2=169082
==============================================================================
--- branches/1.6.1/main/tcptls.c (original)
+++ branches/1.6.1/main/tcptls.c Fri Jan 16 19:59:37 2009
@@ -334,12 +334,12 @@
 	struct ast_tcptls_session_instance *tcptls_session = NULL;
 
 	/* Do nothing if nothing has changed */
-	if(!memcmp(&desc->old_local_address, &desc->local_address, sizeof(desc->old_local_address))) {
+	if (!memcmp(&desc->old_address, &desc->remote_address, sizeof(desc->old_address))) {
 		ast_debug(1, "Nothing changed in %s\n", desc->name);
 		return NULL;
 	}
 
-	desc->old_local_address = desc->local_address;
+	desc->old_address = desc->remote_address;
 
 	if (desc->accept_fd != -1)
 		close(desc->accept_fd);
@@ -417,12 +417,12 @@
 	int x = 1;
 	
 	/* Do nothing if nothing has changed */
-	if (!memcmp(&desc->old_local_address, &desc->local_address, sizeof(desc->old_local_address))) {
+	if (!memcmp(&desc->old_address, &desc->local_address, sizeof(desc->old_address))) {
 		ast_debug(1, "Nothing changed in %s\n", desc->name);
 		return;
 	}
 	
-	desc->old_local_address = desc->local_address;
+	desc->old_address = desc->local_address;
 	
 	/* Shutdown a running server if there is one */
 	if (desc->master != AST_PTHREADT_NULL) {