Repository: trafficserver Updated Branches: refs/heads/master b9cbffcb2 -> 5b29777eb
TS-3333: Remove duplicate code Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5b29777e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5b29777e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5b29777e Branch: refs/heads/master Commit: 5b29777eb13dab975529ece95f401edf6b5899b1 Parents: b9cbffc Author: Phil Sorber <[email protected]> Authored: Thu Jan 29 14:43:17 2015 -0700 Committer: Phil Sorber <[email protected]> Committed: Thu Jan 29 14:43:24 2015 -0700 ---------------------------------------------------------------------- iocore/net/UnixNetAccept.cc | 37 ++++++------------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5b29777e/iocore/net/UnixNetAccept.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixNetAccept.cc b/iocore/net/UnixNetAccept.cc index c133dfb..b396084 100644 --- a/iocore/net/UnixNetAccept.cc +++ b/iocore/net/UnixNetAccept.cc @@ -275,22 +275,6 @@ NetAccept::do_blocking_accept(EThread * t) return -1; } -#if TS_HAS_SO_MARK - if (packet_mark != 0) { - safe_setsockopt(con.fd, SOL_SOCKET, SO_MARK, reinterpret_cast<char *>(&packet_mark), sizeof(uint32_t)); - } -#endif - -#if TS_HAS_IP_TOS - if (packet_tos != 0) { - if (con.addr.isIp4()) { - safe_setsockopt(con.fd, IPPROTO_IP, IP_TOS, reinterpret_cast<char *>(&packet_tos), sizeof(uint32_t)); - } else if (con.addr.isIp6()) { - safe_setsockopt(con.fd, IPPROTO_IPV6, IPV6_TCLASS, reinterpret_cast<char *>(&packet_tos), sizeof(uint32_t)); - } - } -#endif - // Use 'NULL' to Bypass thread allocator vc = (UnixNetVConnection *)this->getNetProcessor()->allocate_vc(NULL); if (!vc) { @@ -298,6 +282,9 @@ NetAccept::do_blocking_accept(EThread * t) return -1; } vc->con = con; + vc->options.packet_mark = packet_mark; + vc->options.packet_tos = packet_tos; + vc->apply_options(); vc->from_accept_thread = true; vc->id = net_next_connection_number(); alloc_cache = NULL; @@ -416,21 +403,6 @@ NetAccept::acceptFastEvent(int event, void *ep) safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON, sizeof(int)); Debug("socket", "::acceptFastEvent: setsockopt() SO_KEEPALIVE on socket"); } -#if TS_HAS_SO_MARK - if (packet_mark != 0) { - safe_setsockopt(fd, SOL_SOCKET, SO_MARK, reinterpret_cast<char *>(&packet_mark), sizeof(uint32_t)); - } -#endif - -#if TS_HAS_IP_TOS - if (packet_tos != 0) { - if (con.addr.isIp4()) { - safe_setsockopt(con.fd, IPPROTO_IP, IP_TOS, reinterpret_cast<char *>(&packet_tos), sizeof(uint32_t)); - } else if (con.addr.isIp6()) { - safe_setsockopt(con.fd, IPPROTO_IPV6, IPV6_TCLASS, reinterpret_cast<char *>(&packet_tos), sizeof(uint32_t)); - } - } -#endif do { res = safe_nonblocking(fd); } while (res < 0 && (errno == EAGAIN || errno == EINTR)); @@ -443,6 +415,9 @@ NetAccept::acceptFastEvent(int event, void *ep) vc->con = con; + vc->options.packet_mark = packet_mark; + vc->options.packet_tos = packet_tos; + vc->apply_options(); } else { res = fd; }
