Commit d78ac14e authored by Administrator's avatar Administrator

port mapping

parent aa691ba3
...@@ -2,9 +2,11 @@ package com.virjar.g4proxy.server.client; ...@@ -2,9 +2,11 @@ package com.virjar.g4proxy.server.client;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.google.common.collect.Lists;
import com.virjar.g4proxy.protocol.Constant; import com.virjar.g4proxy.protocol.Constant;
import com.virjar.g4proxy.server.AvailablePortResManager; import com.virjar.g4proxy.server.AvailablePortResManager;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
...@@ -28,6 +30,18 @@ public class ClientManager { ...@@ -28,6 +30,18 @@ public class ClientManager {
// this.userMappingBootstrap = userMappingBootstrap; // this.userMappingBootstrap = userMappingBootstrap;
} }
public List<String> portMapping() {
List<String> ret = Lists.newArrayList();
for (NatClientImage natClientImage : natClientImageMap.values()) {
if (!natClientImage.getUserMappingServerChannel().isActive()) {
continue;
}
int mappingPort = natClientImage.getMappingPort();
ret.add(String.valueOf(mappingPort));
}
return ret;
}
public boolean registerNewClient(String client, Channel natChannel) { public boolean registerNewClient(String client, Channel natChannel) {
NatClientImage natClientImage = natClientImageMap.get(client); NatClientImage natClientImage = natClientImageMap.get(client);
Integer mappingPort = null; Integer mappingPort = null;
......
...@@ -16,8 +16,7 @@ public class AvailablePortController { ...@@ -16,8 +16,7 @@ public class AvailablePortController {
@GetMapping("portList") @GetMapping("portList")
public String availablePortMapping() { public String availablePortMapping() {
return StringUtils.join(ProxyInstanceHolder.g4ProxyServer.getClientManager().portMapping(), "\r\n");
return StringUtils.join(ProxyInstanceHolder.g4ProxyServer.getClientManager().getClientPortBiMap().values(), "\r\n");
} }
@GetMapping("deviceMapping") @GetMapping("deviceMapping")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment