Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit df66d7d

Browse files
committedDec 25, 2017
remove useless code
1 parent ab2e3da commit df66d7d

File tree

2 files changed

+0
-87
lines changed

2 files changed

+0
-87
lines changed
 

‎shadowsocks-csharp/Controller/ProxySocket.cs

-80
Original file line numberDiff line numberDiff line change
@@ -272,27 +272,7 @@ public bool ConnectSocks5ProxyServer(string strRemoteHost, int iRemotePort, bool
272272
dataSock5Send.Add(0);
273273

274274
IPAddress ipAdd;
275-
//bool ForceRemoteDnsResolve = false;
276275
bool parsed = IPAddress.TryParse(strRemoteHost, out ipAdd);
277-
//if (!parsed && !ForceRemoteDnsResolve)
278-
//{
279-
// if (server.DnsTargetBuffer().isExpired(strRemoteHost))
280-
// {
281-
// try
282-
// {
283-
// IPHostEntry ipHostInfo = Dns.GetHostEntry(strRemoteHost);
284-
// ipAdd = ipHostInfo.AddressList[0];
285-
// server.DnsTargetBuffer().UpdateDns(strRemoteHost, ipAdd);
286-
// }
287-
// catch (Exception)
288-
// {
289-
// }
290-
// }
291-
// else
292-
// {
293-
// ipAdd = server.DnsTargetBuffer().ip;
294-
// }
295-
//}
296276
if (ipAdd == null)
297277
{
298278
dataSock5Send.Add(3); // remote DNS resolve
@@ -421,27 +401,7 @@ public bool ConnectHttpProxyServer(string strRemoteHost, int iRemotePort, string
421401
_proxy = true;
422402

423403
IPAddress ipAdd;
424-
//bool ForceRemoteDnsResolve = true;
425404
bool parsed = IPAddress.TryParse(strRemoteHost, out ipAdd);
426-
//if (!parsed && !ForceRemoteDnsResolve)
427-
//{
428-
// if (server.DnsTargetBuffer().isExpired(strRemoteHost))
429-
// {
430-
// try
431-
// {
432-
// IPHostEntry ipHostInfo = Dns.GetHostEntry(strRemoteHost);
433-
// ipAdd = ipHostInfo.AddressList[0];
434-
// server.DnsTargetBuffer().UpdateDns(strRemoteHost, ipAdd);
435-
// }
436-
// catch (Exception)
437-
// {
438-
// }
439-
// }
440-
// else
441-
// {
442-
// ipAdd = server.DnsTargetBuffer().ip;
443-
// }
444-
//}
445405
if (ipAdd != null)
446406
{
447407
strRemoteHost = ipAdd.ToString();
@@ -1146,27 +1106,7 @@ public bool ConnectSocks5ProxyServer(string strRemoteHost, int iRemotePort, bool
11461106
dataSock5Send.Add(0);
11471107

11481108
IPAddress ipAdd;
1149-
//bool ForceRemoteDnsResolve = false;
11501109
bool parsed = IPAddress.TryParse(strRemoteHost, out ipAdd);
1151-
//if (!parsed && !ForceRemoteDnsResolve)
1152-
//{
1153-
// if (server.DnsTargetBuffer().isExpired(strRemoteHost))
1154-
// {
1155-
// try
1156-
// {
1157-
// IPHostEntry ipHostInfo = Dns.GetHostEntry(strRemoteHost);
1158-
// ipAdd = ipHostInfo.AddressList[0];
1159-
// server.DnsTargetBuffer().UpdateDns(strRemoteHost, ipAdd);
1160-
// }
1161-
// catch (Exception)
1162-
// {
1163-
// }
1164-
// }
1165-
// else
1166-
// {
1167-
// ipAdd = server.DnsTargetBuffer().ip;
1168-
// }
1169-
//}
11701110
if (ipAdd == null)
11711111
{
11721112
dataSock5Send.Add(3); // remote DNS resolve
@@ -1295,27 +1235,7 @@ public bool ConnectHttpProxyServer(string strRemoteHost, int iRemotePort, string
12951235
_proxy = true;
12961236

12971237
IPAddress ipAdd;
1298-
//bool ForceRemoteDnsResolve = true;
12991238
bool parsed = IPAddress.TryParse(strRemoteHost, out ipAdd);
1300-
//if (!parsed && !ForceRemoteDnsResolve)
1301-
//{
1302-
// if (server.DnsTargetBuffer().isExpired(strRemoteHost))
1303-
// {
1304-
// try
1305-
// {
1306-
// IPHostEntry ipHostInfo = Dns.GetHostEntry(strRemoteHost);
1307-
// ipAdd = ipHostInfo.AddressList[0];
1308-
// server.DnsTargetBuffer().UpdateDns(strRemoteHost, ipAdd);
1309-
// }
1310-
// catch (Exception)
1311-
// {
1312-
// }
1313-
// }
1314-
// else
1315-
// {
1316-
// ipAdd = server.DnsTargetBuffer().ip;
1317-
// }
1318-
//}
13191239
if (ipAdd != null)
13201240
{
13211241
strRemoteHost = ipAdd.ToString();

‎shadowsocks-csharp/Model/Server.cs

-7
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ public class Server
121121
private object obfsdata;
122122
private ServerSpeedLog serverSpeedLog = new ServerSpeedLog();
123123
private DnsBuffer dnsBuffer = new DnsBuffer();
124-
private DnsBuffer dnsTargetBuffer = new DnsBuffer();
125124
private Connections Connections = new Connections();
126125
private static Server forwardServer = new Server();
127126

@@ -131,7 +130,6 @@ public void CopyServer(Server Server)
131130
obfsdata = Server.obfsdata;
132131
serverSpeedLog = Server.serverSpeedLog;
133132
dnsBuffer = Server.dnsBuffer;
134-
dnsTargetBuffer = Server.dnsTargetBuffer;
135133
Connections = Server.Connections;
136134
enable = Server.enable;
137135
}
@@ -162,11 +160,6 @@ public DnsBuffer DnsBuffer()
162160
return dnsBuffer;
163161
}
164162

165-
public DnsBuffer DnsTargetBuffer()
166-
{
167-
return dnsTargetBuffer;
168-
}
169-
170163
public ServerSpeedLog ServerSpeedLog()
171164
{
172165
return serverSpeedLog;

0 commit comments

Comments
 (0)
Please sign in to comment.