1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
diff -ru squid-3.0.STABLE9.orig/src/cf.data.pre squid-3.0.STABLE9/src/cf.data.pre
--- squid-3.0.STABLE9.orig/src/cf.data.pre 2008-09-14 07:38:23.000000000 +0000
+++ squid-3.0.STABLE9/src/cf.data.pre 2008-09-14 07:44:46.000000000 +0000
@@ -1127,6 +1127,60 @@
making the request.
DOC_END
+NAME: zph_tos_local
+TYPE: int
+DEFAULT: 0
+LOC: Config.zph_tos_local
+DOC_START
+ Allows you to select a TOS/Diffserv value to mark local hits. Read above
+ (tcp_outgoing_tos) for details/requirements about TOS.
+ Default: 0 (disabled).
+DOC_END
+
+NAME: zph_tos_peer
+TYPE: int
+DEFAULT: 0
+LOC: Config.zph_tos_peer
+DOC_START
+ Allows you to select a TOS/Diffserv value to mark peer hits. Read above
+ (tcp_outgoing_tos) for details/requirements about TOS.
+ Default: 0 (disabled).
+DOC_END
+
+NAME: zph_tos_parent
+COMMENT: on|off
+TYPE: onoff
+LOC: Config.onoff.zph_tos_parent
+DEFAULT: on
+DOC_START
+ Set this to off if you want only sibling hits to be marked.
+ If set to on (default), parent hits are being marked too.
+DOC_END
+
+NAME: zph_preserve_miss_tos
+COMMENT: on|off
+TYPE: onoff
+LOC: Config.onoff.zph_preserve_miss_tos
+DEFAULT: on
+DOC_START
+ If set to on (default), any HTTP response towards clients will
+ have the TOS value of the response comming from the remote
+ server masked with the value of zph_preserve_miss_tos_mask.
+ For this to work correctly, you will need to patch your linux
+ kernel with the TOS preserving ZPH patch.
+DOC_END
+
+NAME: zph_preserve_miss_tos_mask
+TYPE: int
+DEFAULT: 255
+LOC: Config.zph_preserve_miss_tos_mask
+DOC_START
+ Allows you to mask certain bits in the TOS received from the
+ remote server, before copying the value to the TOS send towards
+ clients.
+ Default: 255 (TOS from server is not changed).
+DOC_END
+
NAME: tcp_outgoing_address
TYPE: acl_address
DEFAULT: none
diff -ru squid-3.0.STABLE9.orig/src/client_side_reply.cc squid-3.0.STABLE9/src/client_side_reply.cc
--- squid-3.0.STABLE9.orig/src/client_side_reply.cc 2008-09-09 16:06:44.000000000 +0000
+++ squid-3.0.STABLE9/src/client_side_reply.cc 2008-09-14 07:44:46.000000000 +0000
@@ -48,6 +48,7 @@
#include "ESI.h"
#endif
#include "MemObject.h"
+#include "fde.h"
#include "ACLChecklist.h"
#include "ACL.h"
#if DELAY_POOLS
@@ -1548,6 +1549,11 @@
/* guarantee nothing has been sent yet! */
assert(http->out.size == 0);
assert(http->out.offset == 0);
+ if (Config.zph_tos_local)
+ {
+ debugs(33, 1, "ZPH hit hier.code=" << http->request->hier.code <<" TOS="<<Config.zph_tos_local);
+ comm_set_tos(http->getConn()->fd,Config.zph_tos_local);
+ }
tempBuffer.offset = reqofs;
tempBuffer.length = getNextNode()->readBuffer.length;
tempBuffer.data = getNextNode()->readBuffer.data;
@@ -1827,6 +1833,24 @@
char *buf = next()->readBuffer.data;
char *body_buf = buf;
+
+ if (reqofs==0 && !logTypeIsATcpHit(http->logType))
+ {
+ int tos = 0;
+ if (Config.zph_tos_peer &&
+ (http->request->hier.code==SIBLING_HIT ||
+ Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT))
+ {
+ tos = Config.zph_tos_peer;
+ debugs(33, 1, "ZPH: Peer hit, TOS="<<tos<<" hier.code="<<http->request->hier.code);
+ }
+ else if (Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask)
+ {
+ tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
+ debugs(33, 1, "ZPH: Preserving TOS on miss, TOS="<<tos);
+ }
+ comm_set_tos(fd,tos);
+ }
if (buf != result.data) {
/* we've got to copy some data */
diff -ru squid-3.0.STABLE9.orig/src/fde.h squid-3.0.STABLE9/src/fde.h
--- squid-3.0.STABLE9.orig/src/fde.h 2008-09-09 16:06:44.000000000 +0000
+++ squid-3.0.STABLE9/src/fde.h 2008-09-14 07:44:46.000000000 +0000
@@ -106,7 +106,7 @@
long handle;
} win32;
#endif
-
+ unsigned char upstreamTOS; /* see FwdState::dispatch() */
};
#endif /* SQUID_FDE_H */
diff -ru squid-3.0.STABLE9.orig/src/forward.cc squid-3.0.STABLE9/src/forward.cc
--- squid-3.0.STABLE9.orig/src/forward.cc 2008-09-09 16:06:44.000000000 +0000
+++ squid-3.0.STABLE9/src/forward.cc 2008-09-14 07:44:46.000000000 +0000
@@ -964,6 +964,52 @@
netdbPingSite(request->host);
+ /* Retrieves remote server TOS value, and stores it as part of the
+ * original client request FD object. It is later used to forward
+ * remote server's TOS in the response to the client in case of a MISS.
+ */
+ fde * clientFde = &fd_table[client_fd];
+ if (clientFde)
+ {
+ int tos = 1;
+ int tos_len = sizeof(tos);
+ clientFde->upstreamTOS = 0;
+ if (setsockopt(server_fd,SOL_IP,IP_RECVTOS,&tos,tos_len)==0)
+ {
+ unsigned char buf[512];
+ int len = 512;
+ if (getsockopt(server_fd,SOL_IP,IP_PKTOPTIONS,buf,(socklen_t*)&len) == 0)
+ {
+ /* Parse the PKTOPTIONS structure to locate the TOS data message
+ * prepared in the kernel by the ZPH incoming TCP TOS preserving
+ * patch.
+ */
+ unsigned char * p = buf;
+ while (p-buf < len)
+ {
+ struct cmsghdr *o = (struct cmsghdr*)p;
+ if (o->cmsg_len<=0)
+ break;
+
+ if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS)
+ {
+ clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
+ break;
+ }
+ p += CMSG_LEN(o->cmsg_len);
+ }
+ }
+ else
+ {
+ debugs(33, 1, "ZPH: error in getsockopt(IP_PKTOPTIONS) on FD "<<server_fd<<" "<<xstrerror());
+ }
+ }
+ else
+ {
+ debugs(33, 1, "ZPH: error in setsockopt(IP_RECVTOS) on FD "<<server_fd<<" "<<xstrerror());
+ }
+ }
+
if (servers && (p = servers->_peer)) {
p->stats.fetches++;
request->peer_login = p->login;
diff -ru squid-3.0.STABLE9.orig/src/structs.h squid-3.0.STABLE9/src/structs.h
--- squid-3.0.STABLE9.orig/src/structs.h 2008-09-09 16:06:45.000000000 +0000
+++ squid-3.0.STABLE9/src/structs.h 2008-09-14 07:44:46.000000000 +0000
@@ -553,6 +553,8 @@
int emailErrData;
int httpd_suppress_version_string;
int global_internal_static;
+ int zph_tos_parent;
+ int zph_preserve_miss_tos;
int debug_override_X;
int WIN32_IpAddrChangeMonitor;
}
@@ -721,6 +723,9 @@
int sleep_after_fork; /* microseconds */
time_t minimum_expiry_time; /* seconds */
external_acl *externalAclHelperList;
+ int zph_tos_local;
+ int zph_tos_peer;
+ int zph_preserve_miss_tos_mask;
#if USE_SSL
struct
|
GitWeb