]> git.ipfire.org Git - thirdparty/squid.git/commit - src/cf.data.pre
Reworked packet/connection marking (#170) M-staged-PR170
authorAlexander Gozman <goal81@gmail.com>
Fri, 13 Apr 2018 02:28:57 +0000 (02:28 +0000)
committerSquid Anubis <squid-anubis@squid-cache.org>
Fri, 13 Apr 2018 02:29:01 +0000 (02:29 +0000)
commit244da4ad90720f8ca2229c9adc2bbd3ce87a8e7e
tree60c63fb259834e5eb73cd3332a6ce7a70bc955d0
parent8253d451bad3c74742b0791fb2b874ca7c564e1b
Reworked packet/connection marking (#170)

The handling of packet and connection marks was odd: The clientside_mark
ACL worked with connection marks, but the directive of the same name
supported only packet marks. Also, clients packet MARK (if set)
overwrote CONNMARK and, as a result, broke ACL checking.

To minimize confusion, connection and packet marks are now separated:

    * renamed the clientside_mark ACL to client_connection_mark
    * renamed the clientside_mark directive to mark_client_packet
    * added a mark_client_connection directive

While the first two points just clarify things, the last one introduces
a new functionality: It allows to set or change clients CONNMARK.

Both clientside_mark ACL and directive are now deprecated.
18 files changed:
src/AclRegs.cc
src/ClientRequestContext.h
src/FwdState.cc
src/acl/Acl.cc
src/acl/ConnMark.cc
src/acl/ConnMark.h
src/cache_cf.cc
src/cf.data.pre
src/client_side_request.cc
src/comm/Connection.cc
src/comm/Connection.h
src/comm/TcpAcceptor.cc
src/fde.h
src/ip/Makefile.am
src/ip/NfMarkConfig.cc [new file with mode: 0644]
src/ip/NfMarkConfig.h [new file with mode: 0644]
src/ip/QosConfig.cc
src/ip/QosConfig.h