From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 23 Jul 2014 13:28:05 +0000 (+0300)
Subject: Fix tcp outgoing tos bugs part2
X-Git-Tag: SQUID_3_5_0_1~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d1bd0827f90cf890369d0e91a32db38db444844;p=thirdparty%2Fsquid.git

Fix tcp outgoing tos bugs part2

Fix for the patch r13505, "Fix tcp outgoing tos bugs":
 The Connection::fd member of a non openned connection used inside
Comm::ConnOpener::createFd member, causing crashes to squid
---

diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index 74c4bce387..c55a552f98 100644
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -271,8 +271,8 @@ Comm::ConnOpener::createFd()
         conn_->nfmark = 0;
 #endif
 
-    fd_table[conn_->fd].tosToServer = conn_->tos;
-    fd_table[conn_->fd].nfmarkToServer = conn_->nfmark;
+    fd_table[temporaryFd_].tosToServer = conn_->tos;
+    fd_table[temporaryFd_].nfmarkToServer = conn_->nfmark;
 
     typedef CommCbMemFunT<Comm::ConnOpener, CommCloseCbParams> abortDialer;
     calls_.earlyAbort_ = JobCallback(5, 4, abortDialer, this, Comm::ConnOpener::earlyAbort);