[ccm] Fix discovery response format for CCM networks when non-CCM rou…

…ters are not allowed.

For 1.2 certification (specifically "TC 5.2.4 (DISC-TC-04): 1.1/1.2 non-CCM Joiner does not join CCM Network"):
CCM networks are supposed to include AE port and NMKP port, and NOT include the legacy joiner UDP port, so that the non-CCM router that is trying to join can see the discovery response and not proceed with joining.  AE port / NMKP port, and other CCM concepts are now deprecated in the OpenThread stack.  Still, we need some hooks here to pass certification properly.

1. Don't include joiner UDP port when non-CCM routers are not allowed on the network.
2. Non-CCM joiners should not proceed with joining when joiner UDP port is not included.
3. Also following up with test harness implementation to fix the scripting for 1.2 certification test "TC 5.2.4 (DISC-TC-04): 1.1/1.2 non-CCM Joiner does not join CCM Network"

src/core/thread/discover_scanner.cpp

@@ -304,6 +304,7 @@ void DiscoverScanner::HandleDiscoveryResponse(Mle::RxInfo &aRxInfo) const
     uint16_t                      offset;
     uint16_t                      end;
     bool                          didCheckSteeringData = false;
+    bool                          joinerUdpPortTlvPresent = false;
 
     Mle::Log(Mle::kMessageReceive, Mle::kTypeDiscoveryResponse, aRxInfo.mMessageInfo.GetPeerAddr());
 
@@ -375,6 +376,7 @@ void DiscoverScanner::HandleDiscoveryResponse(Mle::RxInfo &aRxInfo) const
         case MeshCoP::Tlv::kJoinerUdpPort:
             SuccessOrExit(error =
                               Tlv::Read<MeshCoP::JoinerUdpPortTlv>(aRxInfo.mMessage, offset, result.mJoinerUdpPort));
+            joinerUdpPortTlvPresent = true;
             break;
 
         default:
@@ -386,6 +388,8 @@ void DiscoverScanner::HandleDiscoveryResponse(Mle::RxInfo &aRxInfo) const
 
     VerifyOrExit(!mEnableFiltering || didCheckSteeringData);
 
+    VerifyOrExit(joinerUdpPortTlvPresent, error = kErrorDrop);
+
     mCallback.InvokeIfSet(&result);
 
 exit:

src/core/thread/mle_router.cpp

@@ -2909,8 +2909,12 @@ Error MleRouter::SendDiscoveryResponse(const Ip6::Address &aDestination, const M
         }
     }
 
-    SuccessOrExit(
-        error = Tlv::Append<MeshCoP::JoinerUdpPortTlv>(*message, Get<MeshCoP::JoinerRouter>().GetJoinerUdpPort()));
+    if (! Get<KeyManager>().GetSecurityPolicy().mCommercialCommissioningEnabled
+        || Get<KeyManager>().GetSecurityPolicy().mNonCcmRoutersEnabled)
+    {
+        SuccessOrExit(
+            error = Tlv::Append<MeshCoP::JoinerUdpPortTlv>(*message, Get<MeshCoP::JoinerRouter>().GetJoinerUdpPort()));
+    }
 
     tlv.SetLength(static_cast<uint8_t>(message->GetLength() - startOffset));
     message->Write(startOffset - sizeof(tlv), tlv);