fly/fgdata
1
0
Fork 0
Code Activity

Emesary MP bridge: fix lost messages on MP bridge.

Browse source 
When more than one message type being transmitted on the bridge only one of the types would be reliably received. Bug caused because the message index is per notification type (on MP bridge outgoing) but was being treated as per incoming bridge (rather than notification).
This commit is contained in:
Richard Harrison 2020-03-24 12:02:13 +01:00
parent 62d4beb658
commit 2dbe28d43b
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Nasal/emesary_mp_bridge.nas
View file

@ -301,6 +301,7 @@ var IncomingMPBridge =
foreach(var n ; new_class.NotificationsToBridge) foreach(var n ; new_class.NotificationsToBridge)
{ {
print(" Incoming bridge notification type --> ",n.NotificationType); print(" Incoming bridge notification type --> ",n.NotificationType);
n.IncomingMessageIndex = OutgoingMPBridge.StartMessageIndex;
new_class.NotificationsToBridge_Lookup[n.TypeId] = n; new_class.NotificationsToBridge_Lookup[n.TypeId] = n;
} }
new_class.MPout = ""; new_class.MPout = "";
@ -316,7 +317,6 @@ var IncomingMPBridge =
me.MpVariable = _root~"sim/multiplay/"~new_class.MPpropertyBase~"["~new_class.MPidx~"]"; me.MpVariable = _root~"sim/multiplay/"~new_class.MPpropertyBase~"["~new_class.MPidx~"]";
me.CallsignPath = _root~"callsign"; me.CallsignPath = _root~"callsign";
me.PropertyRoot = _root; me.PropertyRoot = _root;
me.IncomingMessageIndex = OutgoingMPBridge.StartMessageIndex;
setlistener(me.MpVariable, func(v) setlistener(me.MpVariable, func(v)
{ {
@ -367,9 +367,11 @@ var IncomingMPBridge =
} else { } else {
bridged_notification.FromIncomingBridge = 1; bridged_notification.FromIncomingBridge = 1;
bridged_notification.Callsign = me.GetCallsign(); bridged_notification.Callsign = me.GetCallsign();
if(IncomingMPBridge.trace) if(IncomingMPBridge.trace>1)
print("ProcessIncoming ",bridged_notification.Callsign," ",me.PropertyRoot, "idx=",msg_idx, " bridge_idx=",me.IncomingMessageIndex); print("ProcessIncoming callsign=",bridged_notification.Callsign," ",me.PropertyRoot, " msg_type=",msg_type_id," idx=",msg_idx, " bridge_idx=",bridged_notification.IncomingMessageIndex);
if (msg_idx > me.IncomingMessageIndex) { if (msg_idx > bridged_notification.IncomingMessageIndex) {
if(IncomingMPBridge.trace==1)
print("ProcessIncoming callsign=",bridged_notification.Callsign," ",me.PropertyRoot, " msg_type=",msg_type_id," idx=",msg_idx, " bridge_idx=",bridged_notification.IncomingMessageIndex);
var msg_body = encoded_notification[3]; var msg_body = encoded_notification[3];
if (IncomingMPBridge.trace > 2) if (IncomingMPBridge.trace > 2)
print("received idx=",msg_idx," ",msg_type_id,":",bridged_notification.NotificationType); print("received idx=",msg_idx," ",msg_type_id,":",bridged_notification.NotificationType);
@ -380,16 +382,22 @@ var IncomingMPBridge =
if (IncomingMPBridge.trace > 2) if (IncomingMPBridge.trace > 2)
print("Process ",msg_body," len=",msglen, " BPsize = ",size(bridgedProperties)); print("Process ",msg_body," len=",msglen, " BPsize = ",size(bridgedProperties));
var pos = 0; var pos = 0;
for (var bpi = 0; bpi < size(bridgedProperties); bpi += 1) { for (var bpi = 0; bpi < size(bridgedProperties); bpi += 1) {
if (pos < msglen) { if (pos < msglen) {
if (IncomingMPBridge.trace > 2) if (IncomingMPBridge.trace > 2)
print("dec: pos ",pos); print("dec: pos ",pos);
var bp = bridgedProperties[bpi]; var bp = bridgedProperties[bpi];
dv = bp.setValue(msg_body, me, pos); dv = bp.setValue(msg_body, me, pos);
if (IncomingMPBridge.trace > 2) if (IncomingMPBridge.trace > 2)
print(" --> next pos ",pos); print(" --> next pos ",pos);
if (dv.pos == pos or dv.pos > msglen) if (dv.pos == pos or dv.pos > msglen)
break; break;
pos = dv.pos; pos = dv.pos;
} else { } else {
print("Error: emesary.IncomingBridge.ProcessIncoming: [",bridged_notification.NotificationType,"] supplementary encoded value at position ",bpi); print("Error: emesary.IncomingBridge.ProcessIncoming: [",bridged_notification.NotificationType,"] supplementary encoded value at position ",bpi);
@ -403,7 +411,7 @@ var IncomingMPBridge =
if (bridged_notification.Ident == "none") if (bridged_notification.Ident == "none")
bridged_notification.Ident = "mp-bridge"; bridged_notification.Ident = "mp-bridge";
me.Transmitter.NotifyAll(bridged_notification); me.Transmitter.NotifyAll(bridged_notification);
me.IncomingMessageIndex = msg_idx; bridged_notification.IncomingMessageIndex = msg_idx;
} }
} }
} }