Azure
/
azure-iot-sdks
зеркало из https://github.com/Azure/azure-iot-sdks.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge commit 'a18ae08755d6b3c1460aefaef38a7c860a8b9b19' into HEAD

This commit is contained in:
Azure IoT Builder 2015-09-23 16:22:02 -07:00
Родитель 6273899e34 a18ae08755
Коммит 2e7f9ba65c
11 изменённых файлов: 22 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
c/build_all/packaging/windows/Apache.QPID.Proton.AzureIot.nuspec
Просмотреть файл

@ -16,7 +16,7 @@
Please see http://qpid.apache.org/proton for a more info.</summary>
<releaseNotes>Apache Qpid Proton C AMPQ 1.0 Windows native libraries for Azure Iot Hub. This project is forked from release 0.9.0 with additional changes to support the Azure IoT Hub Client. See project site for details.</releaseNotes>
<copyright>Copyright 2015</copyright>
<tags>AMQP Qpid Proton Azure IoT Native x86 x64 nativepackage</tags>
<tags>AMQP Qpid Proton Azure IoT Native x86 x64 native package</tags>
<dependencies>
</dependencies>
</metadata>

10
c/iothub_client/build/windows/iothub_client.vcxproj
Просмотреть файл

@ -31,16 +31,6 @@
<ClCompile Include="..\..\src\iothub_message.c" />
<ClCompile Include="..\..\src\version.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\common\build\windows\common.vcxproj">
<Project>{9f55377b-6c37-4700-9866-e070d64ade0f}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F17F4374-023D-455F-B254-5A87B6691395}</ProjectGuid>
<Keyword>Win32Proj</Keyword>

3
c/iothub_client/samples/iothub_client_sample_amqp/windows/iothub_client_sample_amqp.vcxproj
Просмотреть файл

@ -165,6 +165,9 @@
<ClCompile Include="main.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\common\build\windows\common.vcxproj">
<Project>{9f55377b-6c37-4700-9866-e070d64ade0f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\build\windows\iothub_client.vcxproj">
<Project>{f17f4374-023d-455f-b254-5a87b6691395}</Project>
</ProjectReference>

3
c/iothub_client/samples/iothub_client_sample_http/windows/iothub_client_sample_http.vcxproj
Просмотреть файл

@ -172,6 +172,9 @@
<ClCompile Include="main.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\common\build\windows\common.vcxproj">
<Project>{9f55377b-6c37-4700-9866-e070d64ade0f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\build\windows\iothub_client.vcxproj">
<Project>{f17f4374-023d-455f-b254-5a87b6691395}</Project>
</ProjectReference>

3
c/iothub_client/samples/iothub_client_sample_mqtt/windows/iothub_client_sample_mqtt.vcxproj
Просмотреть файл

@ -175,6 +175,9 @@
<ClCompile Include="main.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\common\build\windows\common.vcxproj">
<Project>{9f55377b-6c37-4700-9866-e070d64ade0f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\build\windows\iothub_client.vcxproj">
<Project>{f17f4374-023d-455f-b254-5a87b6691395}</Project>
</ProjectReference>

1
c/iothub_client/src/iothub_client_ll.c
Просмотреть файл

@ -123,7 +123,6 @@ IOTHUB_CLIENT_LL_HANDLE IoTHubClient_LL_CreateFromConnectionString(const char* c
{
/* SRS_IOTHUBCLIENT_LL_12_010: [IoTHubClient_LL_CreateFromConnectionString shall fill up the IOTHUB_CLIENT_CONFIG structure using the following mapping: iotHubName = Name, iotHubSuffix = Suffix, deviceId = DeviceId, deviceKey = SharedAccessKey] */
const char* s_token = STRING_c_str(tokenString);
const char* s_value = STRING_c_str(valueString);
if (strcmp(s_token, HOSTNAME_TOKEN) == 0)
{
/* SRS_IOTHUBCLIENT_LL_12_009: [IoTHubClient_LL_CreateFromConnectionString shall split the value of HostName to Name and Suffix using the first "." as a separator] */

42
c/iothub_client/tests/iothubclient_ll_unittests/iothubclient_ll_unittests.cpp
Просмотреть файл

@ -353,8 +353,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE));
EXPECTED_CALL(mocks, STRING_TOKENIZER_get_next_token(TEST_STRING_TOKENIZER_HANDLE, TEST_STRING_HANDLE, IGNORED_PTR_ARG))
.SetReturn(0);
@ -373,8 +371,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -387,8 +383,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -515,8 +509,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE));
EXPECTED_CALL(mocks, STRING_TOKENIZER_get_next_token(TEST_STRING_TOKENIZER_HANDLE, TEST_STRING_HANDLE, IGNORED_PTR_ARG))
.SetReturn(0);
@ -535,8 +527,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(TEST_DEVICEID_TOKEN);
STRICT_EXPECTED_CALL(mocks, STRING_clone(IGNORED_PTR_ARG))
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -549,8 +539,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(TEST_DEVICEKEY_TOKEN);
STRICT_EXPECTED_CALL(mocks, STRING_clone(IGNORED_PTR_ARG))
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -622,8 +610,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -636,8 +622,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -693,8 +677,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE));
EXPECTED_CALL(mocks, STRING_TOKENIZER_get_next_token(TEST_STRING_TOKENIZER_HANDLE, TEST_STRING_HANDLE, IGNORED_PTR_ARG))
.SetReturn(0);
@ -713,8 +695,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -770,8 +750,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE));
EXPECTED_CALL(mocks, STRING_TOKENIZER_get_next_token(TEST_STRING_TOKENIZER_HANDLE, TEST_STRING_HANDLE, IGNORED_PTR_ARG))
.SetReturn(0);
@ -790,8 +768,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -846,8 +822,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE));
EXPECTED_CALL(mocks, STRING_TOKENIZER_get_next_token(TEST_STRING_TOKENIZER_HANDLE, TEST_STRING_HANDLE, IGNORED_PTR_ARG))
.SetReturn(0);
@ -867,8 +841,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -881,8 +853,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -938,8 +908,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE));
EXPECTED_CALL(mocks, STRING_TOKENIZER_get_next_token(TEST_STRING_TOKENIZER_HANDLE, TEST_STRING_HANDLE, IGNORED_PTR_ARG))
.SetReturn(0);
@ -959,8 +927,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEID_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -973,8 +939,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.IgnoreArgument(1);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_DEVICEKEY_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_CHAR);
@ -1088,8 +1052,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
STRICT_EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE))
.IgnoreArgument(1)
.SetReturn((STRING_TOKENIZER_HANDLE)NULL);
@ -1369,8 +1331,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE));
EXPECTED_CALL(mocks, STRING_TOKENIZER_get_next_token(TEST_STRING_TOKENIZER_HANDLE, TEST_STRING_HANDLE, IGNORED_PTR_ARG))
.SetReturn(1);
@ -1422,8 +1382,6 @@ BEGIN_TEST_SUITE(iothubclient_ll_unittests)
.SetReturn(0);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_TOKEN);
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG))
.SetReturn(TEST_HOSTNAME_VALUE);
EXPECTED_CALL(mocks, STRING_TOKENIZER_create(TEST_STRING_HANDLE));
EXPECTED_CALL(mocks, STRING_TOKENIZER_get_next_token(TEST_STRING_TOKENIZER_HANDLE, TEST_STRING_HANDLE, IGNORED_PTR_ARG));
EXPECTED_CALL(mocks, STRING_c_str(IGNORED_PTR_ARG));

3
c/serializer/samples/remote_monitoring/windows/remote_monitoring.vcxproj
Просмотреть файл

@ -165,6 +165,9 @@
<ClCompile Include="main.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\common\build\windows\common.vcxproj">
<Project>{9f55377b-6c37-4700-9866-e070d64ade0f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\iothub_client\build\windows\iothub_client.vcxproj">
<Project>{f17f4374-023d-455f-b254-5a87b6691395}</Project>
</ProjectReference>

3
c/serializer/samples/simplesample_amqp/windows/simplesample_amqp.vcxproj
Просмотреть файл

@ -19,6 +19,9 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\common\build\windows\common.vcxproj">
<Project>{9f55377b-6c37-4700-9866-e070d64ade0f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\iothub_client\build\windows\iothub_client.vcxproj">
<Project>{f17f4374-023d-455f-b254-5a87b6691395}</Project>
</ProjectReference>

3
c/serializer/samples/simplesample_http/windows/simplesample_http.vcxproj
Просмотреть файл

@ -19,6 +19,9 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\common\build\windows\common.vcxproj">
<Project>{9f55377b-6c37-4700-9866-e070d64ade0f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\iothub_client\build\windows\iothub_client.vcxproj">
<Project>{f17f4374-023d-455f-b254-5a87b6691395}</Project>
</ProjectReference>

3
c/serializer/samples/temp_sensor_anomaly/windows/temp_sensor_anomaly.vcxproj
Просмотреть файл

@ -168,6 +168,9 @@
<ClCompile Include="main.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\common\build\windows\common.vcxproj">
<Project>{9f55377b-6c37-4700-9866-e070d64ade0f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\iothub_client\build\windows\iothub_client.vcxproj">
<Project>{f17f4374-023d-455f-b254-5a87b6691395}</Project>
</ProjectReference>