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

Don't redirect dns to an iface without dns servers

Browse Source 
bug:10115444
Change-Id: Ide42072bb3aae21f8e99c11c2de263e9a765b911
This commit is contained in:
Robert Greenwalt
2013-09-24 11:05:57 -07:00
parent 11fa47227d
commit b87ab96295
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/java/com/android/server/ConnectivityService.java
View File

@@ -2794,7 +2794,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
mNumDnsEntries = last;
} catch (Exception e) {
if (DBG) loge("exception setting default dns interface: " + e);
loge("exception setting default dns interface: " + e);
}
}
@@ -3779,31 +3779,33 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
}
public void addUserForwarding(String interfaze, int uid) {
public void addUserForwarding(String interfaze, int uid, boolean forwardDns) {
int uidStart = uid * UserHandle.PER_USER_RANGE;
int uidEnd = uidStart + UserHandle.PER_USER_RANGE - 1;
addUidForwarding(interfaze, uidStart, uidEnd);
addUidForwarding(interfaze, uidStart, uidEnd, forwardDns);
}
public void clearUserForwarding(String interfaze, int uid) {
public void clearUserForwarding(String interfaze, int uid, boolean forwardDns) {
int uidStart = uid * UserHandle.PER_USER_RANGE;
int uidEnd = uidStart + UserHandle.PER_USER_RANGE - 1;
clearUidForwarding(interfaze, uidStart, uidEnd);
clearUidForwarding(interfaze, uidStart, uidEnd, forwardDns);
}
public void addUidForwarding(String interfaze, int uidStart, int uidEnd) {
public void addUidForwarding(String interfaze, int uidStart, int uidEnd,
boolean forwardDns) {
try {
mNetd.setUidRangeRoute(interfaze,uidStart, uidEnd);
mNetd.setDnsInterfaceForUidRange(interfaze, uidStart, uidEnd);
if (forwardDns) mNetd.setDnsInterfaceForUidRange(interfaze, uidStart, uidEnd);
} catch (RemoteException e) {
}
}
public void clearUidForwarding(String interfaze, int uidStart, int uidEnd) {
public void clearUidForwarding(String interfaze, int uidStart, int uidEnd,
boolean forwardDns) {
try {
mNetd.clearUidRangeRoute(interfaze, uidStart, uidEnd);
mNetd.clearDnsInterfaceForUidRange(uidStart, uidEnd);
if (forwardDns) mNetd.clearDnsInterfaceForUidRange(uidStart, uidEnd);
} catch (RemoteException e) {
}