ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "socket: uevent: use SO_RCVBUF instead of SO_RCVBUFFORCE"

Browse source
This commit is contained in:
Treehugger Robot 2016-12-14 19:30:04 +00:00 • committed by Gerrit Code Review
commit 0a2080bced
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libcutils/uevent.c
View file

@ -116,7 +116,12 @@ int uevent_open_socket(int buf_sz, bool passcred)
if(s < 0) if(s < 0)
return -1; return -1;
setsockopt(s, SOL_SOCKET, SO_RCVBUFFORCE, &buf_sz, sizeof(buf_sz)); /* buf_sz should be less than net.core.rmem_max for this to succeed */
if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &buf_sz, sizeof(buf_sz)) < 0) {
close(s);
return -1;
}
setsockopt(s, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); setsockopt(s, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
if(bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { if(bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {

6
rootdir/init.rc
View file

@ -125,6 +125,12 @@ on init
write /proc/sys/kernel/sched_rt_runtime_us 950000 write /proc/sys/kernel/sched_rt_runtime_us 950000
write /proc/sys/kernel/sched_rt_period_us 1000000 write /proc/sys/kernel/sched_rt_period_us 1000000
# Assign reasonable ceiling values for socket rcv/snd buffers.
# These should almost always be overridden by the target per the
# the corresponding technology maximums.
write /proc/sys/net/core/rmem_max 262144
write /proc/sys/net/core/wmem_max 262144
# reflect fwmark from incoming packets onto generated replies # reflect fwmark from incoming packets onto generated replies
write /proc/sys/net/ipv4/fwmark_reflect 1 write /proc/sys/net/ipv4/fwmark_reflect 1
write /proc/sys/net/ipv6/fwmark_reflect 1 write /proc/sys/net/ipv6/fwmark_reflect 1