moare fixes

This commit is contained in:
Quentin McGaw
2026-06-05 15:52:51 +00:00
parent 8da913d7c6
commit e2256dd1b2
2 changed files with 6 additions and 3 deletions
+5 -2
View File
@@ -23,7 +23,10 @@ type Client struct {
func New(firewall Firewall, defaultInterface string, ipv6Supported bool, func New(firewall Firewall, defaultInterface string, ipv6Supported bool,
upstreamResolvers []provider.Provider, upstreamResolvers []provider.Provider,
) (*Client, error) { ) *Client {
if len(upstreamResolvers) == 0 {
panic("no upstream resolvers provided") // programming error
}
dohServers := make([]provider.DoHServer, len(upstreamResolvers)) dohServers := make([]provider.DoHServer, len(upstreamResolvers))
for i, upstreamResolver := range upstreamResolvers { for i, upstreamResolver := range upstreamResolvers {
dohServers[i] = upstreamResolver.DoH dohServers[i] = upstreamResolver.DoH
@@ -36,7 +39,7 @@ func New(firewall Firewall, defaultInterface string, ipv6Supported bool,
ipv6Supported: ipv6Supported, ipv6Supported: ipv6Supported,
dohServers: dohServers, dohServers: dohServers,
httpsPort: defaultHTTPSPort, httpsPort: defaultHTTPSPort,
}, nil }
} }
func (c *Client) OpenHTTPSByDomain(ctx context.Context, domain string) ( func (c *Client) OpenHTTPSByDomain(ctx context.Context, domain string) (
+1 -1
View File
@@ -37,7 +37,7 @@ func (c *Client) OpenHTTPS(ctx context.Context, destinationTLSName string, desti
connection, err := connectSourceConnection(ctx, fd, destinationAddrPort) connection, err := connectSourceConnection(ctx, fd, destinationAddrPort)
if err != nil { if err != nil {
const remove = true const remove = true
_ = c.firewall.AcceptOutputFromIPPortToIPPort(ctx, "tcp", c.outboundInterface, _ = c.firewall.AcceptOutputFromIPPortToIPPort(context.Background(), "tcp", c.outboundInterface,
sourceAddrPort, destinationAddrPort, remove) sourceAddrPort, destinationAddrPort, remove)
return nil, nil, fmt.Errorf("connecting source socket: %w", err) return nil, nil, fmt.Errorf("connecting source socket: %w", err)
} }