@@ -1611,6 +1611,27 @@ void OnBasicFailure(void * context, CHIP_ERROR error)
16111611 commissioner->CommissioningStageComplete (error);
16121612}
16131613
1614+ static void NonConcurrentTimeout (void * context, CHIP_ERROR error)
1615+ {
1616+ if (error == CHIP_ERROR_TIMEOUT)
1617+ {
1618+ ChipLogProgress (Controller, " Non-concurrent mode: Expected NetworkResponse Timeout, do nothing"
1619+ }
1620+ else
1621+ {
1622+ ChipLogProgress (Controller, " Non-concurrent mode: Received failure response %" Format ());
1623+ }
1624+ }
1625+
1626+ static void NonConcurrentNetworkResponse (void * context,
1627+ const NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & data)
1628+ {
1629+ // In Non Concurrent mode the commissioning network should have been shut down and not sent the
1630+ // ConnectNetworkResponse. In case it does send it this handles the message
1631+ ChipLogError (Controller, " Non-concurrent Mode : Received Unexpected ConnectNetwork response, ignoring. Status=%u"
1632+ to_underlying (data.networkingStatus ));
1633+ }
1634+
16141635void DeviceCommissioner::CleanupCommissioning (DeviceProxy * proxy, NodeId nodeId, const CompletionStatus & completionStatus)
16151636{
16161637 commissioningCompletionStatus = completionStatus;
@@ -2111,6 +2132,16 @@ void DeviceCommissioner::ParseCommissioningInfo2()
21112132 ReadCommissioningInfo2 info;
21122133 CHIP_ERROR return_err = CHIP_NO_ERROR;
21132134
2135+ using namespace chip ::app::Clusters::GeneralCommissioning::Attributes;
2136+ CHIP_ERROR err =
2137+ mAttributeCache ->Get <SupportsConcurrentConnection::TypeInfo>(kRootEndpointId , info.supportsConcurrentConnection );
2138+ if (err != CHIP_NO_ERROR)
2139+ {
2140+ // May not be present so don't return the error code, non fatal, default concurrent
2141+ ChipLogError (Controller, " Failed to read SupportsConcurrentConnection: %" Format ());
2142+ info.supportsConcurrentConnection = true ;
2143+ }
2144+
21142145 return_err = ParseFabrics (info);
21152146
21162147 if (return_err == CHIP_NO_ERROR)
@@ -2206,6 +2237,8 @@ CHIP_ERROR DeviceCommissioner::ParseICDInfo(ReadCommissioningInfo2 & info)
22062237 }
22072238 else if (err == CHIP_ERROR_KEY_NOT_FOUND)
22082239 {
2240+ // This key is optional so not an error
2241+ err = CHIP_NO_ERROR;
22092242 info.isIcd = false ;
22102243 }
22112244 else if (err == CHIP_ERROR_IM_STATUS_CODE_RECEIVED)
@@ -2440,6 +2473,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
24402473 case CommissioningStage::kReadCommissioningInfo : {
24412474 ChipLogProgress (Controller, " Sending read request for commissioning information"
24422475 // NOTE: this array cannot have more than 9 entries, since the spec mandates that server only needs to support 9
2476+ // See R1.1, 2.11.2 Interaction Model Limits
24432477 app::AttributePathParams readPaths[9 ];
24442478 // Read all the feature maps for all the networking clusters on any endpoint to determine what is supported
24452479 readPaths[0 ] = app::AttributePathParams (app::Clusters::NetworkCommissioning::Id,
@@ -2471,7 +2505,14 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
24712505 case CommissioningStage::kReadCommissioningInfo2 : {
24722506 size_t numberOfAttributes = 0 ;
24732507 // This is done in a separate step since we've already used up all the available read paths in the previous read step
2474- app::AttributePathParams readPaths[9 ];
2508+ // NOTE: this array cannot have more than 9 entries, since the spec mandates that server only needs to support 9
2509+ // See R1.1, 2.11.2 Interaction Model Limits
2510+ app::AttributePathParams readPaths[3 ];
2511+
2512+ // Mandatory attribute
2513+ readPaths[numberOfAttributes++] =
2514+ app::AttributePathParams (endpoint, app::Clusters::GeneralCommissioning::Id,
2515+ app::Clusters::GeneralCommissioning::Attributes::SupportsConcurrentConnection::Id);
24752516
24762517 // Read the current fabrics
24772518 if (params.GetCheckForMatchingFabric ())
@@ -2486,18 +2527,6 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
24862527 app::AttributePathParams (endpoint, IcdManagement::Id, IcdManagement::Attributes::FeatureMap::Id);
24872528 }
24882529
2489- // Current implementation makes sense when we only have a few attributes to read with conditions. Should revisit this if we
2490- // are adding more attributes here.
2491-
2492- if (numberOfAttributes == 0 )
2493- {
2494- // We don't actually want to do this step, so just bypass it
2495- ChipLogProgress (Controller, " kReadCommissioningInfo2 step called without parameter set, skipping"
2496- CommissioningStageComplete (CHIP_NO_ERROR);
2497- return ;
2498- }
2499-
2500- ChipLogProgress (Controller, " Sending request for commissioning information -- Part 2"
25012530 SendCommissioningReadRequest (proxy, timeout, readPaths, numberOfAttributes);
25022531 }
25032532 break ;
@@ -2918,7 +2947,31 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
29182947 NetworkCommissioning::Commands::ConnectNetwork::Type request;
29192948 request.networkID = params.GetWiFiCredentials ().Value ().ssid ;
29202949 request.breadcrumb .Emplace (breadcrumb);
2921- CHIP_ERROR err = SendCommand (proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout);
2950+
2951+ CHIP_ERROR err = CHIP_NO_ERROR;
2952+ GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo::Type supportsConcurrentConnection;
2953+ supportsConcurrentConnection = params.GetSupportsConcurrentConnection ().Value ();
2954+ ChipLogProgress (Controller, " SendCommand kWiFiNetworkEnable, supportsConcurrentConnection=%d"
2955+ supportsConcurrentConnection);
2956+ if (supportsConcurrentConnection)
2957+ {
2958+ err = SendCommand (proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout);
2959+ }
2960+ else
2961+ {
2962+ // Concurrent Connections not allowed. Send the ConnectNetwork command but do not wait for the
2963+ // ConnectNetworkResponse on the Commissioning network as it will not be present. Log the expected timeout
2964+ // and run what would have been in the onConnectNetworkResponse callback.
2965+ err = SendCommand (proxy, request, NonConcurrentNetworkResponse, NonConcurrentTimeout, endpoint, NullOptional);
2966+ if (err == CHIP_NO_ERROR)
2967+ {
2968+ // As there will be no ConnectNetworkResponse, it is an implicit kSuccess so a default report is fine
2969+ CommissioningDelegate::CommissioningReport report;
2970+ CommissioningStageComplete (CHIP_NO_ERROR, report);
2971+ return ;
2972+ }
2973+ }
2974+
29222975 if (err != CHIP_NO_ERROR)
29232976 {
29242977 // We won't get any async callbacks here, so just complete our stage.
0 commit comments