]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix tcp outgoing tos bugs part2
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Wed, 23 Jul 2014 13:28:05 +0000 (16:28 +0300)
committerChristos Tsantilas <chtsanti@users.sourceforge.net>
Wed, 23 Jul 2014 13:28:05 +0000 (16:28 +0300)
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

index 74c4bce38777596926faa1b366c05698db8ddf88..c55a552f98bd9fba5b19995eac9809b5674f0a2c 100644 (file)
@@ -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);