Merge pull request #509 from openweave/feature/device-addr-routing-behavior-doc
Add Weave Device Local Addressing and Routing Behavior document
diff --git a/src/device-manager/WeaveDataManagementClient.h b/src/device-manager/WeaveDataManagementClient.h
index 119fe72..24a8ed7 100644
--- a/src/device-manager/WeaveDataManagementClient.h
+++ b/src/device-manager/WeaveDataManagementClient.h
@@ -81,7 +81,8 @@
class NL_DLL_EXPORT GenericTraitUpdatableDataSink : public nl::Weave::Profiles::DataManagement::TraitUpdatableDataSink
{
friend class WdmClient;
-
+ using nl::Weave::Profiles::DataManagement_Current::TraitDataSink::SetData;
+ using nl::Weave::Profiles::DataManagement_Current::TraitUpdatableDataSink::GetData;
private:
GenericTraitUpdatableDataSink(const nl::Weave::Profiles::DataManagement::TraitSchemaEngine * aEngine, WdmClient * apWdmClient);
~GenericTraitUpdatableDataSink(void);
diff --git a/src/device-manager/cocoa/NLGenericTraitUpdatableDataSink_Protected.h b/src/device-manager/cocoa/NLGenericTraitUpdatableDataSink_Protected.h
index 510c764..b286ed3 100644
--- a/src/device-manager/cocoa/NLGenericTraitUpdatableDataSink_Protected.h
+++ b/src/device-manager/cocoa/NLGenericTraitUpdatableDataSink_Protected.h
@@ -42,4 +42,4 @@
- (void)close;
@end
-#endif WEAVE_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL
+#endif // WEAVE_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL
diff --git a/src/device-manager/cocoa/NLNetworkInfo.h b/src/device-manager/cocoa/NLNetworkInfo.h
index cd3c7e0..1e51ab8 100644
--- a/src/device-manager/cocoa/NLNetworkInfo.h
+++ b/src/device-manager/cocoa/NLNetworkInfo.h
@@ -60,7 +60,7 @@
@property (nonatomic, strong) NSData * ThreadPSKc; // The Thread pre-shared key commissioner, or NULL if not specified.
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
+- (instancetype)init;
- (id)initWithWiFiSSID:(NSString *)ssid wifiKey:(NSData *)wifiKey securityType:(NLWiFiSecurityType)securityType;
diff --git a/src/device-manager/cocoa/NLResourceIdentifier.h b/src/device-manager/cocoa/NLResourceIdentifier.h
index ecd2c69..f3a4dd1 100644
--- a/src/device-manager/cocoa/NLResourceIdentifier.h
+++ b/src/device-manager/cocoa/NLResourceIdentifier.h
@@ -29,6 +29,6 @@
@property (nonatomic) int32_t ResourceType;
@property (nonatomic) uint64_t ResourceId;
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithType:(int32_t)type id:(uint64_t)idValue;
+- (instancetype)init;
+- (instancetype)initWithType:(int32_t)type id:(uint64_t)idValue NS_DESIGNATED_INITIALIZER;
@end
diff --git a/src/device-manager/cocoa/NLWdmClient.h b/src/device-manager/cocoa/NLWdmClient.h
index bd77c43..d276574 100644
--- a/src/device-manager/cocoa/NLWdmClient.h
+++ b/src/device-manager/cocoa/NLWdmClient.h
@@ -57,7 +57,7 @@
* @param nodeId Weave node ID
*
*/
-- (void *)setNodeId:(uint64_t)nodeId;
+- (void)setNodeId:(uint64_t)nodeId;
/**
* Create the new data newDataSink
diff --git a/src/device-manager/cocoa/NLWdmClient.mm b/src/device-manager/cocoa/NLWdmClient.mm
index fffdf8e..d50ee8f 100644
--- a/src/device-manager/cocoa/NLWdmClient.mm
+++ b/src/device-manager/cocoa/NLWdmClient.mm
@@ -80,6 +80,7 @@
case nl::Weave::Binding::kEvent_DefaultCheck:
WDM_LOG_DEBUG(@"kEvent_DefaultCheck");
// fall through
+ OS_FALLTHROUGH;
default:
nl::Weave::Binding::DefaultEventHandler(apAppState, aEvent, aInParam, aOutParam);
}
diff --git a/src/device-manager/cocoa/NLWeaveStack.mm b/src/device-manager/cocoa/NLWeaveStack.mm
index a5735e5..fdd06f2 100644
--- a/src/device-manager/cocoa/NLWeaveStack.mm
+++ b/src/device-manager/cocoa/NLWeaveStack.mm
@@ -477,10 +477,10 @@
WDM_LOG_METHOD_SIG();
_mDeviceMgr = [[NLWeaveDeviceManager alloc] init:name
- weaveWorkQueue:_mWorkQueue
- appCallbackQueue:appCallbackQueue
- exchangeMgr:&_mExchangeMgr
- securityMgr:&_mSecurityMgr];
+ weaveWorkQueue:_mWorkQueue
+ appCallbackQueue:appCallbackQueue
+ exchangeMgr:&_mExchangeMgr
+ securityMgr:&_mSecurityMgr];
if (nil == _mDeviceMgr) {
WDM_LOG_ERROR(@"Cannot create new NLWeaveDeviceManager\n");
}
@@ -492,12 +492,12 @@
{
WDM_LOG_METHOD_SIG();
- NLWdmClient * _mWdmClient = [[NLWdmClient alloc] init:name
- weaveWorkQueue:_mWorkQueue
- appCallbackQueue:appCallbackQueue
- exchangeMgr:&_mExchangeMgr
- messageLayer:&_mMessageLayer
- nlWeaveDeviceManager:_mDeviceMgr];
+ _mWdmClient = [[NLWdmClient alloc] init:name
+ weaveWorkQueue:_mWorkQueue
+ appCallbackQueue:appCallbackQueue
+ exchangeMgr:&_mExchangeMgr
+ messageLayer:&_mMessageLayer
+ nlWeaveDeviceManager:_mDeviceMgr];
if (nil == _mWdmClient) {
WDM_LOG_ERROR(@"Cannot create new NLWdmClient\n");
}
