36801cccf2
Wire up new Disk and VolumeBase objects and events to start replacing older DirectVolume code. Use filesystem UUID as visible PublicVolume name to be more deterministic. When starting, create DiskSource instances based on fstab, and watch for kernel devices to appear. Turn matching devices into Disk objects, scan for partitions, and create any relevant VolumeBase objects. Broadcast all of these events towards userspace so the framework can decide what to mount. Keep track of the primary VolumeBase, and update the new per-user /storage/self/primary symlink for all started users. Provide a reset command that framework uses to start from a known state when runtime is restarted. When vold is unexpectedly killed, try recovering by unmounting everything under /mnt and /storage before moving forward. Remove UMS sharing support for now, since no current devices support it; MTP is the recommended solution going forward because it offers better multi-user support. Switch killProcessesWithOpenFiles() to directly take signal. Fix one SOCK_CLOEXEC bug, but SELinux says there are more lurking. Bug: 19993667 Change-Id: I2dad1303aa4667ec14c52f774e2a28b3c1c1ff6d
109 lines
2.6 KiB
C++
109 lines
2.6 KiB
C++
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
|
|
#include <sys/socket.h>
|
|
#include <sys/select.h>
|
|
#include <sys/time.h>
|
|
#include <sys/types.h>
|
|
#include <sys/un.h>
|
|
|
|
#include <linux/netlink.h>
|
|
|
|
#define LOG_TAG "Vold"
|
|
|
|
#include <cutils/log.h>
|
|
|
|
#include "NetlinkManager.h"
|
|
#include "NetlinkHandler.h"
|
|
|
|
NetlinkManager *NetlinkManager::sInstance = NULL;
|
|
|
|
NetlinkManager *NetlinkManager::Instance() {
|
|
if (!sInstance)
|
|
sInstance = new NetlinkManager();
|
|
return sInstance;
|
|
}
|
|
|
|
NetlinkManager::NetlinkManager() {
|
|
mBroadcaster = NULL;
|
|
}
|
|
|
|
NetlinkManager::~NetlinkManager() {
|
|
}
|
|
|
|
int NetlinkManager::start() {
|
|
struct sockaddr_nl nladdr;
|
|
int sz = 64 * 1024;
|
|
int on = 1;
|
|
|
|
memset(&nladdr, 0, sizeof(nladdr));
|
|
nladdr.nl_family = AF_NETLINK;
|
|
nladdr.nl_pid = getpid();
|
|
nladdr.nl_groups = 0xffffffff;
|
|
|
|
if ((mSock = socket(PF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC,
|
|
NETLINK_KOBJECT_UEVENT)) < 0) {
|
|
SLOGE("Unable to create uevent socket: %s", strerror(errno));
|
|
return -1;
|
|
}
|
|
|
|
if (setsockopt(mSock, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)) < 0) {
|
|
SLOGE("Unable to set uevent socket SO_RCVBUFFORCE option: %s", strerror(errno));
|
|
goto out;
|
|
}
|
|
|
|
if (setsockopt(mSock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) {
|
|
SLOGE("Unable to set uevent socket SO_PASSCRED option: %s", strerror(errno));
|
|
goto out;
|
|
}
|
|
|
|
if (bind(mSock, (struct sockaddr *) &nladdr, sizeof(nladdr)) < 0) {
|
|
SLOGE("Unable to bind uevent socket: %s", strerror(errno));
|
|
goto out;
|
|
}
|
|
|
|
mHandler = new NetlinkHandler(mSock);
|
|
if (mHandler->start()) {
|
|
SLOGE("Unable to start NetlinkHandler: %s", strerror(errno));
|
|
goto out;
|
|
}
|
|
|
|
return 0;
|
|
|
|
out:
|
|
close(mSock);
|
|
return -1;
|
|
}
|
|
|
|
int NetlinkManager::stop() {
|
|
int status = 0;
|
|
|
|
if (mHandler->stop()) {
|
|
SLOGE("Unable to stop NetlinkHandler: %s", strerror(errno));
|
|
status = -1;
|
|
}
|
|
delete mHandler;
|
|
mHandler = NULL;
|
|
|
|
close(mSock);
|
|
mSock = -1;
|
|
|
|
return status;
|
|
}
|