Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

IO: Fix socket priority

Browse source 
On Linux, setting the ToS will also set the priority and the range of
accepted values is quite limited (masked by 0x1e). Therefore, 0xc0 is
translated to a priority of 0, not something we want, overriding the
"7" priority which was set previously explicitely. To avoid that, just
move setting priority later in the code.

Thanks to Vincent Bernat for the patch.
This commit is contained in:
Ondrej Zajicek (work) 2018-01-23 17:05:45 +01:00
parent 63472779ad
commit d6cf996151
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sysdep/unix/io.c
View file

@ -1238,10 +1238,6 @@ sk_setup(sock *s)
#endif #endif
} }
if (s->priority >= 0)
if (sk_set_priority(s, s->priority) < 0)
return -1;
if (sk_is_ipv4(s)) if (sk_is_ipv4(s))
{ {
if (s->flags & SKF_LADDR_RX) if (s->flags & SKF_LADDR_RX)
@ -1292,6 +1288,11 @@ sk_setup(sock *s)
return -1; return -1;
} }
/* Must be after sk_set_tos4() as setting ToS on Linux also mangles priority */
if (s->priority >= 0)
if (sk_set_priority(s, s->priority) < 0)
return -1;
return 0; return 0;
} }