ITQC/containernetworking-plugins
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

dhcp: daemon dhcp client timeout is configurable

Browse Source 
Fixes #470

Signed-off-by: toby lorne <toby@toby.codes>
This commit is contained in:
toby lorne
2021-01-11 21:27:42 +00:00
parent 3161bb52e0
commit 25fc741e37
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/ipam/dhcp/main.go
View File

@@ -22,6 +22,7 @@ import (
"net/rpc"
"os"
"path/filepath"
"time"
"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/types"
@@ -37,17 +38,19 @@ func main() {
var pidfilePath string
var hostPrefix string
var socketPath string
var timeout time.Duration
daemonFlags := flag.NewFlagSet("daemon", flag.ExitOnError)
daemonFlags.StringVar(&pidfilePath, "pidfile", "", "optional path to write daemon PID to")
daemonFlags.StringVar(&hostPrefix, "hostprefix", "", "optional prefix to host root")
daemonFlags.StringVar(&socketPath, "socketpath", "", "optional dhcp server socketpath")
daemonFlags.DurationVar(&timeout, "timeout", 5*time.Second, "optional dhcp client timeout duration")
daemonFlags.Parse(os.Args[2:])
if socketPath == "" {
socketPath = defaultSocketPath
}
if err := runDaemon(pidfilePath, hostPrefix, socketPath); err != nil {
if err := runDaemon(pidfilePath, hostPrefix, socketPath, timeout); err != nil {
log.Printf(err.Error())
os.Exit(1)
}