Merge branch 'master' of github.com:openweave/openweave-core

gerickson · gerickson · commit a27730c8b310 · 2018-10-24T21:29:24.000-07:00
diff --git a/src/ble/BLEEndPoint.cpp b/src/ble/BLEEndPoint.cpp
@@ -38,6 +38,7 @@
 #include <Weave/Support/logging/WeaveLogging.h>
 #include <Weave/Support/CodeUtils.h>
 #include <Weave/Support/FlagUtils.hpp>
+#include <Weave/Support/WeaveFaultInjection.h>
 
 #include <BleLayer/BLEEndPoint.h>
 #include <BleLayer/BleLayer.h>
@@ -764,6 +765,17 @@ BLE_ERROR BLEEndPoint::SendNextMessage()
     data = NULL; // Ownership passed to fragmenter's tx buf on PrepareNextFragment success.
 
     // Send first message fragment over the air.
+    WEAVE_FAULT_INJECT(nl::Weave::FaultInjection::kFault_WOBLESend,
+            {
+                if (mRole == kBleRole_Central)
+                {
+                    err = BLE_ERROR_GATT_WRITE_FAILED;
+                } else {
+                    err = BLE_ERROR_GATT_INDICATE_FAILED;
+                }
+                ExitNow();
+            }
+            );
     err = SendCharacteristic(mWoBle.TxPacket());
     SuccessOrExit(err);
 
diff --git a/src/lib/profiles/data-management/Current/MessageDef.cpp b/src/lib/profiles/data-management/Current/MessageDef.cpp
@@ -1,5 +1,6 @@
 /*
  *
+ *    Copyright (c) 2018 Google LLC.
  *    Copyright (c) 2016-2017 Nest Labs, Inc.
  *    All rights reserved.
  *
@@ -47,6 +48,10 @@
 
 #include <stdio.h>
 
+using namespace ::nl;
+using namespace ::nl::Weave;
+using namespace ::nl::Weave::TLV;
+
 #ifndef MIN
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 #endif
@@ -2741,13 +2746,19 @@ WEAVE_ERROR StatusList::Parser::CheckSchemaValidity(void) const
 
     while (WEAVE_NO_ERROR == (err = reader.Next()))
     {
+        TLVType type;
+        uint64_t tag;
+
         // TODO: The spec says the StatusList should be an array of arrays, but in
         // the current implementation it's an array of structures. The array of
         // arrays is less intuitive but more space efficient.
-        VerifyOrExit(nl::Weave::TLV::AnonymousTag == reader.GetTag(), err = WEAVE_ERROR_INVALID_TLV_TAG);
 
-        VerifyOrExit((nl::Weave::TLV::kTLVType_Structure == reader.GetType() ||
-                      nl::Weave::TLV::kTLVType_Array), err = WEAVE_ERROR_WRONG_TLV_TYPE);
+        tag = reader.GetTag();
+        VerifyOrExit(nl::Weave::TLV::AnonymousTag == tag, err = WEAVE_ERROR_INVALID_TLV_TAG);
+
+        type = reader.GetType();
+        VerifyOrExit((nl::Weave::TLV::kTLVType_Structure == type ||
+                      nl::Weave::TLV::kTLVType_Array == type), err = WEAVE_ERROR_WRONG_TLV_TYPE);
 
         {
             StatusElement::Parser status;
diff --git a/src/lib/profiles/data-management/Current/SubscriptionClient.cpp b/src/lib/profiles/data-management/Current/SubscriptionClient.cpp
@@ -832,6 +832,7 @@ WEAVE_ERROR SubscriptionClient::EndSubscription()
     switch (mCurrentState)
     {
     case kState_Subscribing:
+    case kState_Resubscribe_Holdoff:
         // fall through
     case kState_Subscribing_IdAssigned:
 
diff --git a/src/lib/profiles/data-management/Current/SubscriptionClient.h b/src/lib/profiles/data-management/Current/SubscriptionClient.h
@@ -295,6 +295,7 @@ class SubscriptionClient
     bool IsEstablishedIdle() { return (mCurrentState == kState_SubscriptionEstablished_Idle); }
     bool IsFree() { return (mCurrentState == kState_Free); }
     bool IsAborting() { return (mCurrentState == kState_Aborting); }
+    bool IsInResubscribeHoldoff() { return (mCurrentState == kState_Resubscribe_Holdoff); }
 
     void IndicateActivity(void);
 
diff --git a/src/lib/profiles/data-management/Legacy/ProfileDatabase.cpp b/src/lib/profiles/data-management/Legacy/ProfileDatabase.cpp
@@ -429,7 +429,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
                        const uint64_t &aTag,
                        uint32_t aProfileId,
                        const uint64_t &aInstanceId,
-                       uint16_t aPathLen,
+                       uint32_t aPathLen,
                        ...)
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -451,7 +451,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
 
     va_start(pathTags, aPathLen);
 
-    for (int i = 0; i < aPathLen; i++)
+    for (uint32_t i = 0; i < aPathLen; i++)
     {
         err = aWriter.PutNull(va_arg(pathTags, uint64_t));
 
@@ -517,7 +517,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
                        uint32_t aProfileId,
                        const uint32_t aInstanceIdLen,
                        const uint8_t *aInstanceId,
-                       uint16_t aPathLen,
+                       uint32_t aPathLen,
                        ...)
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -539,7 +539,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
 
     va_start(pathTags, aPathLen);
 
-    for (int i = 0; i < aPathLen; i++)
+    for (uint32_t i = 0; i < aPathLen; i++)
     {
         err = aWriter.PutNull(va_arg(pathTags, uint64_t));
 
@@ -598,7 +598,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
                        const uint64_t &aTag,
                        uint32_t aProfileId,
                        const char *aInstanceId,
-                       uint16_t aPathLen,
+                       uint32_t aPathLen,
                        ...)
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -620,7 +620,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
 
     va_start(pathTags, aPathLen);
 
-    for (int i = 0; i < aPathLen; i++)
+    for (uint32_t i = 0; i < aPathLen; i++)
     {
         err = aWriter.PutNull(va_arg(pathTags, uint64_t));
 
@@ -679,7 +679,7 @@ WEAVE_ERROR EncodeDeprecatedPath(TLVWriter &aWriter,
                                  const uint64_t &aTag,
                                  uint32_t aProfileId,
                                  const uint64_t &aInstanceId,
-                                 uint16_t aPathLen,
+                                 uint32_t aPathLen,
                                  ...)
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -709,7 +709,7 @@ WEAVE_ERROR EncodeDeprecatedPath(TLVWriter &aWriter,
 
     va_start(pathTags, aPathLen);
 
-    for (int i = 0; i < aPathLen; i++)
+    for (uint32_t i = 0; i < aPathLen; i++)
     {
         err = aWriter.PutNull(va_arg(pathTags, uint64_t));
 
@@ -768,7 +768,7 @@ WEAVE_ERROR EncodeDeprecatedPath(TLVWriter &aWriter,
                                  const uint64_t &aTag,
                                  uint32_t aProfileId,
                                  const char *aInstanceId,
-                                 uint16_t aPathLen,
+                                 uint32_t aPathLen,
                                  ...)
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -798,7 +798,7 @@ WEAVE_ERROR EncodeDeprecatedPath(TLVWriter &aWriter,
 
     va_start(pathTags, aPathLen);
 
-    for (int i = 0; i < aPathLen; i++)
+    for (uint32_t i = 0; i < aPathLen; i++)
     {
         err = aWriter.PutNull(va_arg(pathTags, uint64_t));
 
diff --git a/src/lib/profiles/data-management/Legacy/ProfileDatabase.h b/src/lib/profiles/data-management/Legacy/ProfileDatabase.h
@@ -386,22 +386,22 @@ namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNames
                            const uint64_t &aTag,
                            uint32_t aProfileId,
                            const uint64_t &aInstanceId,
-                           uint16_t aPathLen,
+                           uint32_t aPathLen,
                            ...);
 
     WEAVE_ERROR EncodePath(nl::Weave::TLV::TLVWriter &aWriter,
                            const uint64_t &aTag,
                            uint32_t aProfileId,
                            const uint32_t aInstanceIdLen,
                            const uint8_t *aInstanceId,
-                           uint16_t aPathLen,
+                           uint32_t aPathLen,
                            ...);
 
     WEAVE_ERROR EncodePath(nl::Weave::TLV::TLVWriter &aWriter,
                            const uint64_t &aTag,
                            uint32_t aProfileId,
                            const char *aInstanceId,
-                           uint16_t aPathLen,
+                           uint32_t aPathLen,
                            ...);
 
     /*
@@ -414,14 +414,14 @@ namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNames
                                      const uint64_t &aTag,
                                      uint32_t aProfileId,
                                      const uint64_t &aInstanceId,
-                                     uint16_t aPathLen,
+                                     uint32_t aPathLen,
                                      ...);
 
     WEAVE_ERROR EncodeDeprecatedPath(nl::Weave::TLV::TLVWriter &aWriter,
                                      const uint64_t &aTag,
                                      uint32_t aProfileId,
                                      const char *aInstanceId,
-                                     uint16_t aPathLen,
+                                     uint32_t aPathLen,
                                      ...);
 
     /**
diff --git a/src/lib/support/WeaveFaultInjection.cpp b/src/lib/support/WeaveFaultInjection.cpp
@@ -74,6 +74,9 @@ static const nl::FaultInjection::Name sFaultNames[] = {
     "TunnelQueueFull",
     "TunnelPacketDropByPolicy",
 #endif // WEAVE_CONFIG_ENABLE_TUNNELING
+#if CONFIG_NETWORK_LAYER_BLE
+    "WOBLESend",
+#endif // CONFIG_NETWORK_LAYER_BLE
 };
 
 
diff --git a/src/lib/support/WeaveFaultInjection.h b/src/lib/support/WeaveFaultInjection.h
@@ -92,6 +92,9 @@ typedef enum
     kFault_TunnelQueueFull,                     /**< Trigger a WEAVE_ERROR_TUNNEL_SERVICE_QUEUE_FULL when enqueueing a packet in the Tunnel queue */
     kFault_TunnelPacketDropByPolicy,            /**< Trigger an explicit drop of the packet as if done by an application policy */
 #endif // WEAVE_CONFIG_ENABLE_TUNNELING
+#if CONFIG_NETWORK_LAYER_BLE
+    kFault_WOBLESend,                           /**< Inject a GATT error when sending the first fragment of a Weave message over BLE */
+#endif // CONFIG_NETWORK_LAYER_BLE
     kFault_NumItems,
 } Id;
 
diff --git a/src/test-apps/MockWdmNodeOptions.cpp b/src/test-apps/MockWdmNodeOptions.cpp
@@ -1,5 +1,6 @@
 /*
  *
+ *    Copyright (c) 2018 Google LLC.
  *    Copyright (c) 2018 Nest Labs, Inc.
  *    All rights reserved.
  *
@@ -515,7 +516,7 @@ bool MockWdmNodeOptions::HandleOption(const char *progName, OptionSet *optSet, i
     }
     case kToolOpt_WdmUpdateNumberOfTraits:
     {
-        int tmp;
+        uint32_t tmp;
 
         if ((!ParseInt(arg, tmp)) || (tmp < 1) || (tmp > mWdmUpdateMaxNumberOfTraits))
         {
diff --git a/src/test-apps/TestDataManagement.cpp b/src/test-apps/TestDataManagement.cpp
@@ -151,12 +151,12 @@ static OptionSet *gToolOptionSets[] =
     }                                                \
   } while (0)
 
-WEAVE_ERROR ValidatePath(TLVReader &aReader,
-                         const uint64_t &aTag,
-                         uint32_t aProfileId,
-                         const uint64_t &aInstanceId,
-                         uint16_t aPathLen,
-                         ...)
+static WEAVE_ERROR ValidatePath(TLVReader &aReader,
+                                const uint64_t &aTag,
+                                uint32_t aProfileId,
+                                const uint64_t &aInstanceId,
+                                uint32_t aPathLen,
+                                ...)
 {
     WEAVE_ERROR err;
 
@@ -237,7 +237,7 @@ WEAVE_ERROR ValidatePath(TLVReader &aReader,
 
     // now, the residual path elements, if any
 
-    for (int i = 0; i < aPathLen; i++)
+    for (uint32_t i = 0; i < aPathLen; i++)
     {
         err = aReader.Next();
         SuccessOrExit(err);
@@ -276,22 +276,6 @@ WEAVE_ERROR ValidatePath(TLVReader &aReader,
     return err;
 }
 
-/*
- * one day we might want to include the other form of instance ID
- * in testing. for now just leave this as a placeholder.
- */
-
-WEAVE_ERROR ValidatePath(nl::Weave::TLV::TLVReader &aReader,
-                         const uint64_t &aTag,
-                         uint32_t aProfileId,
-                         uint32_t aInstanceIdLen,
-                         uint8_t *aInstanceId,
-                         uint16_t aPathLen,
-                         ...)
-{
-    return WEAVE_NO_ERROR;
-}
-
 /*
  * in order to use the "new improved" data management, we have to create
  * a sub-class of the WDM client and supply the relevant methods as follows.
diff --git a/src/test-apps/TestEventLogging.cpp b/src/test-apps/TestEventLogging.cpp
@@ -366,8 +366,6 @@ void TestOpenCloseState::EvolveState(void)
     }
 }
 
-const uint32_t gProfileList[] = { OpenCloseProfileID };
-
 WEAVE_ERROR WriteOpenCloseState(nl::Weave::TLV::TLVWriter & writer, uint8_t inDataTag, void * anAppState)
 {
     TestOpenCloseState * state = NULL;
@@ -2035,7 +2033,7 @@ static void CheckGapDetection(nlTestSuite *inSuite, void *inContext)
     event_id_t eventId_A = nl::Weave::Profiles::DataManagement::LogEvent(testSchema, nl::SerializedDataToTLVWriterHelper, (void *)&appData);
     event_id_t eventId_B = nl::Weave::Profiles::DataManagement::LogEvent(testSchema, nl::SerializedDataToTLVWriterHelper, (void *)&appData);
 
-    (void)eventId_B;
+    IgnoreUnusedVariable(eventId_B);
 
     // Arrange testReader with all events from the start
     err = FetchEventsHelper(testReader, eventId_A, backingStore, sizeof(backingStore));
@@ -2054,7 +2052,7 @@ static void CheckGapDetection(nlTestSuite *inSuite, void *inContext)
     event_id_t eventId_C = nl::Weave::Profiles::DataManagement::LogEvent(testSchema, nl::SerializedDataToTLVWriterHelper, (void *)&appData);
     event_id_t eventId_D = nl::Weave::Profiles::DataManagement::LogEvent(testSchema, nl::SerializedDataToTLVWriterHelper, (void *)&appData);
 
-    (void)eventId_C;
+    IgnoreUnusedVariable(eventId_C);
 
     // Arrange testReader skipping eventId_C
     err = FetchEventsHelper(testReader, eventId_D, backingStore, sizeof(backingStore));
@@ -2117,8 +2115,8 @@ static void CheckDropOverlap(nlTestSuite *inSuite, void *inContext)
     event_id_t eventId_C = nl::Weave::Profiles::DataManagement::LogEvent(testSchema, nl::SerializedDataToTLVWriterHelper, (void *)&appData);
     event_id_t eventId_D = nl::Weave::Profiles::DataManagement::LogEvent(testSchema, nl::SerializedDataToTLVWriterHelper, (void *)&appData);
 
-    (void)eventId_C;
-    (void)eventId_D;
+    IgnoreUnusedVariable(eventId_C);
+    IgnoreUnusedVariable(eventId_D);
 
     // Arrange testReader overlapping eventId_B
     err = FetchEventsHelper(testReader, eventId_B, backingStore, sizeof(backingStore));
diff --git a/src/test-apps/TestInetEndPoint.cpp b/src/test-apps/TestInetEndPoint.cpp
@@ -375,7 +375,7 @@ static void TestInetEndPoint(nlTestSuite *inSuite, void *inContext)
     err = testTCPEP1->GetPeerInfo(NULL, NULL);
     NL_TEST_ASSERT(inSuite, err == INET_ERROR_INCORRECT_STATE);
     buf = PacketBuffer::New();
-    err = testTCPEP1->Send(buf, NULL);
+    err = testTCPEP1->Send(buf, false);
     NL_TEST_ASSERT(inSuite, err == INET_ERROR_INCORRECT_STATE);
     err = testTCPEP1->EnableKeepAlive(10, 100);
     NL_TEST_ASSERT(inSuite, err == INET_ERROR_INCORRECT_STATE);
diff --git a/src/test-apps/TestInetLayer.cpp b/src/test-apps/TestInetLayer.cpp
@@ -46,7 +46,6 @@ static void HandleConnectionComplete(TCPEndPoint *ep, INET_ERROR conErr);
 static void HandleConnectionReceived(TCPEndPoint *listeningEP, TCPEndPoint *conEP, const IPAddress &peerAddr,
         uint16_t peerPort);
 static void HandleConnectionClosed(TCPEndPoint *ep, INET_ERROR err);
-static void HandlePeerClose(TCPEndPoint *ep);
 static void HandleDataSent(TCPEndPoint *ep, uint16_t len);
 static void HandleDataReceived(TCPEndPoint *ep, PacketBuffer *data);
 static void HandleAcceptError(TCPEndPoint *endPoint, INET_ERROR err);
@@ -631,12 +630,6 @@ void HandleConnectionClosed(TCPEndPoint *ep, INET_ERROR err)
     }
 }
 
-void HandlePeerClose(TCPEndPoint *ep)
-{
-    printf("HandlePeerClose\n");
-    (void)HandlePeerClose;
-}
-
 void HandleDataSent(TCPEndPoint *ep, uint16_t len)
 {
     printf("Data sent: %ld\n", (long) len);
diff --git a/src/test-apps/TestResourceIdentifier.cpp b/src/test-apps/TestResourceIdentifier.cpp
@@ -1,5 +1,6 @@
 /*
  *
+ *    Copyright (c) 2018 Google LLC.
  *    Copyright (c) 2013-2017 Nest Labs, Inc.
  *    All rights reserved.
  *
@@ -489,7 +490,7 @@ static const nlTest sTests[] = {
     NL_TEST_DEF("Test ResourceIdentifier -- string conversions", CheckStringSerDes),
     NL_TEST_DEF("Test ResourceIdentifier -- TLV conversions", CheckTLVSerDes),
     NL_TEST_DEF("Test ResourceIdentifier -- erroneous TLV", CheckTLVDecodingErrors),
-    NULL,
+    NL_TEST_SENTINEL(),
 };
 
 /**
diff --git a/src/test-apps/TestSerialNumUtils.cpp b/src/test-apps/TestSerialNumUtils.cpp
@@ -165,9 +165,9 @@ void TestMfgDateFromSerialNum(void)
 
     for (MfgDateTestCase *testCase = gMfgDateTestCases; testCase->inYear != 0; testCase++)
     {
-        char serialNum[17];
+        char serialNum[18];
 
-        sprintf(serialNum, "02AA01AB%02d%02d001P", testCase->outMfgWeek, testCase->outMfgYear % 100);
+        snprintf(serialNum, sizeof (serialNum), "02AA01AB%02u%02u001P", testCase->outMfgWeek, testCase->outMfgYear % 100);
 
         err = ExtractManufacturingDateFromSerialNumber(serialNum, year, month, day);
         TestAssert(err == WEAVE_NO_ERROR, "Error returned by ExtractManufacturingDateFromSerialNumber()");
diff --git a/src/test-apps/TestWdmUpdateEncoder.cpp b/src/test-apps/TestWdmUpdateEncoder.cpp
diff --git a/src/test-apps/ToolCommonOptions.h b/src/test-apps/ToolCommonOptions.h
diff --git a/src/test-apps/happy/test-templates/WeaveBle.py b/src/test-apps/happy/test-templates/WeaveBle.py
diff --git a/src/test-apps/happy/test-templates/WeaveBleCentral.py b/src/test-apps/happy/test-templates/WeaveBleCentral.py
diff --git a/src/test-apps/weave-bdx-client-development.cpp b/src/test-apps/weave-bdx-client-development.cpp
diff --git a/src/warm/WarmCore.cpp b/src/warm/WarmCore.cpp

Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,7 @@ WEAVE_ERROR SubscriptionClient::EndSubscription()`
`832`	`832`	`switch (mCurrentState)`
`833`	`833`	`{`
`834`	`834`	`case kState_Subscribing:`
	`835`	`+ case kState_Resubscribe_Holdoff:`
`835`	`836`	`// fall through`
`836`	`837`	`case kState_Subscribing_IdAssigned:`
`837`	`838`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`*`
	`3`	`+ * Copyright (c) 2018 Google LLC.`
`3`	`4`	`* Copyright (c) 2018 Nest Labs, Inc.`
`4`	`5`	`* All rights reserved.`
`5`	`6`	`*`
`@@ -515,7 +516,7 @@ bool MockWdmNodeOptions::HandleOption(const char progName, OptionSet optSet, i`
`515`	`516`	`}`
`516`	`517`	`case kToolOpt_WdmUpdateNumberOfTraits:`
`517`	`518`	`{`
`518`		`- int tmp;`
	`519`	`+ uint32_t tmp;`
`519`	`520`
`520`	`521`	`if ((!ParseInt(arg, tmp)) \|\| (tmp < 1) \|\| (tmp > mWdmUpdateMaxNumberOfTraits))`
`521`	`522`	`{`