Skip to content

Allow disabling SO_MARK and IP_TOS usage #7292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jvgutierrez merged 1 commit into from
Oct 26, 2020
Merged

Allow disabling SO_MARK and IP_TOS usage #7292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/admin-guide/files/records.config.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4273,6 +4273,8 @@ Sockets
SO_KEEPALIVE (2)
SO_LINGER (4) - with a timeout of 0 seconds
TCP_FASTOPEN (8)
PACKET_MARK (16)
PACKET_TOS (32)

.. note::

Expand Down Expand Up @@ -4305,6 +4307,8 @@ Sockets
SO_KEEPALIVE (2)
SO_LINGER (4) - with a timeout of 0 seconds
TCP_FASTOPEN (8)
PACKET_MARK (16)
PACKET_TOS (32)

.. note::

Expand Down
4 changes: 4 additions & 0 deletions iocore/net/I_NetVConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ struct NetVCOptions {
static uint32_t const SOCK_OPT_LINGER_ON = 4;
/// Value for TCP Fast open @c sockopt_flags
static uint32_t const SOCK_OPT_TCP_FAST_OPEN = 8;
/// Value for SO_MARK @c sockopt_flags
static uint32_t const SOCK_OPT_PACKET_MARK = 16;
/// Value for IP_TOS @c sockopt_flags
static uint32_t const SOCK_OPT_PACKET_TOS = 32;

uint32_t packet_mark;
uint32_t packet_tos;
Expand Down
18 changes: 11 additions & 7 deletions iocore/net/UnixConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,16 +414,20 @@ Connection::apply_options(NetVCOptions const &opt)
}

#if TS_HAS_SO_MARK
uint32_t mark = opt.packet_mark;
safe_setsockopt(fd, SOL_SOCKET, SO_MARK, reinterpret_cast<char *>(&mark), sizeof(uint32_t));
if (opt.sockopt_flags & NetVCOptions::SOCK_OPT_PACKET_MARK) {
uint32_t mark = opt.packet_mark;
safe_setsockopt(fd, SOL_SOCKET, SO_MARK, reinterpret_cast<char *>(&mark), sizeof(uint32_t));
}
#endif

#if TS_HAS_IP_TOS
uint32_t tos = opt.packet_tos;
if (addr.isIp4()) {
safe_setsockopt(fd, IPPROTO_IP, IP_TOS, reinterpret_cast<char *>(&tos), sizeof(uint32_t));
} else if (addr.isIp6()) {
safe_setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, reinterpret_cast<char *>(&tos), sizeof(uint32_t));
if (opt.sockopt_flags & NetVCOptions::SOCK_OPT_PACKET_TOS) {
uint32_t tos = opt.packet_tos;
if (addr.isIp4()) {
safe_setsockopt(fd, IPPROTO_IP, IP_TOS, reinterpret_cast<char *>(&tos), sizeof(uint32_t));
} else if (addr.isIp6()) {
safe_setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, reinterpret_cast<char *>(&tos), sizeof(uint32_t));
}
}
#endif
}