diff options
Diffstat (limited to 'src/pkg/net/dnsconfig.go')
| -rw-r--r-- | src/pkg/net/dnsconfig.go | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/pkg/net/dnsconfig.go b/src/pkg/net/dnsconfig.go index e2d36f97e..b13b1b90a 100644 --- a/src/pkg/net/dnsconfig.go +++ b/src/pkg/net/dnsconfig.go @@ -9,15 +9,15 @@ package net import "os" type _DNS_Config struct { - servers []string; // servers to use - search []string; // suffixes to append to local name - ndots int; // number of dots in name to trigger absolute lookup - timeout int; // seconds before giving up on packet - attempts int; // lost packets before giving up on server - rotate bool; // round robin among servers + servers []string; // servers to use + search []string; // suffixes to append to local name + ndots int; // number of dots in name to trigger absolute lookup + timeout int; // seconds before giving up on packet + attempts int; // lost packets before giving up on server + rotate bool; // round robin among servers } -var _DNS_configError os.Error; +var _DNS_configError os.Error // See resolv.conf(5) on a Linux machine. // TODO(rsc): Supposed to call uname() and chop the beginning @@ -26,10 +26,10 @@ var _DNS_configError os.Error; func _DNS_ReadConfig() (*_DNS_Config, os.Error) { file, err := open("/etc/resolv.conf"); if err != nil { - return nil, err + return nil, err; } conf := new(_DNS_Config); - conf.servers = make([]string, 3)[0:0]; // small, but the standard limit + conf.servers = make([]string, 3)[0:0]; // small, but the standard limit conf.search = make([]string, 0); conf.ndots = 1; conf.timeout = 1; @@ -50,7 +50,7 @@ func _DNS_ReadConfig() (*_DNS_Config, os.Error) { // to look it up. name := f[1]; if len(ParseIP(name)) != 0 { - a = a[0:n+1]; + a = a[0 : n+1]; a[n] = name; conf.servers = a; } @@ -61,11 +61,11 @@ func _DNS_ReadConfig() (*_DNS_Config, os.Error) { conf.search = make([]string, 1); conf.search[0] = f[1]; } else { - conf.search = make([]string, 0) + conf.search = make([]string, 0); } case "search": // set search path to given servers - conf.search = make([]string, len(f) - 1); + conf.search = make([]string, len(f)-1); for i := 0; i < len(conf.search); i++ { conf.search[i] = f[i+1]; } @@ -77,19 +77,19 @@ func _DNS_ReadConfig() (*_DNS_Config, os.Error) { case len(s) >= 6 && s[0:6] == "ndots:": n, _, _ := dtoi(s, 6); if n < 1 { - n = 1 + n = 1; } conf.ndots = n; case len(s) >= 8 && s[0:8] == "timeout:": n, _, _ := dtoi(s, 8); if n < 1 { - n = 1 + n = 1; } conf.timeout = n; case len(s) >= 8 && s[0:9] == "attempts:": n, _, _ := dtoi(s, 9); if n < 1 { - n = 1 + n = 1; } conf.attempts = n; case s == "rotate": @@ -100,6 +100,5 @@ func _DNS_ReadConfig() (*_DNS_Config, os.Error) { } file.close(); - return conf, nil + return conf, nil; } - |
