Переглянути джерело

Merge pull request #62 from pmazzini/bootfile

simplify boot file URL
Pablo Mazzini 6 роки тому
батько
коміт
bab34e662c
3 змінених файлів з 4 додано та 4 видалено
  1. 1 1
      go.mod
  2. 2 2
      go.sum
  3. 1 1
      plugins/file/plugin.go

+ 1 - 1
go.mod

@@ -5,7 +5,7 @@ go 1.12
 require (
 	github.com/chappjc/logrus-prefix v0.0.0-20180227015900-3a1d64819adb
 	github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20190916180653-834a63bade8a
+	github.com/insomniacslk/dhcp v0.0.0-20191002211418-651e0846f780
 	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
 	github.com/mdlayher/raw v0.0.0-20190606144222-a54781e5f38f // indirect

+ 2 - 2
go.sum

@@ -49,8 +49,8 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
-github.com/insomniacslk/dhcp v0.0.0-20190916180653-834a63bade8a h1:2zDlT9dNJyaDPnJ23Q2LuztY/2TznrFFvAV17jCjgKY=
-github.com/insomniacslk/dhcp v0.0.0-20190916180653-834a63bade8a/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
+github.com/insomniacslk/dhcp v0.0.0-20191002211418-651e0846f780 h1:ty8rDh2kTAoxelUsFLMwjcQ3YW7lF7NHHcpUGuKMMNE=
+github.com/insomniacslk/dhcp v0.0.0-20191002211418-651e0846f780/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=

+ 1 - 1
plugins/file/plugin.go

@@ -160,7 +160,7 @@ func Handler6(req, resp dhcpv6.DHCPv6) (dhcpv6.DHCPv6, bool) {
 				// FIXME this field should come from the configuration, not
 				// being hardcoded
 				resp.AddOption(
-					&dhcpv6.OptBootFileURL{BootFileURL: []byte("http://[2001:db8::0:1]/nbp")},
+					dhcpv6.OptBootFileURL("http://[2001:db8::0:1]/nbp"),
 				)
 			}
 		}