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.

diff --git a/src/tunnel.cc b/src/tunnel.cc
index c04a9498c72bafc2825a44edd3a04dde7a792dda..eebe9c5617a38856634c0cecd30f098c5d23e324 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -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 @@ tunnelConnectDone(const Comm::ConnectionPointer &conn, comm_err_t status, int xe
     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)
 {