GnomeZworc
8a04f6f7f6
All checks were successful
Release Pipeline / set-release-target (push) Successful in 39s
Release Pipeline / upload-assets (run-dhcp-in-netns.sh, scripts/run-dhcp-in-netns.sh) (push) Successful in 4s
Release Pipeline / upload-assets (run-dnsmasq-in-netns.sh, scripts/run-dnsmasq-in-netns.sh) (push) Successful in 4s
Release Pipeline / upload-assets (agent.service, systemd/agent.service) (push) Successful in 4s
Release Pipeline / upload-assets (dhcp@.service, systemd/dhcp@.service) (push) Successful in 4s
Release Pipeline / upload-assets (dnsmasq@.service, systemd/dnsmasq@.service) (push) Successful in 4s
Release Pipeline / upload-assets (metadata@.service, systemd/metadata@.service) (push) Successful in 4s
Release Pipeline / build (dhcp, amd64, linux) (push) Successful in 0s
Release Pipeline / build (agent, amd64, linux) (push) Successful in 0s
Release Pipeline / build (metadata, amd64, linux) (push) Successful in 0s
Release Pipeline / checksums (push) Successful in 4s
Release Pipeline / release (push) Successful in 13s
Release Pipeline / publish (push) Successful in 0s
Release Pipeline / build (push) Successful in 1m2s
internal/subnet et internal/vm ne parlent plus à dnsmasq en direct mais à une interface Backend, choisie au démarrage par dhcp.backend. Le défaut restant dnsmasq, un agent.yml de 0.1.0 se comporte à l'identique ; ValidBackend refuse toute autre valeur que dnsmasq ou two. Les entrées ip→mac sont écrites hors du backend : elles font autorité pour les deux, internal/vm/data.go les lisant par GetMACForIP quel que soit le serveur. D'où l'extraction de dhcp.Entries, que GenerateConfig mêlait à l'écriture du fichier dnsmasq. Reservation porte Index et DefaultRoute : dnsmasq en dérive ses tags et n'en pose que sur les interfaces sans route par défaut, le backend two transmet le drapeau tel quel. La notion de tag ne remonte plus jusqu'à internal/vm. Two.ConfigureSubnet sonde get-state avant de pousser la configuration : le job systemd d'une unit Type=simple est done dès le fork, avant que la socket existe. TeardownSubnet arrête l'unit avant de supprimer le .state. Le backend two est testé contre un vrai serveur sur une vraie socket. Onze mutations, toutes détectées. Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
80 lines
2.2 KiB
Go
80 lines
2.2 KiB
Go
package dhcp
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"git.g3e.fr/syonad/two/internal/metadata"
|
|
)
|
|
|
|
func GenerateConfig(c Config) (string, map[string]string, error) {
|
|
if c.InterfaceIP == nil {
|
|
return "", nil, fmt.Errorf("interface ip is required: guests would have no route to the metadata server")
|
|
}
|
|
mask := fmt.Sprintf("%d.%d.%d.%d", c.Network.Mask[0], c.Network.Mask[1], c.Network.Mask[2], c.Network.Mask[3])
|
|
|
|
var sb strings.Builder
|
|
fmt.Fprintf(&sb, "no-resolv\n")
|
|
fmt.Fprintf(&sb, "dhcp-range=%s,static,%s,12h\n", c.Network.IP.String(), mask)
|
|
fmt.Fprintf(&sb, "dhcp-option=121,%s\n", strings.Join(classlessRoutes(c), ","))
|
|
if c.DefaultGateway != nil {
|
|
fmt.Fprintf(&sb, "dhcp-option=3,%s\n", c.DefaultGateway.String())
|
|
} else {
|
|
fmt.Fprintf(&sb, "dhcp-option=3\n")
|
|
}
|
|
fmt.Fprintf(&sb, "dhcp-option=6,1.1.1.1,8.8.8.8\n")
|
|
fmt.Fprintf(&sb, "dhcp-hostsdir=%s\n", HostsDir(c.ConfDir, c.Name))
|
|
fmt.Fprintf(&sb, "dhcp-optsdir=%s\n", OptsDir(c.ConfDir, c.Name))
|
|
|
|
entries := Entries(c.Network)
|
|
|
|
for _, dir := range []string{c.ConfDir, HostsDir(c.ConfDir, c.Name), OptsDir(c.ConfDir, c.Name)} {
|
|
if err := os.MkdirAll(dir, 0755); err != nil {
|
|
return "", nil, fmt.Errorf("create %s: %w", dir, err)
|
|
}
|
|
}
|
|
|
|
outPath := filepath.Join(c.ConfDir, c.Name+".conf")
|
|
return outPath, entries, os.WriteFile(outPath, []byte(sb.String()), 0644)
|
|
}
|
|
|
|
func Entries(network *net.IPNet) map[string]string {
|
|
entries := make(map[string]string)
|
|
i := 0
|
|
for ip := cloneIP(network.IP); network.Contains(ip); incrementIP(ip) {
|
|
entries[ip.String()] = fmt.Sprintf("00:22:33:%02X:%02X:%02X", (i>>16)&0xFF, (i>>8)&0xFF, i&0xFF)
|
|
i++
|
|
}
|
|
return entries
|
|
}
|
|
|
|
func classlessRoutes(c Config) []string {
|
|
nextHop := c.InterfaceIP.String()
|
|
|
|
routes := []string{metadata.ServiceIP + "/32," + nextHop}
|
|
if c.VPCRoute != nil {
|
|
routes = append(routes, c.VPCRoute.String()+","+nextHop)
|
|
}
|
|
if c.DefaultGateway != nil {
|
|
routes = append(routes, "0.0.0.0/0,"+c.DefaultGateway.String())
|
|
}
|
|
return routes
|
|
}
|
|
|
|
func incrementIP(ip net.IP) {
|
|
for j := len(ip) - 1; j >= 0; j-- {
|
|
ip[j]++
|
|
if ip[j] != 0 {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
func cloneIP(ip net.IP) net.IP {
|
|
clone := make(net.IP, len(ip))
|
|
copy(clone, ip)
|
|
return clone
|
|
}
|