From 755a77b8642c7dbc764bb016b095a4ec37f0ed37 Mon Sep 17 00:00:00 2001 From: Saeed Rasooli Date: Thu, 31 Oct 2024 02:09:12 +0330 Subject: [PATCH] get multicast_ip from config --- pkg/config/config.go | 1 + pkg/config/config.toml | 1 + pkg/discovery/discovery.go | 5 ----- pkg/discovery/udp.go | 10 ++++++---- pkg/startup/startup.go | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 pkg/discovery/discovery.go diff --git a/pkg/config/config.go b/pkg/config/config.go index 7eab499..7f2b9ad 100644 --- 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 index def1e9a..a51daab 100644 --- 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 deleted file mode 100644 index 5bfe55d..0000000 --- a/pkg/discovery/discovery.go +++ /dev/null @@ -1,5 +0,0 @@ -package discovery - -const mulicastIP = "224.0.0.167" - -// https://en.wikipedia.org/wiki/Multicast_address diff --git a/pkg/discovery/udp.go b/pkg/discovery/udp.go index 1080e40..416ee14 100644 --- 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 index 10d6916..08b0c49 100644 --- 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) }