get multicast_ip from config

ilius · Oct 30, 2024 · 755a77b · 755a77b
1 parent a1d5371
commit 755a77b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -19,6 +19,7 @@ var embedFS embed.FS
 type Config struct {
 	NameOfDevice string `toml:"name"`
 	NameLanguage string `toml:"name_language"`
+	MulticastIP  string `toml:"multicast_ip"`
 	Receive      struct {
 		Directory          string `toml:"directory"`
 		MaxFileSize        int    `toml:"max_file_size"`

diff --git a/pkg/config/config.toml b/pkg/config/config.toml
@@ -1,5 +1,6 @@
 name = ""
 name_language = "en"
+multicast_ip = "224.0.0.167" # https://en.wikipedia.org/wiki/Multicast_address
 
 [receive]
 directory = "uploads"

diff --git a/pkg/discovery/discovery.go b/pkg/discovery/discovery.go
diff --git a/pkg/discovery/udp.go b/pkg/discovery/udp.go
@@ -13,9 +13,11 @@ import (
 
 // StartBroadcast sends a broadcast message
 func StartBroadcast(conf *config.Config) {
+	slog.Info("Starting broadcast", "multicast_ip", conf.MulticastIP)
+
 	// Set the multicast address and port
 	multicastAddr := &net.UDPAddr{
-		IP:   net.ParseIP(mulicastIP),
+		IP:   net.ParseIP(conf.MulticastIP),
 		Port: 53317,
 	}
 
@@ -49,12 +51,12 @@ func StartBroadcast(conf *config.Config) {
 }
 
 // ListenForBroadcasts listens for UDP broadcast messages
-func ListenForBroadcasts() {
-	slog.Info("Listening for broadcasts...")
+func ListenForBroadcasts(conf *config.Config) {
+	slog.Info("Listening for broadcasts", "multicast_ip", conf.MulticastIP)
 
 	// Set the multicast address and port
 	multicastAddr := &net.UDPAddr{
-		IP:   net.ParseIP(mulicastIP),
+		IP:   net.ParseIP(conf.MulticastIP),
 		Port: 53317,
 	}
 

diff --git a/pkg/startup/startup.go b/pkg/startup/startup.go
@@ -14,7 +14,7 @@ import (
 
 // Enable broadcast and monitoring functions
 func StartDiscovery(conf *config.Config) {
-	go discovery.ListenForBroadcasts()
+	go discovery.ListenForBroadcasts(conf)
 	go discovery.StartBroadcast(conf)
 	go discovery.StartHTTPBroadcast(conf)
 }