f-57: dhcp: écoute sur le macvlan de la gateway anycast, dnsmasq et serveur intégré #57
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
6c35ebdff4
commit
12d69798fb
9 changed files with 116 additions and 4 deletions
32
cmd/dhcp/listen_test.go
Normal file
32
cmd/dhcp/listen_test.go
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
package main
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestListenInterface(t *testing.T) {
|
||||
present := func(names ...string) func(string) bool {
|
||||
return func(name string) bool {
|
||||
for _, n := range names {
|
||||
if n == name {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
cases := []struct {
|
||||
label string
|
||||
bridge string
|
||||
exists func(string) bool
|
||||
want string
|
||||
}{
|
||||
{"gateway anycast présente", "br-s9r1", present("br-s9r1", "gw-s9r1"), "gw-s9r1"},
|
||||
{"ancien modèle, pas de gateway", "br-s9r1", present("br-s9r1"), "br-s9r1"},
|
||||
{"gateway d'un autre subnet", "br-s9r1", present("br-s9r1", "gw-s9r2"), "br-s9r1"},
|
||||
{"bridge sans préfixe br-", "vpc1br0", present("gw-vpc1br0"), "vpc1br0"},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := listenInterface(c.bridge, c.exists); got != c.want {
|
||||
t.Errorf("%s : %s, %s attendu", c.label, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@ import (
|
|||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
dhcpapi "git.g3e.fr/syonad/two/internal/api/dhcp"
|
||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
|
|
@ -66,13 +67,30 @@ func run() error {
|
|||
}
|
||||
}()
|
||||
|
||||
conn, err := server4.NewIPv4UDPConn(*iface, &net.UDPAddr{Port: dhcpv4.ServerPort})
|
||||
listen := listenInterface(*iface, interfaceExists)
|
||||
conn, err := server4.NewIPv4UDPConn(listen, &net.UDPAddr{Port: dhcpv4.ServerPort})
|
||||
if err != nil {
|
||||
return fmt.Errorf("bind udp/%d on %s: %w", dhcpv4.ServerPort, *iface, err)
|
||||
return fmt.Errorf("bind udp/%d on %s: %w", dhcpv4.ServerPort, listen, err)
|
||||
}
|
||||
defer conn.Close()
|
||||
|
||||
log.Info("dhcp server started", "state", store.Path(), "socket", control.Addr())
|
||||
log.Info("dhcp server started", "listen", listen, "state", store.Path(), "socket", control.Addr())
|
||||
|
||||
return store.Serve(conn, log)
|
||||
}
|
||||
|
||||
func interfaceExists(name string) bool {
|
||||
_, err := net.InterfaceByName(name)
|
||||
return err == nil
|
||||
}
|
||||
|
||||
func listenInterface(bridge string, exists func(string) bool) string {
|
||||
id, ok := strings.CutPrefix(bridge, "br-")
|
||||
if !ok {
|
||||
return bridge
|
||||
}
|
||||
if gateway := "gw-" + id; exists(gateway) {
|
||||
return gateway
|
||||
}
|
||||
return bridge
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue