From: hno <>
Date: Sat, 15 Feb 2003 06:11:36 +0000 (+0000)
Subject: Port merge comms accept fix (revision 1.620) to httpsAccept also.
X-Git-Tag: SQUID_3_0_PRE1~342
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15595aabc237e17fb0f454436bc3f71b5f8fdec3;p=thirdparty%2Fsquid.git

Port merge comms accept fix (revision 1.620) to httpsAccept also.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index f848f74984..cd94b47c34 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.620 2003/02/14 13:59:49 robertc Exp $
+ * $Id: client_side.cc,v 1.621 2003/02/14 23:11:36 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2316,7 +2316,7 @@ CBDATA_TYPE(https_port_data);
 
 /* handle a new HTTPS connection */
 static void
-httpsAccept(int sock, int newfd, struct sockaddr_in *me, struct sockaddr_in *peer,
+httpsAccept(int sock, int newfd, ConnectionDetail *details,
   comm_err_t flag, int xerrno, void *data)
 {
     int *N = &incoming_sockets_accepted;
@@ -2350,23 +2350,23 @@ httpsAccept(int sock, int newfd, struct sockaddr_in *me, struct sockaddr_in *pee
     fd_table[newfd].write_method = &ssl_write_method;
     debug(50, 5) ("httpsAccept: FD %d accepted, starting SSL negotiation.\n", newfd);
     
-    connState = connStateCreate(peer, me, newfd);
+    connState = connStateCreate(&details->peer, &details->me, newfd);
     /* XXX account connState->in.buf */
     comm_add_close_handler(newfd, connStateFree, connState);
     if (Config.onoff.log_fqdn)
-	fqdncache_gethostbyaddr(peer->sin_addr, FQDN_LOOKUP_IF_MISS);
+	fqdncache_gethostbyaddr(details->peer.sin_addr, FQDN_LOOKUP_IF_MISS);
     commSetTimeout(newfd, Config.Timeout.request, requestTimeout, connState);
 #if USE_IDENT
     ACLChecklist identChecklist;
-    identChecklist.src_addr = peer->sin_addr;
-    identChecklist.my_addr = me->sin_addr;
-    identChecklist.my_port = ntohs(me->sin_port);
+    identChecklist.src_addr = details->peer.sin_addr;
+    identChecklist.my_addr = details->me.sin_addr;
+    identChecklist.my_port = ntohs(details->me.sin_port);
     if (aclCheckFast(Config.accessList.identLookup, &identChecklist))
-	identStart(me, peer, clientIdentDone, connState);
+	identStart(&details->me, &details->peer, clientIdentDone, connState);
 #endif
     commSetSelect(newfd, COMM_SELECT_READ, clientNegotiateSSL, connState, 0);
     commSetDefer(newfd, clientReadDefer, connState);
-    clientdbEstablished(peer->sin_addr, 1);
+    clientdbEstablished(details->peer.sin_addr, 1);
     (*N)++;
 }