Make sure that services from SystemBroadcast are also available from Broadcast on closed media

This commit is contained in:
Nanosonde 2020-06-09 12:21:00 +02:00
parent f84e434bae
commit 66b31a6dd7

View File

@ -118,8 +118,14 @@ void ApplicationLayer::dataBroadcastIndication(HopCountType hopType, Priority pr
break; break;
} }
default: default:
#if (MEDIUM_TYPE == 5)||(MEDIUM_TYPE == 0)
// Make sure we also check if it is a service normally available only on SystemBroadcast on open media
dataSystemBroadcastIndication(hopType, priority, source, apdu);
#else
print("Broadcast-indication: unhandled APDU-Type: "); print("Broadcast-indication: unhandled APDU-Type: ");
println(apdu.type()); println(apdu.type());
break;
#endif
} }
} }
@ -159,8 +165,14 @@ void ApplicationLayer::dataBroadcastConfirm(AckType ack, HopCountType hopType, P
break; break;
} }
default: default:
#if (MEDIUM_TYPE == 5)||(MEDIUM_TYPE == 0)
// Make sure we also check if it is a service normally available only on SystemBroadcast on open media
dataSystemBroadcastConfirm(hopType, priority, apdu, status);
#else
print("Broadcast-confirm: unhandled APDU-Type: "); print("Broadcast-confirm: unhandled APDU-Type: ");
println(apdu.type()); println(apdu.type());
break;
#endif
} }
} }
@ -198,7 +210,11 @@ void ApplicationLayer::dataSystemBroadcastIndication(HopCountType hopType, Prior
break; break;
} }
default: default:
#if (MEDIUM_TYPE == 5)||(MEDIUM_TYPE == 0)
print("Broadcast-indication: unhandled APDU-Type: ");
#else
print("SystemBroadcast-indication: unhandled APDU-Type: "); print("SystemBroadcast-indication: unhandled APDU-Type: ");
#endif
println(apdu.type()); println(apdu.type());
break; break;
} }
@ -238,7 +254,11 @@ void ApplicationLayer::dataSystemBroadcastConfirm(HopCountType hopType, Priority
break; break;
} }
default: default:
#if (MEDIUM_TYPE == 5)||(MEDIUM_TYPE == 0)
print("Broadcast-confirm: unhandled APDU-Type: ");
#else
print("SystemBroadcast-confirm: unhandled APDU-Type: "); print("SystemBroadcast-confirm: unhandled APDU-Type: ");
#endif
println(apdu.type()); println(apdu.type());
break; break;
} }