SagerNet/sing-tun
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-tun.git synced 2025-04-04 20:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace hard-code "sing-box" to TunnelType (#1)

Browse source
This commit is contained in:
wwqgtxx 2022-10-05 16:59:45 +08:00 • committed by GitHub
parent aca9485369
commit d673376e57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tun_windows.go
View file

@ -177,7 +177,7 @@ func (t *NativeTun) configure() error {
subLayer := winsys.FWPM_SUBLAYER0{} subLayer := winsys.FWPM_SUBLAYER0{}
subLayer.SubLayerKey = subLayerKey subLayer.SubLayerKey = subLayerKey
subLayer.DisplayData = winsys.CreateDisplayData("sing-box", "auto-route rules") subLayer.DisplayData = winsys.CreateDisplayData(TunnelType, "auto-route rules")
subLayer.Weight = math.MaxUint16 subLayer.Weight = math.MaxUint16
err = winsys.FwpmSubLayerAdd0(engine, &subLayer, 0) err = winsys.FwpmSubLayerAdd0(engine, &subLayer, 0)
if err != nil { if err != nil {
@ -200,7 +200,7 @@ func (t *NativeTun) configure() error {
permitFilter4 := winsys.FWPM_FILTER0{} permitFilter4 := winsys.FWPM_FILTER0{}
permitFilter4.FilterCondition = &permitCondition[0] permitFilter4.FilterCondition = &permitCondition[0]
permitFilter4.NumFilterConditions = 1 permitFilter4.NumFilterConditions = 1
permitFilter4.DisplayData = winsys.CreateDisplayData("sing-box", "protect ipv4") permitFilter4.DisplayData = winsys.CreateDisplayData(TunnelType, "protect ipv4")
permitFilter4.SubLayerKey = subLayerKey permitFilter4.SubLayerKey = subLayerKey
permitFilter4.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V4 permitFilter4.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V4
permitFilter4.Action.Type = winsys.FWP_ACTION_PERMIT permitFilter4.Action.Type = winsys.FWP_ACTION_PERMIT
@ -215,7 +215,7 @@ func (t *NativeTun) configure() error {
permitFilter6 := winsys.FWPM_FILTER0{} permitFilter6 := winsys.FWPM_FILTER0{}
permitFilter6.FilterCondition = &permitCondition[0] permitFilter6.FilterCondition = &permitCondition[0]
permitFilter6.NumFilterConditions = 1 permitFilter6.NumFilterConditions = 1
permitFilter6.DisplayData = winsys.CreateDisplayData("sing-box", "protect ipv6") permitFilter6.DisplayData = winsys.CreateDisplayData(TunnelType, "protect ipv6")
permitFilter6.SubLayerKey = subLayerKey permitFilter6.SubLayerKey = subLayerKey
permitFilter6.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V6 permitFilter6.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V6
permitFilter6.Action.Type = winsys.FWP_ACTION_PERMIT permitFilter6.Action.Type = winsys.FWP_ACTION_PERMIT
@ -229,7 +229,7 @@ func (t *NativeTun) configure() error {
if len(t.options.Inet4Address) == 0 { if len(t.options.Inet4Address) == 0 {
blockFilter := winsys.FWPM_FILTER0{} blockFilter := winsys.FWPM_FILTER0{}
blockFilter.DisplayData = winsys.CreateDisplayData("sing-box", "block ipv4") blockFilter.DisplayData = winsys.CreateDisplayData(TunnelType, "block ipv4")
blockFilter.SubLayerKey = subLayerKey blockFilter.SubLayerKey = subLayerKey
blockFilter.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V4 blockFilter.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V4
blockFilter.Action.Type = winsys.FWP_ACTION_BLOCK blockFilter.Action.Type = winsys.FWP_ACTION_BLOCK
@ -243,7 +243,7 @@ func (t *NativeTun) configure() error {
if len(t.options.Inet6Address) == 0 { if len(t.options.Inet6Address) == 0 {
blockFilter := winsys.FWPM_FILTER0{} blockFilter := winsys.FWPM_FILTER0{}
blockFilter.DisplayData = winsys.CreateDisplayData("sing-box", "block ipv6") blockFilter.DisplayData = winsys.CreateDisplayData(TunnelType, "block ipv6")
blockFilter.SubLayerKey = subLayerKey blockFilter.SubLayerKey = subLayerKey
blockFilter.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V6 blockFilter.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V6
blockFilter.Action.Type = winsys.FWP_ACTION_BLOCK blockFilter.Action.Type = winsys.FWP_ACTION_BLOCK
@ -270,7 +270,7 @@ func (t *NativeTun) configure() error {
tunFilter4 := winsys.FWPM_FILTER0{} tunFilter4 := winsys.FWPM_FILTER0{}
tunFilter4.FilterCondition = &tunCondition[0] tunFilter4.FilterCondition = &tunCondition[0]
tunFilter4.NumFilterConditions = 1 tunFilter4.NumFilterConditions = 1
tunFilter4.DisplayData = winsys.CreateDisplayData("sing-box", "allow ipv4") tunFilter4.DisplayData = winsys.CreateDisplayData(TunnelType, "allow ipv4")
tunFilter4.SubLayerKey = subLayerKey tunFilter4.SubLayerKey = subLayerKey
tunFilter4.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V4 tunFilter4.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V4
tunFilter4.Action.Type = winsys.FWP_ACTION_PERMIT tunFilter4.Action.Type = winsys.FWP_ACTION_PERMIT
@ -286,7 +286,7 @@ func (t *NativeTun) configure() error {
tunFilter6 := winsys.FWPM_FILTER0{} tunFilter6 := winsys.FWPM_FILTER0{}
tunFilter6.FilterCondition = &tunCondition[0] tunFilter6.FilterCondition = &tunCondition[0]
tunFilter6.NumFilterConditions = 1 tunFilter6.NumFilterConditions = 1
tunFilter6.DisplayData = winsys.CreateDisplayData("sing-box", "allow ipv6") tunFilter6.DisplayData = winsys.CreateDisplayData(TunnelType, "allow ipv6")
tunFilter6.SubLayerKey = subLayerKey tunFilter6.SubLayerKey = subLayerKey
tunFilter6.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V6 tunFilter6.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V6
tunFilter6.Action.Type = winsys.FWP_ACTION_PERMIT tunFilter6.Action.Type = winsys.FWP_ACTION_PERMIT
@ -311,7 +311,7 @@ func (t *NativeTun) configure() error {
blockDNSFilter4 := winsys.FWPM_FILTER0{} blockDNSFilter4 := winsys.FWPM_FILTER0{}
blockDNSFilter4.FilterCondition = &blockDNSCondition[0] blockDNSFilter4.FilterCondition = &blockDNSCondition[0]
blockDNSFilter4.NumFilterConditions = 2 blockDNSFilter4.NumFilterConditions = 2
blockDNSFilter4.DisplayData = winsys.CreateDisplayData("sing-box", "block ipv4 dns") blockDNSFilter4.DisplayData = winsys.CreateDisplayData(TunnelType, "block ipv4 dns")
blockDNSFilter4.SubLayerKey = subLayerKey blockDNSFilter4.SubLayerKey = subLayerKey
blockDNSFilter4.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V4 blockDNSFilter4.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V4
blockDNSFilter4.Action.Type = winsys.FWP_ACTION_BLOCK blockDNSFilter4.Action.Type = winsys.FWP_ACTION_BLOCK
@ -325,7 +325,7 @@ func (t *NativeTun) configure() error {
blockDNSFilter6 := winsys.FWPM_FILTER0{} blockDNSFilter6 := winsys.FWPM_FILTER0{}
blockDNSFilter6.FilterCondition = &blockDNSCondition[0] blockDNSFilter6.FilterCondition = &blockDNSCondition[0]
blockDNSFilter6.NumFilterConditions = 2 blockDNSFilter6.NumFilterConditions = 2
blockDNSFilter6.DisplayData = winsys.CreateDisplayData("sing-box", "block ipv6 dns") blockDNSFilter6.DisplayData = winsys.CreateDisplayData(TunnelType, "block ipv6 dns")
blockDNSFilter6.SubLayerKey = subLayerKey blockDNSFilter6.SubLayerKey = subLayerKey
blockDNSFilter6.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V6 blockDNSFilter6.LayerKey = winsys.FWPM_LAYER_ALE_AUTH_CONNECT_V6
blockDNSFilter6.Action.Type = winsys.FWP_ACTION_BLOCK blockDNSFilter6.Action.Type = winsys.FWP_ACTION_BLOCK