pangolin_mirror/gerbil
1
0
Fork 0
mirror of https://github.com/fosrl/gerbil.git synced 2026-02-07 21:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sni has no errors now

Browse Source
This commit is contained in:
Owen
2025-08-17 10:43:37 -07:00
parent c970fd5a18
commit efce3cb0b2
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.go
View File

@@ -314,7 +314,7 @@ func main() {
logger.Info("Local overrides configured: %v", localOverrides) logger.Info("Local overrides configured: %v", localOverrides)
} }
proxySNI, err = proxy.NewSNIProxy(sniProxyPort, remoteConfigURL, "david", localProxyAddr, localProxyPort, localOverrides) proxySNI, err = proxy.NewSNIProxy(sniProxyPort, remoteConfigURL, key.PublicKey().String(), localProxyAddr, localProxyPort, localOverrides)
if err != nil { if err != nil {
logger.Fatal("Failed to create proxy: %v", err) logger.Fatal("Failed to create proxy: %v", err)
} }

9
proxy/proxy.go
View File

@@ -28,7 +28,6 @@ type RouteRecord struct {
// RouteAPIResponse represents the response from the route API // RouteAPIResponse represents the response from the route API
type RouteAPIResponse struct { type RouteAPIResponse struct {
Endpoints []string `json:"endpoints"` Endpoints []string `json:"endpoints"`
Name string `json:"name"`
} }
// SNIProxy represents the main proxy server // SNIProxy represents the main proxy server
@@ -39,7 +38,6 @@ type SNIProxy struct {
ctx context.Context ctx context.Context
cancel context.CancelFunc cancel context.CancelFunc
wg sync.WaitGroup wg sync.WaitGroup
exitNodeName string
localProxyAddr string localProxyAddr string
localProxyPort int localProxyPort int
remoteConfigURL string remoteConfigURL string
@@ -76,7 +74,7 @@ func (conn readOnlyConn) SetReadDeadline(t time.Time) error { return nil }
func (conn readOnlyConn) SetWriteDeadline(t time.Time) error { return nil } func (conn readOnlyConn) SetWriteDeadline(t time.Time) error { return nil }
// NewSNIProxy creates a new SNI proxy instance // NewSNIProxy creates a new SNI proxy instance
func NewSNIProxy(port int, remoteConfigURL, publicKey, exitNodeName, localProxyAddr string, localProxyPort int, localOverrides []string) (*SNIProxy, error) { func NewSNIProxy(port int, remoteConfigURL, publicKey, localProxyAddr string, localProxyPort int, localOverrides []string) (*SNIProxy, error) {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
// Create local overrides map // Create local overrides map
@@ -92,7 +90,6 @@ func NewSNIProxy(port int, remoteConfigURL, publicKey, exitNodeName, localProxyA
cache: cache.New(3*time.Second, 10*time.Minute), cache: cache.New(3*time.Second, 10*time.Minute),
ctx: ctx, ctx: ctx,
cancel: cancel, cancel: cancel,
exitNodeName: exitNodeName,
localProxyAddr: localProxyAddr, localProxyAddr: localProxyAddr,
localProxyPort: localProxyPort, localProxyPort: localProxyPort,
remoteConfigURL: remoteConfigURL, remoteConfigURL: remoteConfigURL,
@@ -386,7 +383,6 @@ func (p *SNIProxy) getRoute(hostname, clientAddr string) (*RouteRecord, error) {
} }
endpoints := apiResponse.Endpoints endpoints := apiResponse.Endpoints
name := apiResponse.Name
// Default target configuration // Default target configuration
targetHost := p.localProxyAddr targetHost := p.localProxyAddr
@@ -395,9 +391,6 @@ func (p *SNIProxy) getRoute(hostname, clientAddr string) (*RouteRecord, error) {
// If no endpoints returned, use local node // If no endpoints returned, use local node
if len(endpoints) == 0 { if len(endpoints) == 0 {
logger.Debug("No endpoints returned for hostname: %s, using local node", hostname) logger.Debug("No endpoints returned for hostname: %s, using local node", hostname)
} else if name == p.exitNodeName {
// If the endpoint matches the current exit node, use the local proxy address
logger.Debug("Exit node name matches current node (%s), using local proxy", name)
} else { } else {
// Select endpoint using consistent hashing for stickiness // Select endpoint using consistent hashing for stickiness
selectedEndpoint := p.selectStickyEndpoint(clientAddr, endpoints) selectedEndpoint := p.selectStickyEndpoint(clientAddr, endpoints)