resolved conflicts for merge of 45d7b748 to klp-modular-dev-plus-aosp
Change-Id: I924e2c3c654501034dfa7429c0a54d0462fc1571
diff --git a/SecondaryTableController.cpp b/SecondaryTableController.cpp
index 5750b41..dba2880 100644
--- a/SecondaryTableController.cpp
+++ b/SecondaryTableController.cpp
@@ -26,6 +26,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <resolv_netid.h>
#define LOG_TAG "SecondaryTablController"
#include <cutils/log.h>
@@ -40,13 +41,8 @@
const char* SecondaryTableController::LOCAL_MANGLE_POSTROUTING = "st_mangle_POSTROUTING";
const char* SecondaryTableController::LOCAL_NAT_POSTROUTING = "st_nat_POSTROUTING";
-SecondaryTableController::SecondaryTableController(UidMarkMap *map) : mUidMarkMap(map) {
- int i;
- for (i=0; i < INTERFACES_TRACKED; i++) {
- mInterfaceTable[i][0] = 0;
- // TODO - use a hashtable or other prebuilt container class
- mInterfaceRuleCount[i] = 0;
- }
+SecondaryTableController::SecondaryTableController(NetworkController* controller) :
+ mNetCtrl(controller) {
}
SecondaryTableController::~SecondaryTableController() {
@@ -91,45 +87,20 @@
return res;
}
-int SecondaryTableController::findTableNumber(const char *iface) {
- int i;
- for (i = 0; i < INTERFACES_TRACKED; i++) {
- // compare through the final null, hence +1
- if (strncmp(iface, mInterfaceTable[i], IFNAMSIZ + 1) == 0) {
- return i;
- }
- }
- return -1;
-}
-
int SecondaryTableController::addRoute(SocketClient *cli, char *iface, char *dest, int prefix,
char *gateway) {
- int tableIndex = findTableNumber(iface);
- if (tableIndex == -1) {
- tableIndex = findTableNumber(""); // look for an empty slot
- if (tableIndex == -1) {
- ALOGE("Max number of NATed interfaces reached");
- errno = ENODEV;
- cli->sendMsg(ResponseCode::OperationFailed, "Max number NATed", true);
- return -1;
- }
- strncpy(mInterfaceTable[tableIndex], iface, IFNAMSIZ);
- // Ensure null termination even if truncation happened
- mInterfaceTable[tableIndex][IFNAMSIZ] = 0;
- }
-
- return modifyRoute(cli, ADD, iface, dest, prefix, gateway, tableIndex);
+ return modifyRoute(cli, ADD, iface, dest, prefix, gateway, mNetCtrl->getNetworkId(iface));
}
int SecondaryTableController::modifyRoute(SocketClient *cli, const char *action, char *iface,
- char *dest, int prefix, char *gateway, int tableIndex) {
+ char *dest, int prefix, char *gateway, unsigned netId) {
char dest_str[44]; // enough to store an IPv6 address + 3 character bitmask
char tableIndex_str[11];
int ret;
// IP tool doesn't like "::" - the equiv of 0.0.0.0 that it accepts for ipv4
snprintf(dest_str, sizeof(dest_str), "%s/%d", dest, prefix);
- snprintf(tableIndex_str, sizeof(tableIndex_str), "%d", tableIndex + BASE_TABLE_NUMBER);
+ snprintf(tableIndex_str, sizeof(tableIndex_str), "%u", netId + BASE_TABLE_NUMBER);
if (strcmp("::", gateway) == 0) {
const char *cmd[] = {
@@ -160,47 +131,32 @@
}
if (ret) {
- ALOGE("ip route %s failed: %s route %s %s/%d via %s dev %s table %d", action,
- IP_PATH, action, dest, prefix, gateway, iface, tableIndex+BASE_TABLE_NUMBER);
+ ALOGE("ip route %s failed: %s route %s %s/%d via %s dev %s table %u", action,
+ IP_PATH, action, dest, prefix, gateway, iface, netId + BASE_TABLE_NUMBER);
errno = ENODEV;
cli->sendMsg(ResponseCode::OperationFailed, "ip route modification failed", true);
return -1;
}
- if (strcmp(action, ADD) == 0) {
- mInterfaceRuleCount[tableIndex]++;
- } else {
- if (--mInterfaceRuleCount[tableIndex] < 1) {
- mInterfaceRuleCount[tableIndex] = 0;
- mInterfaceTable[tableIndex][0] = 0;
- }
- }
- modifyRuleCount(tableIndex, action);
+ modifyRuleCount(netId, action);
cli->sendMsg(ResponseCode::CommandOkay, "Route modified", false);
return 0;
}
-void SecondaryTableController::modifyRuleCount(int tableIndex, const char *action) {
+void SecondaryTableController::modifyRuleCount(unsigned netId, const char *action) {
if (strcmp(action, ADD) == 0) {
- mInterfaceRuleCount[tableIndex]++;
+ if (mNetIdRuleCount.count(netId) == 0)
+ mNetIdRuleCount[netId] = 0;
+ mNetIdRuleCount[netId]++;
} else {
- if (--mInterfaceRuleCount[tableIndex] < 1) {
- mInterfaceRuleCount[tableIndex] = 0;
- mInterfaceTable[tableIndex][0] = 0;
+ if (mNetIdRuleCount.count(netId) > 0) {
+ if (--mNetIdRuleCount[netId] < 1) {
+ mNetIdRuleCount.erase(mNetIdRuleCount.find(netId));
+ }
}
}
}
-int SecondaryTableController::verifyTableIndex(int tableIndex) {
- if ((tableIndex < 0) ||
- (tableIndex >= INTERFACES_TRACKED) ||
- (mInterfaceTable[tableIndex][0] == 0)) {
- return -1;
- } else {
- return 0;
- }
-}
-
const char *SecondaryTableController::getVersion(const char *addr) {
if (strchr(addr, ':') != NULL) {
return "-6";
@@ -219,27 +175,14 @@
int SecondaryTableController::removeRoute(SocketClient *cli, char *iface, char *dest, int prefix,
char *gateway) {
- int tableIndex = findTableNumber(iface);
- if (tableIndex == -1) {
- ALOGE("Interface not found");
- errno = ENODEV;
- cli->sendMsg(ResponseCode::OperationFailed, "Interface not found", true);
- return -1;
- }
-
- return modifyRoute(cli, DEL, iface, dest, prefix, gateway, tableIndex);
+ return modifyRoute(cli, DEL, iface, dest, prefix, gateway, mNetCtrl->getNetworkId(iface));
}
-int SecondaryTableController::modifyFromRule(int tableIndex, const char *action,
+int SecondaryTableController::modifyFromRule(unsigned netId, const char *action,
const char *addr) {
char tableIndex_str[11];
- if (verifyTableIndex(tableIndex)) {
- return -1;
- }
-
- snprintf(tableIndex_str, sizeof(tableIndex_str), "%d", tableIndex +
- BASE_TABLE_NUMBER);
+ snprintf(tableIndex_str, sizeof(tableIndex_str), "%u", netId + BASE_TABLE_NUMBER);
const char *cmd[] = {
IP_PATH,
getVersion(addr),
@@ -254,22 +197,16 @@
return -1;
}
- modifyRuleCount(tableIndex, action);
+ modifyRuleCount(netId, action);
return 0;
}
-int SecondaryTableController::modifyLocalRoute(int tableIndex, const char *action,
+int SecondaryTableController::modifyLocalRoute(unsigned netId, const char *action,
const char *iface, const char *addr) {
char tableIndex_str[11];
- if (verifyTableIndex(tableIndex)) {
- return -1;
- }
-
- modifyRuleCount(tableIndex, action); // some del's will fail as the iface is already gone.
-
- snprintf(tableIndex_str, sizeof(tableIndex_str), "%d", tableIndex +
- BASE_TABLE_NUMBER);
+ modifyRuleCount(netId, action); // some del's will fail as the iface is already gone.
+ snprintf(tableIndex_str, sizeof(tableIndex_str), "%u", netId + BASE_TABLE_NUMBER);
const char *cmd[] = {
IP_PATH,
"route",
@@ -292,29 +229,17 @@
}
int SecondaryTableController::setFwmarkRule(const char *iface, bool add) {
- int tableIndex = findTableNumber(iface);
- if (tableIndex == -1) {
- tableIndex = findTableNumber(""); // look for an empty slot
- if (tableIndex == -1) {
- ALOGE("Max number of NATed interfaces reached");
- errno = ENODEV;
- return -1;
- }
- strncpy(mInterfaceTable[tableIndex], iface, IFNAMSIZ);
- // Ensure null termination even if truncation happened
- mInterfaceTable[tableIndex][IFNAMSIZ] = 0;
- }
- int mark = tableIndex + BASE_TABLE_NUMBER;
- char mark_str[11];
- int ret;
+ unsigned netId = mNetCtrl->getNetworkId(iface);
- //fail fast if any rules already exist for this interface
- if (mUidMarkMap->anyRulesForMark(mark)) {
+ // Fail fast if any rules already exist for this interface
+ if (mNetIdRuleCount.count(netId) > 0) {
errno = EBUSY;
return -1;
}
- snprintf(mark_str, sizeof(mark_str), "%d", mark);
+ int ret;
+ char mark_str[11];
+ snprintf(mark_str, sizeof(mark_str), "%u", netId + BASE_TABLE_NUMBER);
// Flush any marked routes we added
if (!add) {
// iproute2 rule del will delete anything that matches, but only one rule at a time.
@@ -456,21 +381,16 @@
}
int SecondaryTableController::removeFwmarkRoute(const char* iface, const char *dest, int prefix) {
- return setFwmarkRoute(iface, dest, prefix, true);
+ return setFwmarkRoute(iface, dest, prefix, false);
}
int SecondaryTableController::setFwmarkRoute(const char* iface, const char *dest, int prefix,
bool add) {
- int tableIndex = findTableNumber(iface);
- if (tableIndex == -1) {
- errno = EINVAL;
- return -1;
- }
- int mark = tableIndex + BASE_TABLE_NUMBER;
+ unsigned netId = mNetCtrl->getNetworkId(iface);
char mark_str[11] = {0};
char dest_str[44]; // enough to store an IPv6 address + 3 character bitmask
- snprintf(mark_str, sizeof(mark_str), "%d", mark);
+ snprintf(mark_str, sizeof(mark_str), "%u", netId + BASE_TABLE_NUMBER);
snprintf(dest_str, sizeof(dest_str), "%s/%d", dest, prefix);
const char *rule_cmd[] = {
IP_PATH,
@@ -498,27 +418,16 @@
}
int SecondaryTableController::setUidRule(const char *iface, int uid_start, int uid_end, bool add) {
- int tableIndex = findTableNumber(iface);
- if (tableIndex == -1) {
+ unsigned netId = mNetCtrl->getNetworkId(iface);
+ if (!mNetCtrl->setNetworkForUidRange(uid_start, uid_end, add ? netId : 0, false)) {
errno = EINVAL;
return -1;
}
- int mark = tableIndex + BASE_TABLE_NUMBER;
- if (add) {
- if (!mUidMarkMap->add(uid_start, uid_end, mark)) {
- errno = EINVAL;
- return -1;
- }
- } else {
- if (!mUidMarkMap->remove(uid_start, uid_end, mark)) {
- errno = EINVAL;
- return -1;
- }
- }
+
char uid_str[24] = {0};
snprintf(uid_str, sizeof(uid_str), "%d-%d", uid_start, uid_end);
char mark_str[11] = {0};
- snprintf(mark_str, sizeof(mark_str), "%d", mark);
+ snprintf(mark_str, sizeof(mark_str), "%u", netId + BASE_TABLE_NUMBER);
return execIptables(V4V6,
"-t",
"mangle",
@@ -560,9 +469,10 @@
}
void SecondaryTableController::getUidMark(SocketClient *cli, int uid) {
- int mark = mUidMarkMap->getMark(uid);
+ unsigned netId = mNetCtrl->getNetwork(uid, NETID_UNSET, NetworkController::PID_UNSPECIFIED,
+ false);
char mark_str[11];
- snprintf(mark_str, sizeof(mark_str), "%d", mark);
+ snprintf(mark_str, sizeof(mark_str), "%u", netId + BASE_TABLE_NUMBER);
cli->sendMsg(ResponseCode::GetMarkResult, mark_str, false);
}