Move ResponseCode to libnetdutils
ResponseCode is necessary for libnetd_resolv, move it to libnetdutils
to ease the cleanup of the include path system/netd/server for
libnetd_resolv.
Bug: 128662167
Test: system/netd/tests/runtests.sh passed
Change-Id: Iae22cc6b4c642a190294fa4ce0ae406434e7ac3d
diff --git a/server/CommandListener.cpp b/server/CommandListener.cpp
index d0fc875..5819a93 100644
--- a/server/CommandListener.cpp
+++ b/server/CommandListener.cpp
@@ -33,6 +33,7 @@
#include <log/log.h>
#include <netd_resolv/params.h>
+#include <netdutils/ResponseCode.h>
#include <netdutils/Status.h>
#include <netdutils/StatusOr.h>
#include <netutils/ifc.h>
@@ -45,7 +46,6 @@
#include "IdletimerController.h"
#include "InterfaceController.h"
#include "NetdConstants.h"
-#include "ResponseCode.h"
#include "RouteController.h"
#include "UidRanges.h"
#include "netid_client.h"
@@ -54,8 +54,10 @@
#include <vector>
namespace android {
-namespace net {
+using netdutils::ResponseCode;
+
+namespace net {
namespace {
const unsigned NUM_OEM_IDS = NetworkController::MAX_OEM_ID - NetworkController::MIN_OEM_ID + 1;
diff --git a/server/MDnsSdListener.cpp b/server/MDnsSdListener.cpp
index 83726c3..44d4fd0 100644
--- a/server/MDnsSdListener.cpp
+++ b/server/MDnsSdListener.cpp
@@ -36,9 +36,9 @@
#include <cutils/properties.h>
#include <log/log.h>
+#include <netdutils/ResponseCode.h>
#include <sysutils/SocketClient.h>
-#include "ResponseCode.h"
#include "thread_util.h"
#define MDNS_SERVICE_NAME "mdnsd"
@@ -48,6 +48,8 @@
constexpr char RESCAN[] = "1";
+using android::netdutils::ResponseCode;
+
MDnsSdListener::MDnsSdListener() : FrameworkListener(SOCKET_NAME, true) {
Monitor *m = new Monitor();
registerCmd(new Handler(m, this));
diff --git a/server/NetlinkHandler.cpp b/server/NetlinkHandler.cpp
index 6e9a1e0..0354fca 100644
--- a/server/NetlinkHandler.cpp
+++ b/server/NetlinkHandler.cpp
@@ -31,7 +31,6 @@
#include "Controllers.h"
#include "NetlinkHandler.h"
#include "NetlinkManager.h"
-#include "ResponseCode.h"
#include "SockDiag.h"
#include <charconv>
diff --git a/server/ResponseCode.h b/server/ResponseCode.h
deleted file mode 100644
index b02fe29..0000000
--- a/server/ResponseCode.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef _RESPONSECODE_H
-#define _RESPONSECODE_H
-
-class ResponseCode {
- // Keep in sync with
- // frameworks/base/services/java/com/android/server/NetworkManagementService.java
-public:
- // 100 series - Requestion action was initiated; expect another reply
- // before proceeding with a new command.
- static const int ActionInitiated = 100;
- static const int InterfaceListResult = 110;
- static const int TetherInterfaceListResult = 111;
- static const int TetherDnsFwdTgtListResult = 112;
- static const int TtyListResult = 113;
- static const int TetheringStatsListResult = 114;
- static const int TetherDnsFwdNetIdResult = 115;
-
- // 200 series - Requested action has been successfully completed
- static const int CommandOkay = 200;
- static const int TetherStatusResult = 210;
- static const int IpFwdStatusResult = 211;
- static const int InterfaceGetCfgResult = 213;
- // Formerly: int SoftapStatusResult = 214;
- static const int UsbRNDISStatusResult = 215;
- static const int InterfaceRxCounterResult = 216;
- static const int InterfaceTxCounterResult = 217;
- static const int InterfaceRxThrottleResult = 218;
- static const int InterfaceTxThrottleResult = 219;
- static const int QuotaCounterResult = 220;
- static const int TetheringStatsResult = 221;
- // NOTE: keep synced with bionic/libc/dns/net/gethnamaddr.c
- static const int DnsProxyQueryResult = 222;
- static const int ClatdStatusResult = 223;
-
- // 400 series - The command was accepted but the requested action
- // did not take place.
- static const int OperationFailed = 400;
- static const int DnsProxyOperationFailed = 401;
- static const int ServiceStartFailed = 402;
- static const int ServiceStopFailed = 403;
-
- // 500 series - The command was not accepted and the requested
- // action did not take place.
- static const int CommandSyntaxError = 500;
- static const int CommandParameterError = 501;
-
- // 600 series - Unsolicited broadcasts
- static const int InterfaceChange = 600;
- static const int BandwidthControl = 601;
- static const int ServiceDiscoveryFailed = 602;
- static const int ServiceDiscoveryServiceAdded = 603;
- static const int ServiceDiscoveryServiceRemoved = 604;
- static const int ServiceRegistrationFailed = 605;
- static const int ServiceRegistrationSucceeded = 606;
- static const int ServiceResolveFailed = 607;
- static const int ServiceResolveSuccess = 608;
- static const int ServiceSetHostnameFailed = 609;
- static const int ServiceSetHostnameSuccess = 610;
- static const int ServiceGetAddrInfoFailed = 611;
- static const int ServiceGetAddrInfoSuccess = 612;
- static const int InterfaceClassActivity = 613;
- static const int InterfaceAddressChange = 614;
- static const int InterfaceDnsInfo = 615;
- static const int RouteChange = 616;
- static const int StrictCleartext = 617;
-};
-#endif
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index c684a1a..0c5b6bf 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -45,11 +45,10 @@
#include "Controllers.h"
#include "Fwmark.h"
-#include "NetdConstants.h"
-#include "Permission.h"
#include "InterfaceController.h"
+#include "NetdConstants.h"
#include "NetworkController.h"
-#include "ResponseCode.h"
+#include "Permission.h"
#include "TetherController.h"
namespace android {
diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp
index b7f6649..a57b492 100644
--- a/server/XfrmController.cpp
+++ b/server/XfrmController.cpp
@@ -59,7 +59,6 @@
#include "NetdConstants.h"
#include "NetlinkCommands.h"
#include "Permission.h"
-#include "ResponseCode.h"
#include "XfrmController.h"
#include "android-base/stringprintf.h"
#include "android-base/strings.h"