LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify netd updatable

Browse Source 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8987f33b3f3427683e5ae9b2931528f91d6f0aeb
This commit is contained in:
Maciej Żenczykowski
2022-08-14 14:36:20 +00:00
parent 655a024846
commit 4938d40501
3 changed files with 14 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
netd/NetdUpdatable.cpp
View File

@@ -16,19 +16,20 @@
#define LOG_TAG "NetdUpdatable"
#include "NetdUpdatable.h"
#include "BpfHandler.h"
#include <android-base/logging.h>
#include <netdutils/Status.h>
#include "NetdUpdatablePublic.h"
static android::net::BpfHandler sBpfHandler;
int libnetd_updatable_init(const char* cg2_path) {
android::base::InitLogging(/*argv=*/nullptr);
LOG(INFO) << __func__ << ": Initializing";
android::net::gNetdUpdatable = android::net::NetdUpdatable::getInstance();
android::netdutils::Status ret = android::net::gNetdUpdatable->mBpfHandler.init(cg2_path);
android::netdutils::Status ret = sBpfHandler.init(cg2_path);
if (!android::netdutils::isOk(ret)) {
LOG(ERROR) << __func__ << ": BPF handler init failed";
return -ret.code();
@@ -37,25 +38,9 @@ int libnetd_updatable_init(const char* cg2_path) {
}
int libnetd_updatable_tagSocket(int sockFd, uint32_t tag, uid_t chargeUid, uid_t realUid) {
if (android::net::gNetdUpdatable == nullptr) return -EPERM;
return android::net::gNetdUpdatable->mBpfHandler.tagSocket(sockFd, tag, chargeUid, realUid);
return sBpfHandler.tagSocket(sockFd, tag, chargeUid, realUid);
}
int libnetd_updatable_untagSocket(int sockFd) {
if (android::net::gNetdUpdatable == nullptr) return -EPERM;
return android::net::gNetdUpdatable->mBpfHandler.untagSocket(sockFd);
return sBpfHandler.untagSocket(sockFd);
}
namespace android {
namespace net {
NetdUpdatable* gNetdUpdatable = nullptr;
NetdUpdatable* NetdUpdatable::getInstance() {
// Instantiated on first use.
static NetdUpdatable instance;
return &instance;
}
} // namespace net
} // namespace android