beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #44179 from thaJeztah/resolvconf_deadcode

Browse source 
libnetwork/resolvconf: removed unused GetIfChanged() and GetLastModified()
This commit is contained in:
Sebastiaan van Stijn 2022-09-26 23:51:52 +02:00 committed by GitHub
commit e3d80cfc15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libnetwork/resolvconf/resolvconf.go
View file

@ -85,12 +85,6 @@ var (
optionsRegexp = regexp.MustCompile(`^\s*options\s*(([^\s]+\s*)*)$`) optionsRegexp = regexp.MustCompile(`^\s*options\s*(([^\s]+\s*)*)$`)
) )
var lastModified struct {
sync.Mutex
sha256 string
contents []byte
}
// File contains the resolv.conf content and its hash // File contains the resolv.conf content and its hash
type File struct { type File struct {
Content []byte Content []byte
@ -115,39 +109,6 @@ func GetSpecific(path string) (*File, error) {
return &File{Content: resolv, Hash: hash}, nil return &File{Content: resolv, Hash: hash}, nil
} }
// GetIfChanged retrieves the host /etc/resolv.conf file, checks against the last hash
// and, if modified since last check, returns the bytes and new hash.
// This feature is used by the resolv.conf updater for containers
func GetIfChanged() (*File, error) {
lastModified.Lock()
defer lastModified.Unlock()
resolv, err := os.ReadFile(Path())
if err != nil {
return nil, err
}
newHash, err := hashData(bytes.NewReader(resolv))
if err != nil {
return nil, err
}
if lastModified.sha256 != newHash {
lastModified.sha256 = newHash
lastModified.contents = resolv
return &File{Content: resolv, Hash: newHash}, nil
}
// nothing changed, so return no data
return nil, nil
}
// GetLastModified retrieves the last used contents and hash of the host resolv.conf.
// Used by containers updating on restart
func GetLastModified() *File {
lastModified.Lock()
defer lastModified.Unlock()
return &File{Content: lastModified.contents, Hash: lastModified.sha256}
}
// FilterResolvDNS cleans up the config in resolvConf. It has two main jobs: // FilterResolvDNS cleans up the config in resolvConf. It has two main jobs:
// 1. It looks for localhost (127.*|::1) entries in the provided // 1. It looks for localhost (127.*|::1) entries in the provided
// resolv.conf, removing local nameserver entries, and, if the resulting // resolv.conf, removing local nameserver entries, and, if the resulting