Refactor stations discovery and add hostapd discovery

internal/config/cli.go

@@ -8,8 +8,9 @@ import (
 func declareFlags(o *Config) {
 	flag.StringVar(&o.Bind, "bind", ":8081", "Bind port/socket")
 	flag.StringVar(&o.WifiInterface, "wifi-interface", "wlan0", "WiFi interface name")
+	flag.StringVar(&o.HotspotInterface, "hotspot-interface", "wlan1", "Hotspot WiFi interface name")
 	flag.StringVar(&o.WifiBackend, "wifi-backend", "", "WiFi backend to use: 'iwd' or 'wpasupplicant' (required)")
-	flag.BoolVar(&o.UseARPDiscovery, "use-arp-discovery", true, "Use ARP table for device discovery instead of DHCP leases")
+	flag.StringVar(&o.StationBackend, "station-backend", "hostapd", "Station discovery backend: 'arp', 'dhcp', or 'hostapd'")
 	flag.StringVar(&o.DHCPLeasesPath, "dhcp-leases-path", "/var/lib/dhcp/dhcpd.leases", "Path to DHCP leases file")
 	flag.StringVar(&o.ARPTablePath, "arp-table-path", "/proc/net/arp", "Path to ARP table file")
 	flag.BoolVar(&o.SyslogEnabled, "syslog-enabled", false, "Enable syslog tailing for iwd messages")

internal/config/config.go

@@ -9,16 +9,17 @@ import (
 )
 
 type Config struct {
-	Bind            string
-	WifiInterface   string
-	WifiBackend     string
-	UseARPDiscovery bool
-	DHCPLeasesPath  string
-	ARPTablePath    string
-	SyslogEnabled   bool
-	SyslogPath      string
-	SyslogFilter    []string
-	SyslogSource    string
+	Bind             string
+	WifiInterface    string
+	HotspotInterface string
+	WifiBackend      string
+	StationBackend   string // "arp", "dhcp", or "hostapd"
+	DHCPLeasesPath   string
+	ARPTablePath     string
+	SyslogEnabled    bool
+	SyslogPath       string
+	SyslogFilter     []string
+	SyslogSource     string
 }
 
 // ConsolidateConfig fills an Options struct by reading configuration from
@@ -28,15 +29,15 @@ type Config struct {
 func ConsolidateConfig() (opts *Config, err error) {
 	// Define defaults options
 	opts = &Config{
-		Bind:            ":8080",
-		WifiInterface:   "wlan0",
-		UseARPDiscovery: true,
-		DHCPLeasesPath:  "/var/lib/dhcp/dhcpd.leases",
-		ARPTablePath:    "/proc/net/arp",
-		SyslogEnabled:   false,
-		SyslogPath:      "/var/log/messages",
-		SyslogFilter:    []string{"daemon.info wpa_supplicant:", "daemon.info iwd:", "daemon.info hostapd:"},
-		SyslogSource:    "iwd",
+		Bind:             ":8080",
+		WifiInterface:    "wlan0",
+		HotspotInterface: "wlan1",
+		DHCPLeasesPath:   "/var/lib/dhcp/dhcpd.leases",
+		ARPTablePath:     "/proc/net/arp",
+		SyslogEnabled:    false,
+		SyslogPath:       "/var/log/messages",
+		SyslogFilter:     []string{"daemon.info wpa_supplicant:", "daemon.info iwd:", "daemon.info hostapd:"},
+		SyslogSource:     "iwd",
 	}
 
 	declareFlags(opts)
@@ -81,6 +82,10 @@ func ConsolidateConfig() (opts *Config, err error) {
 		log.Fatalf("wifi-backend must be set to 'iwd' or 'wpasupplicant' (got: '%s')", opts.WifiBackend)
 	}
 
+	if opts.StationBackend != "arp" && opts.StationBackend != "dhcp" && opts.StationBackend != "hostapd" {
+		log.Fatalf("station-backend must be set to 'arp', 'dhcp', or 'hostapd' (got: '%s')", opts.StationBackend)
+	}
+
 	return
 }