pkg/hostagent: split DNS pkg

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

pkg/hostagent/dns.go renamed to pkg/hostagent/dns/dns.go

@@ -1,6 +1,6 @@
 // This file has been adapted from https://github.com/norouter/norouter/blob/v0.6.4/pkg/agent/dns/dns.go
 
-package hostagent
+package dns
 
 import (
 	"fmt"
@@ -205,14 +205,14 @@ func (h *Handler) ServeDNS(w dns.ResponseWriter, req *dns.Msg) {
 	}
 }
 
-func (a *HostAgent) StartDNS() (*Server, error) {
+func Start(udpLocalPort, tcpLocalPort int) (*Server, error) {
 	h, err := newHandler()
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 	server := &Server{}
-	if a.udpDNSLocalPort > 0 {
-		addr := fmt.Sprintf("127.0.0.1:%d", a.udpDNSLocalPort)
+	if udpLocalPort > 0 {
+		addr := fmt.Sprintf("127.0.0.1:%d", udpLocalPort)
 		s := &dns.Server{Net: "udp", Addr: addr, Handler: h}
 		server.udp = s
 		go func() {
@@ -221,8 +221,8 @@ func (a *HostAgent) StartDNS() (*Server, error) {
 			}
 		}()
 	}
-	if a.tcpDNSLocalPort > 0 {
-		addr := fmt.Sprintf("127.0.0.1:%d", a.tcpDNSLocalPort)
+	if tcpLocalPort > 0 {
+		addr := fmt.Sprintf("127.0.0.1:%d", tcpLocalPort)
 		s := &dns.Server{Net: "tcp", Addr: addr, Handler: h}
 		server.tcp = s
 		go func() {

pkg/hostagent/hostagent.go

@@ -23,6 +23,7 @@ import (
 	guestagentapi "github.com/lima-vm/lima/pkg/guestagent/api"
 	guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client"
 	hostagentapi "github.com/lima-vm/lima/pkg/hostagent/api"
+	"github.com/lima-vm/lima/pkg/hostagent/dns"
 	"github.com/lima-vm/lima/pkg/hostagent/events"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	"github.com/lima-vm/lima/pkg/qemu"
@@ -248,7 +249,7 @@ func (a *HostAgent) Run(ctx context.Context) error {
 	}()
 
 	if *a.y.UseHostResolver {
-		dnsServer, err := a.StartDNS()
+		dnsServer, err := dns.Start(a.udpDNSLocalPort, a.tcpDNSLocalPort)
 		if err != nil {
 			return fmt.Errorf("cannot start DNS server: %w", err)
 		}