From 2d1bd0827f90cf890369d0e91a32db38db444844 Mon Sep 17 00:00:00 2001 From: Christos Tsantilas Date: Wed, 23 Jul 2014 16:28:05 +0300 Subject: [PATCH] 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 --- src/comm/ConnOpener.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 abortDialer; calls_.earlyAbort_ = JobCallback(5, 4, abortDialer, this, Comm::ConnOpener::earlyAbort); -- 2.47.3