From b7b19b7195366dbacc4078b5b7a3fc6a3ad7889b Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Thu, 25 Nov 2021 13:45:54 +0100 Subject: [feat] expose snowflake in preferences it will be disabled if Tor not present, for now --- pkg/backend/api.go | 9 ++++++++- pkg/backend/status.go | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'pkg/backend') diff --git a/pkg/backend/api.go b/pkg/backend/api.go index d7dcbb3..6d5ceee 100644 --- a/pkg/backend/api.go +++ b/pkg/backend/api.go @@ -94,12 +94,19 @@ func SetTransport(label string) { } func SetUDP(udp bool) { - log.Println("DEBUG setting UDP") + log.Printf("DEBUG udp:%v\n", udp) ctx.cfg.SetUseUDP(udp) ctx.bm.UseUDP(udp) go trigger(OnStatusChanged) } +func SetSnowflake(snowflake bool) { + log.Printf("DEBUG snowflake:%v\n", snowflake) + ctx.cfg.SetUseSnowflake(snowflake) + ctx.bm.UseSnowflake(snowflake) + go trigger(OnStatusChanged) +} + func GetTransport() *C.char { return C.CString(ctx.bm.GetTransport()) } diff --git a/pkg/backend/status.go b/pkg/backend/status.go index 2ed5cfd..de6364f 100644 --- a/pkg/backend/status.go +++ b/pkg/backend/status.go @@ -8,6 +8,7 @@ import ( "0xacab.org/leap/bitmask-vpn/pkg/bitmask" "0xacab.org/leap/bitmask-vpn/pkg/config" + "0xacab.org/leap/bitmask-vpn/pkg/snowflake" ) const ( @@ -57,6 +58,8 @@ type connectionCtx struct { IsReady bool `json:"isReady"` CanUpgrade bool `json:"canUpgrade"` Motd string `json:"motd"` + HasTor bool `json:"hasTor"` + UseSnowflake bool `json:"snowflake"` bm bitmask.Bitmask autostart bitmask.Autostart cfg *config.Config @@ -73,11 +76,13 @@ func (c *connectionCtx) toJson() ([]byte, error) { c.CurrentCountry = c.bm.GetCurrentCountry() c.BestLocation = c.bm.GetBestLocation(transport) c.Transport = transport - c.UseUDP = c.cfg.UDP // TODO initialize bitmask too + c.UseUDP = c.cfg.UDP // TODO initialize bitmask param? c.OffersUDP = c.bm.OffersUDP() + c.UseSnowflake = c.cfg.Snowflake // TODO initialize bitmask param? c.ManualLocation = c.bm.IsManualLocation() c.CanUpgrade = c.bm.CanUpgrade() c.Motd = c.bm.GetMotd() + c.HasTor = snowflake.HasTor() } defer statusMutex.Unlock() b, err := json.Marshal(c) -- cgit v1.2.3