------------------------------------------------------------ revno: 13357 revision-id: chtsanti@users.sourceforge.net-20140416174017-yr8ez21l6nzthamz parent: chtsanti@users.sourceforge.net-20140414170118-3kj7mhn8ro1qkugf committer: Christos Tsantilas branch nick: trunk timestamp: Wed 2014-04-16 20:40:17 +0300 message: Encapsulated commonly reused ToS and NfMark code into GetMarkingsToServer(), par t2 Use the FwdState.h include file instead of redefining GetTosToServer and GetNfmarkToServer to each .cc file they are used. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chtsanti@users.sourceforge.net-20140416174017-\ # yr8ez21l6nzthamz # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: d1e0179834741a6d199188619e6e973d5a73b6bb # timestamp: 2014-04-16 17:53:48 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: chtsanti@users.sourceforge.net-20140414170118-\ # 3kj7mhn8ro1qkugf # # Begin patch === modified file 'src/tunnel.cc' --- src/tunnel.cc 2014-04-14 17:01:18 +0000 +++ src/tunnel.cc 2014-04-16 17:40:17 +0000 @@ -42,6 +42,7 @@ #include "comm/Write.h" #include "errorpage.h" #include "fde.h" +#include "FwdState.h" #include "http.h" #include "HttpRequest.h" #include "HttpStateFlags.h" @@ -829,9 +830,6 @@ commSetConnTimeout(conn, Config.Timeout.read, timeoutCall); } -tos_t GetTosToServer(HttpRequest * request); -nfmark_t GetNfmarkToServer(HttpRequest * request); - void tunnelStart(ClientHttpRequest * http, int64_t * size_ptr, int *status_ptr, const AccessLogEntryPointer &al) {