From a1e9379bca38b7e8c352ba286b5b68d15a43401e Mon Sep 17 00:00:00 2001 From: Eli Yukelzon Date: Thu, 30 Jan 2025 14:15:06 +0100 Subject: [PATCH] rebased, bumped kindling, used log writer --- common/httpclient.go | 2 ++ flashlight.go | 1 - go.mod | 2 +- go.sum | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/httpclient.go b/common/httpclient.go index 1e28599ed..22aadadf3 100644 --- a/common/httpclient.go +++ b/common/httpclient.go @@ -32,8 +32,10 @@ func GetHTTPClient() *http.Client { if httpClient != nil { return httpClient } + // Set the client to the kindling client. k := kindling.NewKindling( + kindling.WithLogWriter(log.AsStdLogger().Writer()), kindling.WithDomainFronting("https://media.githubusercontent.com/media/getlantern/fronted/refs/heads/main/fronted.yaml.gz", ""), kindling.WithProxyless(domains...), ) diff --git a/flashlight.go b/flashlight.go index 3b677c809..9181a6d25 100644 --- a/flashlight.go +++ b/flashlight.go @@ -120,7 +120,6 @@ func New( log.Debugf("Using configdir: %v", configDir) displayVersion(appVersion, revisionDate) common.InitVersion(appVersion) - proxied.InitFronted() deviceID := userConfig.GetDeviceID() log.Debugf("You can query for this device's activity under device id: %v", deviceID) fops.InitGlobalContext( diff --git a/go.mod b/go.mod index 3eb0bd4b6..ee90347df 100644 --- a/go.mod +++ b/go.mod @@ -185,7 +185,7 @@ require ( github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect github.com/getlantern/kcp-go/v5 v5.0.0-20220503142114-f0c1cd6e1b54 // indirect github.com/getlantern/keepcurrent v0.0.0-20240126172110-2e0264ca385d // indirect - github.com/getlantern/kindling v0.0.0-20250129184912-6fb98583d540 + github.com/getlantern/kindling v0.0.0-20250130123355-335942d6c759 github.com/getlantern/measured v0.0.0-20230919230611-3d9e3776a6cd // indirect github.com/getlantern/meta-scrubber v0.0.1 // indirect github.com/getlantern/packetforward v0.0.0-20201001150407-c68a447b0360 // indirect diff --git a/go.sum b/go.sum index 482a451ba..8f4e1018f 100644 --- a/go.sum +++ b/go.sum @@ -319,6 +319,8 @@ github.com/getlantern/keyman v0.0.0-20230503155501-4e864ca2175b h1:iyEuk8ARQC9Hf github.com/getlantern/keyman v0.0.0-20230503155501-4e864ca2175b/go.mod h1:ZJ+yDaZkJ/JU9j7EQa3UUh6ouedrNDDLA5OiowS1Iuk= github.com/getlantern/kindling v0.0.0-20250129184912-6fb98583d540 h1:dRWUDDGSUdWFGxYYbTIRLJlAAXjjf2LZ7IGMGTsaeJg= github.com/getlantern/kindling v0.0.0-20250129184912-6fb98583d540/go.mod h1:LHrgjBtlsAVHcEJmeJQVewCgtO1i8IepVinbbIiqAXM= +github.com/getlantern/kindling v0.0.0-20250130123355-335942d6c759 h1:iqS7g1z1vd5DcJnXXZom/a6oyfeQ+dphjXIjI44aY10= +github.com/getlantern/kindling v0.0.0-20250130123355-335942d6c759/go.mod h1:M2ipr7zWpp76yixs0CgAjJO39h0C/smHAFSIJ1nRe/0= github.com/getlantern/lampshade v0.0.0-20201109225444-b06082e15f3a h1:z7G1v79GB1qRrkcbzF0nrLzV/+dwdGmamEZAp0ff+z0= github.com/getlantern/lampshade v0.0.0-20201109225444-b06082e15f3a/go.mod h1:cGOfTjvllC9bcwS7cVW6tGT6fXc8Dki384uFjm7XBnw= github.com/getlantern/lantern-algeneva v0.0.0-20240930181006-6d3c00db1d5d h1:ACBwPR4du54Qw+X5ajsbMqOFR8euGZRdMGkvTDS7I60=