diff -Naur squid-2.5.STABLE12/src/cf.data.pre squid-2.5.STABLE12-zph/src/cf.data.pre --- squid-2.5.STABLE12/src/cf.data.pre 2005-10-20 17:28:08.000000000 +0000 +++ squid-2.5.STABLE12-zph/src/cf.data.pre 2005-12-03 21:06:39.731583000 +0000 @@ -2367,6 +2367,36 @@ to off when using this directive in such configurations. 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: tcp_outgoing_address TYPE: acl_address DEFAULT: none diff -Naur squid-2.5.STABLE12/src/client_side.c squid-2.5.STABLE12-zph/src/client_side.c --- squid-2.5.STABLE12/src/client_side.c 2005-10-18 15:22:26.000000000 +0000 +++ squid-2.5.STABLE12-zph/src/client_side.c 2005-12-03 21:06:39.743583750 +0000 @@ -2001,6 +2001,42 @@ return; } if (http->out.offset == 0) { + if (Config.zph_tos_local || Config.zph_tos_peer) { + int need_change = 0; + int hit = 0; + int tos = 0; + int tos_old = 0; + int tos_len = sizeof(tos_old); + + if (Config.zph_tos_local && isTcpHit(http->log_type)) { /* local hit */ + hit = 1; + tos = Config.zph_tos_local; + } else if (Config.zph_tos_peer && + (http->request->hier.code == SIBLING_HIT || /* sibling hit */ + (Config.onoff.zph_tos_parent && + http->request->hier.code == PARENT_HIT))) { /* parent hit */ + hit = 1; + tos = Config.zph_tos_peer; + } + if (http->request->flags.proxy_keepalive) { + if (getsockopt(fd, IPPROTO_IP, IP_TOS, &tos_old, &tos_len) < 0) { + debug(33, 1) ("ZPH: getsockopt(IP_TOS) on FD %d: %s\n", fd, xstrerror()); + } else if (hit && tos_old != tos) { /* HIT: 1-st request, or previous was MISS, */ + need_change = 1; /* or local/parent hit change */ + } else if (!hit && tos_old) { /* MISS: previous was HIT */ + tos = 0; + need_change = 1; + } + } else if (hit) { /* no keepalive */ + need_change = 1; + } + if (need_change) { + if (setsockopt(fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) { + debug(33, 1) ("ZPH: setsockopt(IP_TOS) on FD %d: %s\n", fd, xstrerror()); + } + } + } + rep = clientBuildReply(http, buf, size); if (rep) { aclCheck_t *ch; diff -Naur squid-2.5.STABLE12/src/structs.h squid-2.5.STABLE12-zph/src/structs.h --- squid-2.5.STABLE12/src/structs.h 2005-09-03 09:14:43.000000000 +0000 +++ squid-2.5.STABLE12-zph/src/structs.h 2005-12-03 21:09:31.654327500 +0000 @@ -612,6 +612,7 @@ int accel_uses_host_header; int accel_no_pmtu_disc; int global_internal_static; + int zph_tos_parent; } onoff; acl *aclList; struct { @@ -714,6 +715,8 @@ char *store_dir_select_algorithm; int sleep_after_fork; /* microseconds */ external_acl *externalAclHelperList; + int zph_tos_local; + int zph_tos_peer; }; struct _SquidConfig2 {