Implement managed pf configuration.

Author: brocaar

Gopkg.lock

@@ -3,7 +3,7 @@
 
 [[constraint]]
   name = "github.com/brocaar/loraserver"
-  version = "0.23.2"
+  branch = "gw_config"
 
 [[constraint]]
   branch = "master"

Gopkg.toml

@@ -32,6 +32,41 @@ udp_bind = "{{ .PacketForwarder.UDPBind }}"
 skip_crc_check = {{ .PacketForwarder.SkipCRCCheck }}
 
 
+  # # Managed packet-forwarder configuration.
+  # #
+  # # By configuring one or multiple managed packet-forwarder sections, the
+  # # LoRa Gateway Bridge updates the configuration when the backend receives
+  # # a configuration change, after which it will restart the packet-forwarder.
+  # [[packet_forwarder.configuration]]
+  # # Gateway MAC.
+  # #
+  # # The LoRa Gateway Bridge will only apply the configuration updates for this
+  # # gateway MAC.
+  # mac="0102030405060708"
+
+  # # Base configuration file.
+  # #
+  # # This file will be used as base-configuration and will not be overwritten on
+  # # a configuration update. This file needs to exist and contains the base
+  # # configuration and vendor specific
+  # base_file="/etc/lora-packet-forwarder/global_conf.json"
+
+  # # Output configuration file.
+  # #
+  # # This will be the final configuration for the packet-forwarder, containing
+  # # a merged version of the base configuration + the requested configuration
+  # # update.
+  # # Warning: this file will be overwritten on a configuration update!
+  # output_file="/etc/lora-packet-forwarder/local_conf.json"
+
+  # # Restart command.
+  # #
+  # # This command is issued by the LoRa Gateway Bridge on a configuration
+  # # change. Make sure the LoRa Gateway Bridge process has sufficient
+  # # permissions to execute this command.
+  # restart_command="/etc/init.d/lora-packet-forwarder restart"
+
+
 # Configuration for the MQTT backend.
 [backend.mqtt]
 # MQTT topic templates for the different MQTT topics.
@@ -47,6 +82,7 @@ uplink_topic_template="{{ .Backend.MQTT.UplinkTopicTemplate }}"
 downlink_topic_template="{{ .Backend.MQTT.DownlinkTopicTemplate }}"
 stats_topic_template="{{ .Backend.MQTT.StatsTopicTemplate }}"
 ack_topic_template="{{ .Backend.MQTT.AckTopicTemplate }}"
+config_topic_template="{{ .Backend.MQTT.ConfigTopicTemplate }}"
 
 # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
 server="{{ .Backend.MQTT.Server }}"

cmd/lora-gateway-bridge/cmd/configfile.go

@@ -3,19 +3,12 @@ package cmd
 import (
 	"bytes"
 	"io/ioutil"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/brocaar/lora-gateway-bridge/internal/backend/mqttpubsub"
 	"github.com/brocaar/lora-gateway-bridge/internal/config"
-	"github.com/brocaar/lora-gateway-bridge/internal/gateway"
-	"github.com/brocaar/lorawan"
 )
 
 var cfgFile string // config file
@@ -25,7 +18,7 @@ var rootCmd = &cobra.Command{
 	Use:   "lora-gateway-bridge",
 	Short: "abstracts the packet_forwarder protocol into JSON over MQTT",
 	Long: `LoRa Gateway Bridge abstracts the packet_forwarder protocol into JSON over MQTT
-	> documentation & support: https://docs.loraserver.io/lora-gateway-bridge
+	> documentation & support: https://www.loraserver.io/lora-gateway-bridge
 	> source & copyright information: https://github.com/brocaar/lora-gateway-bridge`,
 	RunE: run,
 }
@@ -83,6 +76,7 @@ func init() {
 	viper.SetDefault("backend.mqtt.downlink_topic_template", "gateway/{{ .MAC }}/tx")
 	viper.SetDefault("backend.mqtt.stats_topic_template", "gateway/{{ .MAC }}/stats")
 	viper.SetDefault("backend.mqtt.ack_topic_template", "gateway/{{ .MAC }}/ack")
+	viper.SetDefault("backend.mqtt.config_topic_template", "gateway/{{ .MAC }}/config")
 	viper.SetDefault("backend.mqtt.server", "tcp://127.0.0.1:1883")
 	viper.SetDefault("backend.mqtt.clean_session", true)
 
@@ -98,80 +92,6 @@ func Execute(v string) {
 	}
 }
 
-func run(cmd *cobra.Command, args []string) error {
-	log.SetLevel(log.Level(uint8(config.C.General.LogLevel)))
-
-	log.WithFields(log.Fields{
-		"version": version,
-		"docs":    "https://docs.loraserver.io/lora-gateway-bridge/",
-	}).Info("starting LoRa Gateway Bridge")
-
-	var pubsub *mqttpubsub.Backend
-	for {
-		var err error
-		pubsub, err = mqttpubsub.NewBackend(config.C.Backend.MQTT)
-		if err == nil {
-			break
-		}
-
-		log.Errorf("could not setup mqtt backend, retry in 2 seconds: %s", err)
-		time.Sleep(2 * time.Second)
-	}
-	defer pubsub.Close()
-
-	onNew := func(mac lorawan.EUI64) error {
-		return pubsub.SubscribeGatewayTX(mac)
-	}
-
-	onDelete := func(mac lorawan.EUI64) error {
-		return pubsub.UnSubscribeGatewayTX(mac)
-	}
-
-	gw, err := gateway.NewBackend(config.C.PacketForwarder.UDPBind, onNew, onDelete, config.C.PacketForwarder.SkipCRCCheck)
-	if err != nil {
-		log.Fatalf("could not setup gateway backend: %s", err)
-	}
-	defer gw.Close()
-
-	go func() {
-		for rxPacket := range gw.RXPacketChan() {
-			if err := pubsub.PublishGatewayRX(rxPacket.RXInfo.MAC, rxPacket); err != nil {
-				log.Errorf("could not publish RXPacket: %s", err)
-			}
-		}
-	}()
-
-	go func() {
-		for stats := range gw.StatsChan() {
-			if err := pubsub.PublishGatewayStats(stats.MAC, stats); err != nil {
-				log.Errorf("could not publish GatewayStatsPacket: %s", err)
-			}
-		}
-	}()
-
-	go func() {
-		for txPacket := range pubsub.TXPacketChan() {
-			if err := gw.Send(txPacket); err != nil {
-				log.Errorf("could not send TXPacket: %s", err)
-			}
-		}
-	}()
-
-	go func() {
-		for txAck := range gw.TXAckChan() {
-			if err := pubsub.PublishGatewayTXAck(txAck.MAC, txAck); err != nil {
-				log.Errorf("could not publish TXAck: %s", err)
-			}
-		}
-	}()
-
-	sigChan := make(chan os.Signal)
-	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
-	log.WithField("signal", <-sigChan).Info("signal received")
-	log.Warning("shutting down server")
-	return nil
-}
-
 func initConfig() {
 	if cfgFile != "" {
 		b, err := ioutil.ReadFile(cfgFile)
@@ -200,4 +120,10 @@ func initConfig() {
 	if err := viper.Unmarshal(&config.C); err != nil {
 		log.WithError(err).Fatal("unmarshal config error")
 	}
+
+	for i := range config.C.PacketForwarder.Configuration {
+		if err := config.C.PacketForwarder.Configuration[i].MAC.UnmarshalText([]byte(config.C.PacketForwarder.Configuration[i].MACString)); err != nil {
+			log.WithError(err).Fatal("unmarshal config error")
+		}
+	}
 }