From 3e5407b4f4031ff3d2d20da26a29f2a92afc06eb Mon Sep 17 00:00:00 2001 From: Michael Angel <32914362+mike006322@users.noreply.github.com> Date: Fri, 28 Jun 2019 14:30:49 -0700 Subject: [PATCH 1/2] Instantiates PortHostService --- .../main/java/com/minhui/vpn/service/FirewallVpnService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpnadaptercore/src/main/java/com/minhui/vpn/service/FirewallVpnService.java b/vpnadaptercore/src/main/java/com/minhui/vpn/service/FirewallVpnService.java index e37cd46..8de1421 100644 --- a/vpnadaptercore/src/main/java/com/minhui/vpn/service/FirewallVpnService.java +++ b/vpnadaptercore/src/main/java/com/minhui/vpn/service/FirewallVpnService.java @@ -371,7 +371,7 @@ public void run() { udpServer = new UDPServer(this, udpQueue); udpServer.start(); NatSessionManager.clearAllSession(); - if(PortHostService.getInstance()!=null){ + if(PortHostService.getInstance()==null){ PortHostService.startParse(getApplicationContext()); } DebugLog.i("DnsProxy started.\n"); From 8fe03a2d8cd6a12595fbe09fb9b652af791fe7f8 Mon Sep 17 00:00:00 2001 From: Michael Angel <32914362+mike006322@users.noreply.github.com> Date: Fri, 28 Jun 2019 14:36:06 -0700 Subject: [PATCH 2/2] Discards header line from /proc/net/tcp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 丢弃/ proc / net /(tcp,tcp6,udp,...)中的标题行 --- .../main/java/com/minhui/vpn/processparse/NetFileManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/vpnadaptercore/src/main/java/com/minhui/vpn/processparse/NetFileManager.java b/vpnadaptercore/src/main/java/com/minhui/vpn/processparse/NetFileManager.java index e30982e..23f09a0 100755 --- a/vpnadaptercore/src/main/java/com/minhui/vpn/processparse/NetFileManager.java +++ b/vpnadaptercore/src/main/java/com/minhui/vpn/processparse/NetFileManager.java @@ -79,6 +79,7 @@ public void execute(String[] cmmand, String directory, int type) throws IOExcept s.useDelimiter("\n"); while (s.hasNextLine()) { sTmp = s.nextLine(); + if (sTmp.startsWith(" sl")) continue; netInfo = parseDataNew(sTmp); if (netInfo != null) { netInfo.setType(type);