summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot2017-05-16 21:26:00 -0500
committerAndroid (Google) Code Review2017-05-16 21:26:01 -0500
commit165dad791d05975d6c13155246e256a379181dcf (patch)
tree4465d9752b62e543f982afa23542206410bd14c6
parentfbe9427241623fa47d3d0113c089d0613f4ca5f5 (diff)
parent287776ddf47ec931880863a64e8d5094cb2b2dfa (diff)
downloadplatform-system-core-165dad791d05975d6c13155246e256a379181dcf.tar.gz
platform-system-core-165dad791d05975d6c13155246e256a379181dcf.tar.xz
platform-system-core-165dad791d05975d6c13155246e256a379181dcf.zip
Merge "Use SO_SNDBUFFORCE instead of SO_SNDBUF" into oc-dev
-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 }