Skip to content

Resolve domain names in NAT1To1IP and MediaNAT1To1IP config #595

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

Open
jaylim95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Resolve domain names in NAT1To1IP and MediaNAT1To1IP config #595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 20 additions & 2 deletions pkg/sip/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func GetServiceConfig(conf *config.Config) (*ServiceConfig, error) {
return nil, err
}
} else if conf.NAT1To1IP != "" {
ip, err := netip.ParseAddr(conf.NAT1To1IP)
ip, err := resolveAddrOrHost(conf.NAT1To1IP)
if err != nil {
return nil, err
}
Expand All @@ -55,7 +55,7 @@ func GetServiceConfig(conf *config.Config) (*ServiceConfig, error) {
return nil, err
}
} else if conf.MediaNAT1To1IP != "" && conf.MediaNAT1To1IP != conf.NAT1To1IP {
ip, err := netip.ParseAddr(conf.MediaNAT1To1IP)
ip, err := resolveAddrOrHost(conf.MediaNAT1To1IP)
if err != nil {
return nil, err
}
Expand All @@ -81,6 +81,24 @@ func getPublicIP() (netip.Addr, error) {
return netip.Addr{}, errors.Errorf("could not resolve external IP: %v", err)
}

func resolveAddrOrHost(addrOrHost string) (netip.Addr, error) {
// Try parsing as a literal IP address first.
if ip, err := netip.ParseAddr(addrOrHost); err == nil {
return ip, nil
}
// Fall back to DNS resolution for domain names.
ips, err := net.LookupHost(addrOrHost)
if err != nil {
return netip.Addr{}, fmt.Errorf("failed to resolve %q: %w", addrOrHost, err)
}
for _, ipStr := range ips {
if ip, err := netip.ParseAddr(ipStr); err == nil && ip.Is4() {
return ip, nil
}
}
return netip.Addr{}, fmt.Errorf("no IPv4 address found for %q", addrOrHost)
}

func getLocalIP(localNet string) (netip.Addr, error) {
ifaces, err := net.Interfaces()
if err != nil {
Expand Down