Linux: Tidy up ifdefs around app options (#33721)

* Linux: Tidy up ifdefs around app options

Use consistent ifdef conditions between member definitions, option definition,
option handling code, and help text.

* There is no need to hand-allocate option numbers

examples/platform/linux/Options.cpp

@@ -54,57 +54,57 @@ LinuxDeviceOptions gDeviceOptions;
 // Follow the code style of command line arguments in case we need to add more options in the future.
 enum
 {
- kDeviceOption_BleDevice  = 0x1000,
- kDeviceOption_WiFi = 0x1001,
- kDeviceOption_Thread = 0x1002,
- kDeviceOption_Version = 0x1003,
- kDeviceOption_VendorID = 0x1004,
- kDeviceOption_ProductID = 0x1005,
- kDeviceOption_CustomFlow = 0x1006,
- kDeviceOption_Capabilities = 0x1007,
- kDeviceOption_Discriminator = 0x1008,
- kDeviceOption_Passcode = 0x1009,
+ kDeviceOption_BleDevice = 0x1000,
+ kDeviceOption_WiFi,
+ kDeviceOption_Thread,
+ kDeviceOption_Version,
+ kDeviceOption_VendorID,
+ kDeviceOption_ProductID,
+ kDeviceOption_CustomFlow,
+ kDeviceOption_Capabilities,
+ kDeviceOption_Discriminator,
+ kDeviceOption_Passcode,
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE || CHIP_DEVICE_ENABLE_PORT_PARAMS
- kDeviceOption_SecuredDevicePort = 0x100a,
- kDeviceOption_UnsecuredCommissionerPort = 0x100b,
+ kDeviceOption_SecuredDevicePort,
+ kDeviceOption_UnsecuredCommissionerPort,
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
- kDeviceOption_SecuredCommissionerPort = 0x100c,
+ kDeviceOption_SecuredCommissionerPort,
+ kCommissionerOption_FabricID,
 #endif
- kDeviceOption_Command = 0x100d,
- kDeviceOption_PICS = 0x100e,
- kDeviceOption_KVS = 0x100f,
- kDeviceOption_InterfaceId = 0x1010,
- kDeviceOption_Spake2pVerifierBase64 = 0x1011,
- kDeviceOption_Spake2pSaltBase64 = 0x1012,
- kDeviceOption_Spake2pIterations = 0x1013,
- kDeviceOption_TraceFile = 0x1014,
- kDeviceOption_TraceLog = 0x1015,
- kDeviceOption_TraceDecode = 0x1016,
- kOptionCSRResponseCSRIncorrectType = 0x1017,
- kOptionCSRResponseCSRNonceIncorrectType = 0x1018,
- kOptionCSRResponseCSRNonceTooLong = 0x1019,
- kOptionCSRResponseCSRNonceInvalid = 0x101a,
- kOptionCSRResponseNOCSRElementsTooLong = 0x101b,
- kOptionCSRResponseAttestationSignatureIncorrectType = 0x101c,
- kOptionCSRResponseAttestationSignatureInvalid = 0x101d,
- kOptionCSRResponseCSRExistingKeyPair = 0x101e,
- kDeviceOption_TestEventTriggerEnableKey = 0x101f,
- kCommissionerOption_FabricID = 0x1020,
- kTraceTo = 0x1021,
- kOptionSimulateNoInternalTime = 0x1022,
+ kDeviceOption_Command,
+ kDeviceOption_PICS,
+ kDeviceOption_KVS,
+ kDeviceOption_InterfaceId,
+ kDeviceOption_Spake2pVerifierBase64,
+ kDeviceOption_Spake2pSaltBase64,
+ kDeviceOption_Spake2pIterations,
+ kDeviceOption_TraceFile,
+ kDeviceOption_TraceLog,
+ kDeviceOption_TraceDecode,
+ kOptionCSRResponseCSRIncorrectType,
+ kOptionCSRResponseCSRNonceIncorrectType,
+ kOptionCSRResponseCSRNonceTooLong,
+ kOptionCSRResponseCSRNonceInvalid,
+ kOptionCSRResponseNOCSRElementsTooLong,
+ kOptionCSRResponseAttestationSignatureIncorrectType,
+ kOptionCSRResponseAttestationSignatureInvalid,
+ kOptionCSRResponseCSRExistingKeyPair,
+ kDeviceOption_TestEventTriggerEnableKey,
+ kTraceTo,
+ kOptionSimulateNoInternalTime,
 #if defined(PW_RPC_ENABLED)
- kOptionRpcServerPort = 0x1023,
+ kOptionRpcServerPort,
 #endif
 #if CONFIG_BUILD_FOR_HOST_UNIT_TEST
- kDeviceOption_SubscriptionCapacity = 0x1024,
+ kDeviceOption_SubscriptionCapacity,
 #endif
- kDeviceOption_WiFiSupports5g = 0x1025,
+ kDeviceOption_WiFiSupports5g,
 #if CONFIG_BUILD_FOR_HOST_UNIT_TEST
- kDeviceOption_SubscriptionResumptionRetryIntervalSec = 0x1026,
+ kDeviceOption_SubscriptionResumptionRetryIntervalSec,
 #endif
 #if CHIP_WITH_NLFAULTINJECTION
- kDeviceOption_FaultInjection = 0x1027,
+ kDeviceOption_FaultInjection,
 #endif
 };
 
@@ -137,6 +137,7 @@ OptionDef sDeviceOptionDefs[] = {
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
  { "secured-commissioner-port", kArgumentRequired, kDeviceOption_SecuredCommissionerPort },
+ { "commissioner-fabric-id", kArgumentRequired, kCommissionerOption_FabricID },
 #endif
  { "command", kArgumentRequired, kDeviceOption_Command },
  { "PICS", kArgumentRequired, kDeviceOption_PICS },
@@ -156,7 +157,6 @@ OptionDef sDeviceOptionDefs[] = {
  { "cert_error_attestation_signature_incorrect_type", kNoArgument, kOptionCSRResponseAttestationSignatureIncorrectType },
  { "cert_error_attestation_signature_invalid", kNoArgument, kOptionCSRResponseAttestationSignatureInvalid },
  { "enable-key", kArgumentRequired, kDeviceOption_TestEventTriggerEnableKey },
- { "commissioner-fabric-id", kArgumentRequired, kCommissionerOption_FabricID },
 #if ENABLE_TRACING
  { "trace-to", kArgumentRequired, kTraceTo },
 #endif
@@ -239,15 +239,15 @@ const char * sDeviceOptionHelp =
  " A 16-bit unsigned integer specifying the port to use for unsecured commissioner messages (default is 5550).\n"
  "\n"
 #endif
-#if CHIP_DEVICE_ENABLE_PORT_PARAMS
+#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
  " --secured-commissioner-port <port>\n"
  " A 16-bit unsigned integer specifying the listen port to use for secure commissioner messages (default is 5552). Only "
  "valid when app is both device and commissioner\n"
  "\n"
-#endif
  " --commissioner-fabric-id <fabricid>\n"
  " The fabric ID to be used when this device is a commissioner (default in code is 1).\n"
  "\n"
+#endif
  " --command <command-name>\n"
  " A name for a command to execute during startup.\n"
  "\n"
@@ -476,6 +476,11 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
  case kDeviceOption_SecuredCommissionerPort:
  LinuxDeviceOptions::GetInstance().securedCommissionerPort = static_cast<uint16_t>(atoi(aValue));
  break;
+ case kCommissionerOption_FabricID: {
+ char * eptr;
+ LinuxDeviceOptions::GetInstance().commissionerFabricId = (chip::FabricId) strtoull(aValue, &eptr, 0);
+ break;
+ }
 #endif
 
  case kDeviceOption_Command:
@@ -550,11 +555,6 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
 
  break;
  }
- case kCommissionerOption_FabricID: {
- char * eptr;
- LinuxDeviceOptions::GetInstance().commissionerFabricId = (chip::FabricId) strtoull(aValue, &eptr, 0);
- break;
- }
 #if ENABLE_TRACING
  case kTraceTo:
  LinuxDeviceOptions::GetInstance().traceTo.push_back(aValue);

examples/platform/linux/Options.h

@@ -52,21 +52,23 @@ struct LinuxDeviceOptions
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE || CHIP_DEVICE_ENABLE_PORT_PARAMS
  uint16_t securedDevicePort = CHIP_PORT;
  uint16_t unsecuredCommissionerPort = CHIP_UDC_PORT;
-#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE || CHIP_DEVICE_ENABLE_PORT_PARAMS
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
- uint16_t securedCommissionerPort = CHIP_PORT + 12; // TODO: why + 12?
-#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+ uint16_t securedCommissionerPort = CHIP_PORT + 12; // TODO: why + 12?
+ chip::FabricId commissionerFabricId = chip::kUndefinedFabricId;
+#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
  const char * command = nullptr;
  const char * PICS = nullptr;
  const char * KVS = nullptr;
  chip::Inet::InterfaceId interfaceId = chip::Inet::InterfaceId::Null();
- bool traceStreamDecodeEnabled = false;
- bool traceStreamToLogEnabled = false;
+#if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
+ bool traceStreamDecodeEnabled = false;
+ bool traceStreamToLogEnabled = false;
  chip::Optional<std::string> traceStreamFilename;
+#endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
  chip::Credentials::DeviceAttestationCredentialsProvider * dacProvider = nullptr;
  chip::CSRResponseOptions mCSRResponseOptions;
  uint8_t testEventTriggerEnableKey[16] = { 0 };
- chip::FabricId commissionerFabricId = chip::kUndefinedFabricId;
  std::vector<std::string> traceTo;
  bool mSimulateNoInternalTime = false;
 #if defined(PW_RPC_ENABLED)