RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14878 from tchaikov/wip-19801

Browse Source 
msg/simple: use my addr when setting sock priority

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
This commit is contained in:
Kefu Chai 2017-05-01 00:37:41 +08:00 committed by GitHub
commit 45d03d8b55
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/msg/async/net_handler.cc
View File

@ -132,25 +132,24 @@ void NetHandler::set_priority(int sd, int prio, int domain)
#ifdef IPTOS_CLASS_CS6
int iptos = IPTOS_CLASS_CS6;
int r = -1;
if (domain == AF_INET) {
switch (domain) {
case AF_INET:
r = ::setsockopt(sd, IPPROTO_IP, IP_TOS, &iptos, sizeof(iptos));
if (r < 0) {
r = errno;
ldout(cct,0) << "couldn't set IP_TOS to " << iptos
<< ": " << cpp_strerror(r) << dendl;
}
} else if (domain == AF_INET6) {
break;
case AF_INET6:
r = ::setsockopt(sd, IPPROTO_IPV6, IPV6_TCLASS, &iptos, sizeof(iptos));
if (r < 0) {
r = errno;
ldout(cct,0) << "couldn't set IPV6_TCLASS to " << iptos
<< ": " << cpp_strerror(r) << dendl;
}
} else {
break;
default:
lderr(cct) << "couldn't set ToS of unknown family (" << domain << ")"
<< " to " << iptos << dendl;
return;
}
if (r < 0) {
r = errno;
ldout(cct,0) << "couldn't set TOS to " << iptos
<< ": " << cpp_strerror(r) << dendl;
}
#endif // IPTOS_CLASS_CS6
// setsockopt(IPTOS_CLASS_CS6) sets the priority of the socket as 0.
// See http://goo.gl/QWhvsD and http://goo.gl/laTbjT

36
src/msg/simple/Pipe.cc
View File

@ -923,25 +923,29 @@ void Pipe::set_socket_options()
int r = -1;
#ifdef IPTOS_CLASS_CS6
int iptos = IPTOS_CLASS_CS6;
if (peer_addr.get_family() == AF_INET) {
r = ::setsockopt(sd, IPPROTO_IP, IP_TOS, &iptos, sizeof(iptos));
if (r < 0) {
r = -errno;
ldout(msgr->cct,0) << "couldn't set IP_TOS to " << iptos
<< ": " << cpp_strerror(r) << dendl;
}
} else if (peer_addr.get_family() == AF_INET6) {
r = ::setsockopt(sd, IPPROTO_IPV6, IPV6_TCLASS, &iptos, sizeof(iptos));
if (r < 0) {
r = -errno;
ldout(msgr->cct,0) << "couldn't set IPV6_TCLASS to " << iptos
<< ": " << cpp_strerror(r) << dendl;
}
int addr_family = 0;
if (!peer_addr.is_blank_ip()) {
addr_family = peer_addr.get_family();
} else {
addr_family = msgr->get_myaddr().get_family();
}
switch (addr_family) {
case AF_INET:
r = ::setsockopt(sd, IPPROTO_IP, IP_TOS, &iptos, sizeof(iptos));
break;
case AF_INET6:
r = ::setsockopt(sd, IPPROTO_IPV6, IPV6_TCLASS, &iptos, sizeof(iptos));
break;
default:
lderr(msgr->cct) << "couldn't set ToS of unknown family ("
<< peer_addr.get_family() << ")"
<< addr_family << ")"
<< " to " << iptos << dendl;
return;
}
if (r < 0) {
r = -errno;
ldout(msgr->cct,0) << "couldn't set TOS to " << iptos
<< ": " << cpp_strerror(r) << dendl;
}
#endif
// setsockopt(IPTOS_CLASS_CS6) sets the priority of the socket as 0.