This commit is contained in:
snltty
2025-07-25 10:47:19 +08:00
parent 790bb8b2d4
commit fc90a067e8
7 changed files with 9 additions and 19 deletions

View File

@@ -151,9 +151,6 @@ namespace linker.messenger.serializer.memorypack
[MemoryPackInclude]
string Name => info.Name;
[MemoryPackInclude]
Guid Guid => info.Guid;
[MemoryPackInclude]
List<TuntapLanInfo> Lans => info.Lans;
[MemoryPackInclude, MemoryPackAllowSerialize]
@@ -175,7 +172,7 @@ namespace linker.messenger.serializer.memorypack
TuntapSwitch Switch => info.Switch;
[MemoryPackConstructor]
SerializableTuntapInfo(string machineId, TuntapStatus status, IPAddress ip, byte prefixLength, string name, Guid guid,
SerializableTuntapInfo(string machineId, TuntapStatus status, IPAddress ip, byte prefixLength, string name,
List<TuntapLanInfo> lans, IPAddress wan, string setupError, string natError, string systemInfo, List<TuntapForwardInfo> forwards, TuntapSwitch Switch)
{
var info = new TuntapInfo
@@ -190,7 +187,6 @@ namespace linker.messenger.serializer.memorypack
SetupError = setupError,
PrefixLength = prefixLength,
Name = name,
Guid = guid,
Status = status,
Switch = Switch,
};
@@ -230,7 +226,6 @@ namespace linker.messenger.serializer.memorypack
}
[MemoryPackable]
public readonly partial struct SerializableTuntapForwardInfo
{

View File

@@ -86,7 +86,7 @@ namespace linker.messenger.tuntap
}
public sealed partial class TuntapInfo
public partial class TuntapInfo
{
/// <summary>
/// 设备id
@@ -109,10 +109,6 @@ namespace linker.messenger.tuntap
/// 网卡名
/// </summary>
public string Name { get; set; }
/// <summary>
/// id
/// </summary>
public Guid Guid { get; set; }
/// <summary>
/// 网卡安装错误
@@ -328,6 +324,7 @@ namespace linker.messenger.tuntap
public bool AppNat => (Switch & TuntapSwitch.AppNat) == TuntapSwitch.AppNat;
}
public sealed partial class TuntapForwardInfo
{
public IPAddress ListenAddr { get; set; } = IPAddress.Any;

View File

@@ -73,7 +73,7 @@ namespace linker.messenger.tuntap
Info.Name = info.Name;
Info.Switch = info.Switch;
Info.Forwards = info.Forwards;
info.Guid = Info.Guid;
tuntapStore.Confirm();
await LeaseIP().ConfigureAwait(false);

View File

@@ -72,7 +72,6 @@ namespace linker.messenger.tuntap
SetupError = tuntapTransfer.SetupError,
NatError = tuntapTransfer.NatError,
SystemInfo = systemInformation.Get(),
Guid = tuntapConfigTransfer.Info.Guid,
Forwards = tuntapConfigTransfer.Info.Forwards,
Switch = tuntapConfigTransfer.Info.Switch
});
@@ -123,7 +122,7 @@ namespace linker.messenger.tuntap
IEnumerable<string> availables = tuntapInfos.Values.Where(c => c.Available).Select(c => c.MachineId);
if (availables.Any())
{
List<string> offlines = await signInClientTransfer.GetOfflines(availables.ToList()).ConfigureAwait(false); ;
List<string> offlines = await signInClientTransfer.GetOfflines(availables.ToList()).ConfigureAwait(false);
if (offlines.Any())
{
foreach (var item in tuntapInfos.Values.Where(c => offlines.Contains(c.MachineId)))

View File

@@ -62,7 +62,6 @@ namespace linker.messenger.tuntap.messenger
TuntapInfo info = serializer.Deserialize<TuntapInfo>(connection.ReceiveRequestWrap.Payload.Span);
tuntapConfigTransfer.Update(info);
}
/// <summary>
/// 重新租赁
/// </summary>

View File

@@ -41,7 +41,7 @@ export default {
const ruleFormRef = ref(null);
const state = reactive({
showGuid:tuntap.value.current.systems.indexOf('windows') >= 0,
showGuid:false,//tuntap.value.current.systems.indexOf('windows') >= 0 && tuntap.value.current.device.isSelf,
ruleForm: {
IP: tuntap.value.current.IP,
PrefixLength: tuntap.value.current.PrefixLength || 24,
@@ -55,7 +55,7 @@ export default {
InterfaceOrder: tuntap.value.current.InterfaceOrder,
Forwards: tuntap.value.current.Forwards,
Name: tuntap.value.current.Name,
Guid: tuntap.value.current.Guid,
// Guid: tuntap.value.current.Guid,
},
rules: {
Name: {
@@ -92,7 +92,7 @@ export default {
json.TcpMerge = state.ruleForm.TcpMerge;
json.InterfaceOrder = state.ruleForm.InterfaceOrder;
json.Name = state.ruleForm.Name;
json.Guid = state.ruleForm.Guid;
// json.Guid = state.ruleForm.Guid;
return json;
}

View File

@@ -1,5 +1,5 @@
v1.8.9
2025-07-25 10:02:54
2025-07-25 10:47:19
1. 一些累计更新
2. 修复一些BUG过滤一些打洞成功的假象
3. 修复socks5