nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2025-02-20 13:02:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

specify port iptables linux only

Browse Source
This commit is contained in:
sirjonasxx 2020-06-11 21:36:13 +02:00
parent 62a5f696dd
commit 7470fb4533
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/unix/LinuxRawIpProxyProvider.java
View File

@ -190,11 +190,11 @@ public class LinuxRawIpProxyProvider extends ProxyProvider {
protected void maybeAddMapping() {
ipMapper.enable();
ipMapper.addMapping(proxy.getActual_domain());
ipMapper.addMapping(proxy.getActual_domain(), proxy.getActual_port(), proxy.getIntercept_port());
}
protected void maybeRemoveMapping() {
ipMapper.deleteMapping(proxy.getActual_domain());
ipMapper.deleteMapping(proxy.getActual_domain(), proxy.getActual_port(), proxy.getIntercept_port());
}

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/windows/WindowsRawIpProxyProvider.java
View File

@ -48,7 +48,7 @@ public class WindowsRawIpProxyProvider extends LinuxRawIpProxyProvider {
hasMapped = true;
if (isNoneConnected()) {
ipMapper.enable();
ipMapper.addMapping(proxy.getActual_domain());
ipMapper.addMapping(proxy.getActual_domain(), proxy.getActual_port(), proxy.getIntercept_port());
}
addMappingCache();
}
@ -60,7 +60,7 @@ public class WindowsRawIpProxyProvider extends LinuxRawIpProxyProvider {
hasMapped = false;
removeMappingCache();
if (isNoneConnected()) {
ipMapper.deleteMapping(proxy.getActual_domain());
ipMapper.deleteMapping(proxy.getActual_domain(), proxy.getActual_port(), proxy.getIntercept_port());
}
}
}

4
G-Earth/src/main/java/gearth/protocol/hostreplacer/ipmapping/IpMapper.java
View File

@ -18,9 +18,9 @@ public abstract class IpMapper {
abstract public void enable();
abstract public void addMapping(String ip);
abstract public void addMapping(String ip, int listenport, int connectport);
abstract public void deleteMapping(String ip);
abstract public void deleteMapping(String ip, int listenport, int connectport);
abstract public List<String> getCurrentMappings();

10
G-Earth/src/main/java/gearth/protocol/hostreplacer/ipmapping/LinuxIpMapper.java
View File

@ -9,15 +9,17 @@ public class LinuxIpMapper extends IpMapper {
}
@Override
public void addMapping(String ip) {
public void addMapping(String ip, int listenport, int connectport) {
runCommand("iptables", "-t", "nat", "-A", "OUTPUT",
"-p", "all", "-d", ip, "-j", "DNAT", "--to-destination", "127.0.0.1");
"-p", "all", "-d", ip, "--dport", listenport+"", "-j", "DNAT",
"--to-destination", "127.0.0.1:"+connectport);
}
@Override
public void deleteMapping(String ip) {
public void deleteMapping(String ip, int listenport, int connectport) {
runCommand("iptables", "-t", "nat", "-D", "OUTPUT",
"-p", "all", "-d", ip, "-j", "DNAT", "--to-destination", "127.0.0.1");
"-p", "all", "-d", ip, "--dport", listenport+"", "-j", "DNAT",
"--to-destination", "127.0.0.1:"+connectport);
}
@Override

4
G-Earth/src/main/java/gearth/protocol/hostreplacer/ipmapping/MacIpMapper.java
View File

@ -10,12 +10,12 @@ public class MacIpMapper extends IpMapper {
}
@Override
public void addMapping(String ip) {
public void addMapping(String ip, int listenport, int connectport) {
runCommand("ifconfig", "lo0", "alias", ip);
}
@Override
public void deleteMapping(String ip) {
public void deleteMapping(String ip, int listenport, int connectport) {
runCommand("ifconfig", "lo0", "-alias", ip);
}

4
G-Earth/src/main/java/gearth/protocol/hostreplacer/ipmapping/WindowsIpMapper.java
View File

@ -12,12 +12,12 @@ public class WindowsIpMapper extends IpMapper {
}
@Override
public void addMapping(String ip) {
public void addMapping(String ip, int listenport, int connectport) {
runCommand("netsh", "interface", "ip", "add", "address", "\"Loopback\"", ip, "255.255.255.255");
}
@Override
public void deleteMapping(String ip) {
public void deleteMapping(String ip, int listenport, int connectport) {
runCommand("netsh", "interface", "ip", "delete", "address", "\"Loopback\"", ip);
}