summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaichi Hirono2017-05-17 05:38:32 -0500
committerandroid-build-merger2017-05-17 05:38:32 -0500
commitd6b71b91530f9b865eaf0f602f94f6f034a4d31c (patch)
tree8808225cee5e4fa1159bb79d6820c638e13ef7ac /libappfuse
parentc9c527f81f9e5cad429bdc74103c918aaf9c2a1b (diff)
parent165dad791d05975d6c13155246e256a379181dcf (diff)
downloadplatform-system-core-d6b71b91530f9b865eaf0f602f94f6f034a4d31c.tar.gz
platform-system-core-d6b71b91530f9b865eaf0f602f94f6f034a4d31c.tar.xz
platform-system-core-d6b71b91530f9b865eaf0f602f94f6f034a4d31c.zip
Merge "Use SO_SNDBUFFORCE instead of SO_SNDBUF" into oc-dev
am: 165dad791d Change-Id: I2da13af0ff1e4a50259847fd57695c3d616e59cc
Diffstat (limited to 'libappfuse')
-rw-r--r--libappfuse/FuseBuffer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libappfuse/FuseBuffer.cc b/libappfuse/FuseBuffer.cc
index b42a04954..fd69849a7 100644
--- a/libappfuse/FuseBuffer.cc
+++ b/libappfuse/FuseBuffer.cc
@@ -141,8 +141,8 @@ bool SetupMessageSockets(base::unique_fd (*result)[2]) {
141 } 141 }
142 142
143 constexpr int kMaxMessageSize = sizeof(FuseBuffer); 143 constexpr int kMaxMessageSize = sizeof(FuseBuffer);
144 if (setsockopt(fds[0], SOL_SOCKET, SO_SNDBUF, &kMaxMessageSize, sizeof(int)) != 0 || 144 if (setsockopt(fds[0], SOL_SOCKET, SO_SNDBUFFORCE, &kMaxMessageSize, sizeof(int)) != 0 ||
145 setsockopt(fds[1], SOL_SOCKET, SO_SNDBUF, &kMaxMessageSize, sizeof(int)) != 0) { 145 setsockopt(fds[1], SOL_SOCKET, SO_SNDBUFFORCE, &kMaxMessageSize, sizeof(int)) != 0) {
146 PLOG(ERROR) << "Failed to update buffer size for socket"; 146 PLOG(ERROR) << "Failed to update buffer size for socket";
147 return false; 147 return false;
148 } 148 }