Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

featured: save bandwidth in config.json file

Browse Source
This commit is contained in:
kimw
2016-01-10 09:45:25 +08:00
parent bc3080701b
commit f9bd1c9150
4 changed files with 26 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/Model/Server.cs
+12 -13
View File
@@ -24,7 +24,7 @@ namespace Shadowsocks.Model
public override bool Equals(object obj)
{
Server o2 = (Server)obj;
return this.server == o2.server && this.server_port == o2.server_port;
return server == o2.server && server_port == o2.server_port;
}
public string FriendlyName()
@@ -45,12 +45,12 @@ namespace Shadowsocks.Model
public Server()
{
this.server = "";
this.server_port = 8388;
this.method = "aes-256-cfb";
this.password = "";
this.remarks = "";
this.auth = false;
server = "";
server_port = 8388;
method = "aes-256-cfb";
password = "";
remarks = "";
auth = false;
}
public Server(string ssURL) : this()
@@ -62,7 +62,7 @@ namespace Shadowsocks.Model
{
try
{
bytes = System.Convert.FromBase64String(base64);
bytes = Convert.FromBase64String(base64);
}
catch (FormatException)
{
@@ -80,16 +80,15 @@ namespace Shadowsocks.Model
string afterAt = data.Substring(indexLastAt + 1);
int indexLastColon = afterAt.LastIndexOf(':');
this.server_port = int.Parse(afterAt.Substring(indexLastColon + 1));
this.server = afterAt.Substring(0, indexLastColon);
server_port = int.Parse(afterAt.Substring(indexLastColon + 1));
server = afterAt.Substring(0, indexLastColon);
string beforeAt = data.Substring(0, indexLastAt);
string[] parts = beforeAt.Split(new[] { ':' });
this.method = parts[0];
this.password = parts[1];
method = parts[0];
password = parts[1];
//TODO: read one_time_auth
}
catch (IndexOutOfRangeException)
{