64649039d9
- General improvements
- Parallel download of only needed files at start
- Prettier console output with all streams merged (openvpn, unbound, shadowsocks etc.)
- Simplified Docker final image
- Faster bootup
- DNS over TLS
- Finer grain blocking at DNS level: malicious, ads and surveillance
- Choose your DNS over TLS providers
- Ability to use multiple DNS over TLS providers for DNS split horizon
- Environment variables for DNS logging
- DNS block lists needed are downloaded and built automatically at start, in parallel
- PIA
- A random region is selected if the REGION parameter is left empty (thanks @rorph for your PR)
- Routing and iptables adjusted so it can work as a Kubernetes pod sidecar (thanks @rorph for your PR)
30 lines
837 B
Go
30 lines
837 B
Go
package params
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"strings"
|
|
)
|
|
|
|
// GetExtraSubnets obtains the CIDR subnets from the comma separated list of the
|
|
// environment variable EXTRA_SUBNETS
|
|
func (p *paramsReader) GetExtraSubnets() (extraSubnets []net.IPNet, err error) {
|
|
s, err := p.envParams.GetEnv("EXTRA_SUBNETS")
|
|
if err != nil {
|
|
return nil, err
|
|
} else if s == "" {
|
|
return nil, nil
|
|
}
|
|
subnets := strings.Split(s, ",")
|
|
for _, subnet := range subnets {
|
|
_, cidr, err := net.ParseCIDR(subnet)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not parse subnet %q from environment variable with key EXTRA_SUBNETS: %w", subnet, err)
|
|
} else if cidr == nil {
|
|
return nil, fmt.Errorf("parsing subnet %q resulted in a nil CIDR", subnet)
|
|
}
|
|
extraSubnets = append(extraSubnets, *cidr)
|
|
}
|
|
return extraSubnets, nil
|
|
}
|