apps/linker
1
0
Fork 0
mirror of https://github.com/snltty/linker.git synced 2025-10-21 08:09:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

173

Browse Source
This commit is contained in:
snltty
2025-04-14 16:45:47 +08:00
parent fc16ced90a
commit 8bd6bde5a0
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/linker.messenger.store.file/FileConfig.cs
View File

@@ -111,12 +111,15 @@ namespace linker.messenger.store.file
string text = item.Value.PropertyMethod.Serialize(item.Value.Property.GetValue(Data)); string text = item.Value.PropertyMethod.Serialize(item.Value.Property.GetValue(Data));
if (dic != null && dic.TryGetValue(item.Value.Property.Name, out string base64)) if (dic != null && dic.TryGetValue(item.Value.Property.Name, out string base64))
{ {
string text2 = item.Value.PropertyMethod.Deserialize(Encoding.UTF8.GetString(Convert.FromBase64String(base64))).ToJson(); string text2 = Encoding.UTF8.GetString(Convert.FromBase64String(base64));
text = item.Value.PropertyMethod.Deserialize(text).ToJson(); text = item.Value.PropertyMethod.Deserialize(text).ToJson();
text = MergeJson(text, text2); text = MergeJson(text, text2);
text = item.Value.PropertyMethod.Serialize(item.Value.PropertyMethod.Deserialize(text)); object value = item.Value.PropertyMethod.Deserialize(text);
text = item.Value.PropertyMethod.Serialize(value);
item.Value.Property.SetValue(Data, value);
} }
File.WriteAllText($"{item.Value.Path}.temp", text, encoding: System.Text.Encoding.UTF8); File.WriteAllText($"{item.Value.Path}.temp", text, encoding: System.Text.Encoding.UTF8);
File.Move($"{item.Value.Path}.temp", item.Value.Path, true); File.Move($"{item.Value.Path}.temp", item.Value.Path, true);

2
src/linker.tun/LinkerTunDeviceAdapter.cs
View File

@@ -362,7 +362,7 @@ namespace linker.tun
{ {
uint realDist = BinaryPrimitives.ReverseEndianness(realNetwork | (fakeDist & ~masks[i])); uint realDist = BinaryPrimitives.ReverseEndianness(realNetwork | (fakeDist & ~masks[i]));
ReWriteIP(buffer, realDist, 16); ReWriteIP(buffer, realDist, 16);
natDic.AddOrUpdate(realDist, fakeDist, (a, b) => fakeDist); natDic.TryAdd(realDist, fakeDist);
break; break;
} }
} }

3
src/linker/Program.cs
View File

@@ -2,6 +2,9 @@
using System.ServiceProcess; using System.ServiceProcess;
using System.Diagnostics; using System.Diagnostics;
using linker.messenger.entry; using linker.messenger.entry;
using linker.libs.extends;
using System.Text;
using System.Text.Json;
namespace linker namespace linker
{ {

2
version.txt
View File

@@ -1,5 +1,5 @@
v1.7.3 v1.7.3
2025-04-14 16:27:58 2025-04-14 16:45:47
1. 优化自动分配IP 1. 优化自动分配IP
2. 优化网卡，排除不明数据包 2. 优化网卡，排除不明数据包
3. 虚拟网卡点对网IP映射，用于解决网段冲突 3. 虚拟网卡点对网IP映射，用于解决网段冲突