Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add algeneva address flags #609

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Add algeneva address flags #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec916b7
add algeneva addr flags
garmr-ulfr Mar 29, 2024
889495b
update lantern-algeneva
garmr-ulfr Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require (
github.com/getlantern/kcpwrapper v0.0.0-20230327091313-c12d7c17c6de
github.com/getlantern/keyman v0.0.0-20230503155501-4e864ca2175b
github.com/getlantern/lampshade v0.0.0-20200303040944-fe53f13203e9
github.com/getlantern/lantern-algeneva v0.0.0-20240318182342-277382911c6a
github.com/getlantern/lantern-algeneva v0.0.0-20240402195540-eb1bbf6d7366
github.com/getlantern/measured v0.0.0-20230919230611-3d9e3776a6cd
github.com/getlantern/memhelper v0.0.0-20220104170102-df557102babd
github.com/getlantern/mockconn v0.0.0-20200818071412-cb30d065a848
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,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/lampshade v0.0.0-20200303040944-fe53f13203e9 h1:n2t63QvweEs53Kpy7QbXv6JRSfXpDTTgPMT4cNTOt8g=
github.com/getlantern/lampshade v0.0.0-20200303040944-fe53f13203e9/go.mod h1:Zqiq4op+E689yjuJACMLURzE9XUGj48UDZP7h8aN+kk=
github.com/getlantern/lantern-algeneva v0.0.0-20240318182342-277382911c6a h1:ezjOkAFyWGdo6R01bH4CxWTwyQ6gfD2z93y45Xzx0t4=
github.com/getlantern/lantern-algeneva v0.0.0-20240318182342-277382911c6a/go.mod h1:Mr7d8aaA90O5exvnO21x5ZXL5gDeWuLSpAzdljXTe88=
github.com/getlantern/lantern-algeneva v0.0.0-20240402195540-eb1bbf6d7366 h1:jk1kkecLlmJGCNXCZOk0dpjusULXmHaSiI+ptyHxL9M=
github.com/getlantern/lantern-algeneva v0.0.0-20240402195540-eb1bbf6d7366/go.mod h1:bNnBc1YoooeKURbR6TMgNTuBA5ZjD28TSvZjbPUomVI=
github.com/getlantern/lantern-shadowsocks v1.3.6-0.20230301223223-150b18ac427d h1:YwH3hgY1qtp1J1V8iBx58wB+mAY6L7N1s+qYqNJgDjM=
github.com/getlantern/lantern-shadowsocks v1.3.6-0.20230301223223-150b18ac427d/go.mod h1:Wwa1uDdu6LxVRANcN2dQ+aNI0rY+km+dqHW2G9Qm34k=
github.com/getlantern/measured v0.0.0-20230919230611-3d9e3776a6cd h1:pDfqh9yd58OW9vQzv4U+q6G+LfbNXVhbWcBWmC5Dkm4=
Expand Down
3 changes: 3 additions & 0 deletions http-proxy/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ var (

broflakeAddr = flag.String("broflake-addr", "", "Address at which to listen for broflake connections.")

algenevaAddr = flag.String("algeneva-addr", "", "Address at which to listen for algenAddr connections.")

track = flag.String("track", "", "The track this proxy is running on")
)

Expand Down Expand Up @@ -464,6 +466,7 @@ func main() {
BroflakeAddr: *broflakeAddr,
BroflakeCert: os.Getenv("BROFLAKE_CERT"),
BroflakeKey: os.Getenv("BROFLAKE_KEY"),
AlgenevaAddr: *algenevaAddr,
}
if *maxmindLicenseKey != "" {
log.Debug("Will use Maxmind for geolocating clients")
Expand Down
2 changes: 2 additions & 0 deletions http_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,8 @@ func (p *Proxy) buildOTELOpts(endpoint string, includeProxyName bool) *otel.Opts
opts.Addr = p.HTTPAddr
} else if p.BroflakeAddr != "" {
opts.Addr = p.BroflakeAddr
} else if p.AlgenevaAddr != "" {
opts.Addr = p.AlgenevaAddr
}
if includeProxyName {
opts.ProxyName = proxyName
Expand Down
Loading