Skip to content

Commit

Permalink
Merge branch 'develop' into feature/snet-rewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
i-hate-nicknames committed Jul 7, 2021
2 parents 3e7ee0c + 23ced79 commit bd371e4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 59 deletions.
4 changes: 4 additions & 0 deletions internal/vpn/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ func AppEnvArgs(config DirectRoutesEnvConfig) map[string]string {
// - domain without port;
// - IP with port;
// - IP without port.
// In case domain is provided instead of an IP address, a DNS lookup is also
// performed to resolve the actual IP address
func IPFromEnv(key string) (net.IP, bool, error) {
return ParseIP(os.Getenv(key))
}
Expand All @@ -125,6 +127,8 @@ func IPFromEnv(key string) (net.IP, bool, error) {
// - domain without port;
// - IP with port;
// - IP without port.
// In case domain is provided instead of an IP address, a DNS lookup is also
// performed to resolve the actual IP address
func ParseIP(addr string) (net.IP, bool, error) {
if addr == "" {
return nil, false, nil
Expand Down
59 changes: 0 additions & 59 deletions internal/vpn/env_test.go

This file was deleted.

0 comments on commit bd371e4

Please sign in to comment.