mudhorn/meshmap.net
1
0
Fork 0
mirror of https://github.com/brianshea2/meshmap.net.git synced 2025-03-05 21:00:01 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow custom root topics

Browse source
This commit is contained in:
root 2024-12-01 04:34:59 +00:00
parent ec6cb716a6
commit 1b62110914
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/meshobserv/meshobserv.go
View file

@ -227,6 +227,16 @@ func main() {
} }
// connect to MQTT // connect to MQTT
client := &meshtastic.MQTTClient{ client := &meshtastic.MQTTClient{
Topics: []string{
"msh/+/2/map/",
"msh/+/2/e/+/+",
"msh/+/+/2/map/",
"msh/+/+/2/e/+/+",
"msh/+/+/+/2/map/",
"msh/+/+/+/2/e/+/+",
"msh/+/+/+/+/2/map/",
"msh/+/+/+/+/2/e/+/+",
},
TopicRegex: regexp.MustCompile(`/2/e/[^/]+/![0-9a-f]+$|/2/map/$`), TopicRegex: regexp.MustCompile(`/2/e/[^/]+/![0-9a-f]+$|/2/map/$`),
Accept: func(from uint32) bool { Accept: func(from uint32) bool {
_, found := blocked[from] _, found := blocked[from]

8
internal/meshtastic/mqtt.go
View file

@ -31,6 +31,7 @@ func NewBlockCipher(key []byte) cipher.Block {
} }
type MQTTClient struct { type MQTTClient struct {
Topics []string
TopicRegex *regexp.Regexp TopicRegex *regexp.Regexp
Accept func(from uint32) bool Accept func(from uint32) bool
BlockCipher cipher.Block BlockCipher cipher.Block
@ -56,11 +57,8 @@ func (c *MQTTClient) Connect() error {
} }
log.Print("[info] connected") log.Print("[info] connected")
topics := make(map[string]byte) topics := make(map[string]byte)
for i, region := range generated.Config_LoRaConfig_RegionCode_name { for _, topic := range c.Topics {
if i == 0 { topics[topic] = 0
continue
}
topics["msh/"+region+"/#"] = 0
} }
token = c.SubscribeMultiple(topics, nil) token = c.SubscribeMultiple(topics, nil)
<-token.Done() <-token.Done()