d6ea75ac97
Instead of logging and aborting from the BpfHandler::initPrograms(), return a Status object with an error message. The caller NetdUpdatable::libnetd_updatable_init() will log the message. Netd main() will exit and restart. Bug: 312094533 Test: m Change-Id: I6717da871a9a53357ac895709ea0094c089e7bbd
47 lines
1.4 KiB
C++
47 lines
1.4 KiB
C++
/*
|
|
* Copyright (C) 2022 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.
|
|
*/
|
|
|
|
#define LOG_TAG "NetdUpdatable"
|
|
|
|
#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::netdutils::Status ret = sBpfHandler.init(cg2_path);
|
|
if (!android::netdutils::isOk(ret)) {
|
|
LOG(ERROR) << __func__ << ": Failed. " << ret.code() << " " << ret.msg();
|
|
return -ret.code();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int libnetd_updatable_tagSocket(int sockFd, uint32_t tag, uid_t chargeUid, uid_t realUid) {
|
|
return sBpfHandler.tagSocket(sockFd, tag, chargeUid, realUid);
|
|
}
|
|
|
|
int libnetd_updatable_untagSocket(int sockFd) {
|
|
return sBpfHandler.untagSocket(sockFd);
|
|
}
|