Skip to content

Commit 8f90675

Browse files
pan-applepull[bot]
pan-apple
authored and
pull[bot]
committed
Move FabricTable class out of transport layer
1 parent dce301a commit 8f90675

File tree

15 files changed

+14
-13
lines changed

15 files changed

+14
-13
lines changed

‎examples/common/pigweed/rpc_services/Device.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
#include <platform/CHIPDeviceConfig.h>
2222

2323
#include "app/server/Server.h"
24+
#include "credentials/FabricTable.h"
2425
#include "device_service/device_service.rpc.pb.h"
2526
#include "platform/ConfigurationManager.h"
2627
#include "platform/PlatformManager.h"
27-
#include "transport/FabricTable.h"
2828

2929
namespace chip {
3030
namespace rpc {

‎examples/ota-requestor-app/ota-requestor-common/ExampleOTARequestor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <app-common/zap-generated/cluster-objects.h>
2222
#include <app/CommandHandler.h>
2323
#include <app/util/af-enums.h>
24-
#include <transport/FabricTable.h>
24+
#include <credentials/FabricTable.h>
2525

2626
// An example implementation for how an application might handle receiving an AnnounceOTAProvider command. In this case, the
2727
// AnnounceOTAProvider command will be used as a trigger to send a QueryImage command and begin the OTA process. This class also

‎src/app/clusters/operational-credentials-server/operational-credentials-server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include <credentials/CHIPCert.h>
3737
#include <credentials/DeviceAttestationConstructor.h>
3838
#include <credentials/DeviceAttestationCredsProvider.h>
39+
#include <credentials/FabricTable.h>
3940
#include <credentials/examples/DeviceAttestationCredsExample.h>
4041
#include <lib/core/CHIPSafeCasts.h>
4142
#include <lib/core/PeerId.h>
@@ -44,7 +45,6 @@
4445
#include <lib/support/logging/CHIPLogging.h>
4546
#include <platform/CHIPDeviceLayer.h>
4647
#include <string.h>
47-
#include <transport/FabricTable.h>
4848

4949
using namespace chip;
5050
using namespace ::chip::DeviceLayer;

‎src/app/server/Dnssd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#if CHIP_ENABLE_ROTATING_DEVICE_ID
3333
#include <setup_payload/AdditionalDataPayloadGenerator.h>
3434
#endif
35+
#include <credentials/FabricTable.h>
3536
#include <system/TimeSource.h>
36-
#include <transport/FabricTable.h>
3737

3838
#include <app/server/Server.h>
3939

‎src/app/server/Server.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <app/OperationalDeviceProxy.h>
2121
#include <app/server/AppDelegate.h>
2222
#include <app/server/CommissioningWindowManager.h>
23+
#include <credentials/FabricTable.h>
2324
#include <inet/InetConfig.h>
2425
#include <messaging/ExchangeMgr.h>
2526
#include <platform/KeyValueStoreManager.h>
@@ -28,7 +29,6 @@
2829
#include <protocols/secure_channel/PASESession.h>
2930
#include <protocols/secure_channel/RendezvousParameters.h>
3031
#include <protocols/user_directed_commissioning/UserDirectedCommissioning.h>
31-
#include <transport/FabricTable.h>
3232
#include <transport/SessionManager.h>
3333
#include <transport/TransportMgr.h>
3434
#include <transport/TransportMgrBase.h>

‎src/controller/CHIPDeviceController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <controller/OperationalCredentialsDelegate.h>
4040
#include <controller/SetUpCodePairer.h>
4141
#include <credentials/DeviceAttestationVerifier.h>
42+
#include <credentials/FabricTable.h>
4243
#include <lib/core/CHIPConfig.h>
4344
#include <lib/core/CHIPCore.h>
4445
#include <lib/core/CHIPPersistentStorageDelegate.h>
@@ -51,7 +52,6 @@
5152
#include <protocols/secure_channel/MessageCounterManager.h>
5253
#include <protocols/secure_channel/RendezvousParameters.h>
5354
#include <protocols/user_directed_commissioning/UserDirectedCommissioning.h>
54-
#include <transport/FabricTable.h>
5555
#include <transport/SessionManager.h>
5656
#include <transport/TransportMgr.h>
5757
#include <transport/raw/UDP.h>

‎src/controller/CHIPDeviceControllerSystemState.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#pragma once
3131

3232
#include <app/DeviceControllerInteractionModelDelegate.h>
33+
#include <credentials/FabricTable.h>
3334
#include <protocols/secure_channel/MessageCounterManager.h>
34-
#include <transport/FabricTable.h>
3535
#include <transport/TransportMgr.h>
3636
#include <transport/raw/UDP.h>
3737
#if CONFIG_DEVICE_LAYER

‎src/credentials/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ static_library("credentials") {
3232
"DeviceAttestationVendorReserved.h",
3333
"DeviceAttestationVerifier.cpp",
3434
"DeviceAttestationVerifier.h",
35+
"FabricTable.cpp",
36+
"FabricTable.h",
3537
"GenerateChipX509Cert.cpp",
3638
"GroupDataProvider.h",
3739
"examples/DeviceAttestationCredsExample.cpp",

‎src/transport/FabricTable.cpp ‎src/credentials/FabricTable.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
* @brief Defines a table of fabrics that have provisioned the device.
2020
*/
2121

22+
#include "FabricTable.h"
23+
2224
#include <lib/core/CHIPEncoding.h>
2325
#include <lib/support/CHIPMem.h>
2426
#include <lib/support/CHIPMemString.h>
2527
#include <lib/support/SafeInt.h>
26-
#include <transport/FabricTable.h>
2728
#if CHIP_CRYPTO_HSM
2829
#include <crypto/hsm/CHIPCryptoPALHsm.h>
2930
#endif

‎src/transport/FabricTable.h ‎src/credentials/FabricTable.h

File renamed without changes.

‎src/credentials/tests/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ chip_test_suite("tests") {
4141
"TestChipCert.cpp",
4242
"TestDeviceAttestationConstruction.cpp",
4343
"TestDeviceAttestationCredentials.cpp",
44+
"TestFabricTable.cpp",
4445
"TestGroupDataProvider.cpp",
4546
]
4647

‎src/transport/tests/TestFabricTable.cpp ‎src/credentials/tests/TestFabricTable.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <lib/core/CHIPCore.h>
2828

29-
#include <transport/FabricTable.h>
29+
#include <credentials/FabricTable.h>
3030

3131
#include <lib/support/CodeUtils.h>
3232
#include <lib/support/UnitTestRegistration.h>

‎src/protocols/secure_channel/CASESession.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#if CHIP_CRYPTO_HSM
3131
#include <crypto/hsm/CHIPCryptoPALHsm.h>
3232
#endif
33+
#include <credentials/FabricTable.h>
3334
#include <lib/core/CHIPTLV.h>
3435
#include <lib/support/Base64.h>
3536
#include <messaging/ExchangeContext.h>
@@ -39,7 +40,6 @@
3940
#include <protocols/secure_channel/SessionEstablishmentExchangeDispatch.h>
4041
#include <system/SystemPacketBuffer.h>
4142
#include <transport/CryptoContext.h>
42-
#include <transport/FabricTable.h>
4343
#include <transport/PairingSession.h>
4444
#include <transport/raw/MessageHeader.h>
4545
#include <transport/raw/PeerAddress.h>

‎src/transport/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ static_library("transport") {
2222
sources = [
2323
"CryptoContext.cpp",
2424
"CryptoContext.h",
25-
"FabricTable.cpp",
26-
"FabricTable.h",
2725
"MessageCounter.cpp",
2826
"MessageCounter.h",
2927
"MessageCounterManagerInterface.h",

‎src/transport/tests/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ chip_test_suite("tests") {
2323
output_name = "libTransportLayerTests"
2424

2525
test_sources = [
26-
"TestFabricTable.cpp",
2726
"TestPeerConnections.cpp",
2827
"TestSecureSession.cpp",
2928
"TestSessionHandle.cpp",

0 commit comments

Comments
 (0)