Merge branch 'develop'

api/broker/client_streams.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/TheThingsNetwork/go-utils/log"
+	"github.com/TheThingsNetwork/ttn/api/fields"
 	"github.com/TheThingsNetwork/ttn/utils/backoff"
 	"github.com/golang/protobuf/ptypes/empty"
 	"golang.org/x/net/context"
@@ -83,7 +84,7 @@ func NewMonitoredRouterStream(client BrokerClient, getContextFunc func() context
 				for {
 					message, err := client.Recv()
 					if message != nil {
-						s.ctx.Debug("Receiving Downlink message")
+						s.ctx.WithFields(fields.Get(message)).Debug("Receiving Downlink message")
 						if err := message.Validate(); err != nil {
 							s.ctx.WithError(err).Warn("Invalid Downlink")
 							continue
@@ -108,7 +109,7 @@ func NewMonitoredRouterStream(client BrokerClient, getContextFunc func() context
 			// Send uplink
 			go func() {
 				for message := range up {
-					s.ctx.Debug("Sending Uplink message")
+					s.ctx.WithFields(fields.Get(message)).Debug("Sending Uplink message")
 					if err := client.Send(message); err != nil {
 						s.ctx.WithError(err).Warn("Error sending Uplink message")
 						break
@@ -237,7 +238,7 @@ func NewMonitoredHandlerPublishStream(client BrokerClient, getContextFunc func()
 			// Send
 			go func() {
 				for message := range ch {
-					s.ctx.Debug("Sending Downlink message")
+					s.ctx.WithFields(fields.Get(message)).Debug("Sending Downlink message")
 					if err := client.Send(message); err != nil {
 						s.ctx.WithError(err).Warn("Error sending Downlink message")
 						break
@@ -351,7 +352,7 @@ func NewMonitoredHandlerSubscribeStream(client BrokerClient, getContextFunc func
 			for {
 				message, err = client.Recv()
 				if message != nil {
-					s.ctx.Debug("Receiving Uplink message")
+					s.ctx.WithFields(fields.Get(message)).Debug("Receiving Uplink message")
 					if err := message.Validate(); err != nil {
 						s.ctx.WithError(err).Warn("Invalid Uplink")
 						continue

api/fields/log_fields.go

@@ -128,10 +128,14 @@ func fillProtocol(m interface{}, f log.Fields) {
 		}
 	}
 	if m, ok := m.(hasProtocolConfiguration); ok {
-		fillProtocolConfig(m.GetProtocolConfiguration(), f)
+		if cfg := m.GetProtocolConfiguration(); cfg != nil {
+			fillProtocolConfig(cfg, f)
+		}
 	}
 	if m, ok := m.(hasProtocolConfig); ok {
-		fillProtocolConfig(m.GetProtocolConfig(), f)
+		if cfg := m.GetProtocolConfig(); cfg != nil {
+			fillProtocolConfig(cfg, f)
+		}
 	}
 }
 
@@ -183,10 +187,14 @@ func fillGateway(m interface{}, f log.Fields) {
 		}
 	}
 	if m, ok := m.(hasGatewayConfiguration); ok {
-		fillGatewayConfig(m.GetGatewayConfiguration(), f)
+		if cfg := m.GetGatewayConfiguration(); cfg != nil {
+			fillGatewayConfig(cfg, f)
+		}
 	}
 	if m, ok := m.(hasGatewayConfig); ok {
-		fillGatewayConfig(m.GetGatewayConfig(), f)
+		if cfg := m.GetGatewayConfig(); cfg != nil {
+			fillGatewayConfig(cfg, f)
+		}
 	}
 }
 

api/router/client_streams.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/TheThingsNetwork/go-utils/log"
+	"github.com/TheThingsNetwork/ttn/api/fields"
 	"github.com/TheThingsNetwork/ttn/api/gateway"
 	"github.com/TheThingsNetwork/ttn/utils/backoff"
 	"github.com/golang/protobuf/ptypes/empty"
@@ -211,7 +212,7 @@ func NewMonitoredUplinkStream(client RouterClientForGateway) UplinkStream {
 			// Send
 			go func() {
 				for message := range ch {
-					s.ctx.Debug("Sending Uplink message")
+					s.ctx.WithFields(fields.Get(message)).Debug("Sending Uplink message")
 					if err := client.Send(message); err != nil {
 						s.ctx.WithError(err).Warn("Error sending Uplink message")
 						break
@@ -332,7 +333,7 @@ func NewMonitoredDownlinkStream(client RouterClientForGateway) DownlinkStream {
 			for {
 				message, err = client.Recv()
 				if message != nil {
-					s.ctx.Debug("Receiving Downlink message")
+					s.ctx.WithFields(fields.Get(message)).Debug("Receiving Downlink message")
 					if err := message.Validate(); err != nil {
 						s.ctx.WithError(err).Warn("Invalid Downlink")
 						continue

core/handler/downlink.go

@@ -142,6 +142,9 @@ func (h *handler) HandleDownlink(appDownlink *types.DownlinkMessage, downlink *p
 		}
 	}
 
+	downlink.Message = nil
+	downlink.UnmarshalPayload()
+
 	h.status.downlink.Mark(1)
 
 	ctx.Debug("Send Downlink")

core/networkserver/activation.go

@@ -141,5 +141,15 @@ func (n *networkServer) HandleActivate(activation *pb_handler.DeviceActivationRe
 	if err != nil {
 		return nil, err
 	}
+
+	frames, err := n.devices.Frames(dev.AppEUI, dev.DevEUI)
+	if err != nil {
+		return nil, err
+	}
+	err = frames.Clear()
+	if err != nil {
+		return nil, err
+	}
+
 	return activation, nil
 }

core/networkserver/adr.go

@@ -140,7 +140,7 @@ func (n *networkServer) handleDownlinkADR(message *pb_broker.DownlinkMessage, de
 		powerIdx, _ = fp.GetTxPowerIndexFor(fp.DefaultTXPower)
 	}
 
-	if dev.ADR.DataRate == dataRate && dev.ADR.TxPower == txPower {
+	if dev.ADR.DataRate == dataRate && dev.ADR.TxPower == txPower && !dev.Options.DisableFCntCheck {
 		lossPercentage := lossPercentage(frames)
 		switch {
 		case lossPercentage <= 5:

core/networkserver/manager_server.go

@@ -128,6 +128,15 @@ func (n *networkServerManager) SetDevice(ctx context.Context, in *pb_lorawan.Dev
 		return nil, err
 	}
 
+	frames, err := n.networkServer.devices.Frames(dev.AppEUI, dev.DevEUI)
+	if err != nil {
+		return nil, err
+	}
+	err = frames.Clear()
+	if err != nil {
+		return nil, err
+	}
+
 	return &empty.Empty{}, nil
 }