Merge remote branch '1.3-rel' (80e11aa) 81/22581/3
authorGeorge Nash <george.nash@intel.com>
Fri, 29 Sep 2017 20:11:08 +0000 (13:11 -0700)
committerGeorge Nash <george.nash@intel.com>
Fri, 29 Sep 2017 20:11:08 +0000 (13:11 -0700)
Relate-to:
https://gerrit.iotivity.org/gerrit/22139
https://gerrit.iotivity.org/gerrit/22281
https://gerrit.iotivity.org/gerrit/22277
https://gerrit.iotivity.org/gerrit/21615
https://gerrit.iotivity.org/gerrit/22537
https://gerrit.iotivity.org/gerrit/22517
https://gerrit.iotivity.org/gerrit/21449
https://gerrit.iotivity.org/gerrit/21781
https://gerrit.iotivity.org/gerrit/22507
https://gerrit.iotivity.org/gerrit/22521
https://gerrit.iotivity.org/gerrit/22499
https://gerrit.iotivity.org/gerrit/22223
https://gerrit.iotivity.org/gerrit/22437
https://gerrit.iotivity.org/gerrit/21489
https://gerrit.iotivity.org/gerrit/22353
https://gerrit.iotivity.org/gerrit/22455
https://gerrit.iotivity.org/gerrit/22363
https://gerrit.iotivity.org/gerrit/22483
https://gerrit.iotivity.org/gerrit/22429
https://gerrit.iotivity.org/gerrit/22469
https://gerrit.iotivity.org/gerrit/22011
https://gerrit.iotivity.org/gerrit/22007
https://gerrit.iotivity.org/gerrit/22407
https://gerrit.iotivity.org/gerrit/21837
https://gerrit.iotivity.org/gerrit/22299
https://gerrit.iotivity.org/gerrit/5473
https://gerrit.iotivity.org/gerrit/5441

Conflicts:
    resource/csdk/security/src/pconfresource.c
    resource/csdk/stack/samples/linux/secure/SConscript
    resource/csdk/stack/src/ocserverrequest.c
    resource/examples/SConscript
    resource/examples/oic_svr_db_client.dat
    resource/examples/oic_svr_db_server.dat
    resource/provisioning/unittests/OCProvisioningTest.cpp

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I07efb0d1bd6c46ad2e413d1df106e37247206c46
Signed-off-by: George Nash <george.nash@intel.com>
56 files changed:
1  2 
bridging/common/pluginServer.cpp
bridging/plugins/hue_plugin/hue_resource.cpp
bridging/plugins/lifx_plugin/lifxResource.cpp
bridging/plugins/lyric_plugin/honeywellResource.cpp
bridging/plugins/nest_plugin/nestResource.cpp
bridging/plugins/stub_plugin/stub_plugin.cpp
build_common/SConscript
java/SConscript
java/jni/JniOcPlatform.h
java/jni/JniOcProvisioning.cpp
java/jni/JniOcProvisioning.h
java/jni/JniOcSecureResource.cpp
java/jni/JniOcSecureResource.h
java/jni/JniOcStack.cpp
java/jni/SConscript
resource/IPCA/src/ocfframework.cpp
resource/IPCA/unittests/mockOCProvision.cpp
resource/csdk/include/octypes.h
resource/csdk/resource-directory/unittests/rdtests.cpp
resource/csdk/security/SConscript
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/provisioning/unittest/otmunittest.cpp
resource/csdk/security/src/deviceonboardingstate.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c
resource/csdk/security/unittest/SConscript
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/octbstack_product.def
resource/csdk/stack/octbstack_product_secured.def
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/test/stacktests.cpp
resource/examples/SConscript
resource/examples/oic_svr_db_client.dat
resource/examples/oic_svr_db_server.dat
resource/include/OCApi.h
resource/provisioning/examples/provisioningclient.cpp
resource/provisioning/examples/subownerclient.cpp
resource/provisioning/src/OCProvisioningManager.cpp
resource/provisioning/unittests/OCProvisioningTest.cpp
resource/src/InProcClientWrapper.cpp
resource/src/OCPlatform_impl.cpp
service/easy-setup/enrollee/src/resourcehandler.c
tools/tizen/iotivity.spec

Simple merge
Simple merge
diff --cc java/SConscript
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -34,9 -34,7 +34,8 @@@
  #include "credresource.h"
  #include "utlist.h"
  #include "aclresource.h" //Note: SRM internal header
- #include "pconfresource.h"
  #include "psinterface.h"
 +#include "ocstackinternal.h"
  
  #define TAG "OIC_OCPMAPI"
  
@@@ -76,12 -76,44 +76,8 @@@ occlientbasicops = samples_env.Program
  ocamsservice = samples_env.Program(
      'ocamsservice', ['common.cpp', 'ocamsservice.cpp'])
  ocsamples = [ocserverbasicops, occlientbasicops, ocamsservice]
- if samples_env.get('SECURED') == '1':
-     occlientdirectpairing = samples_env.Program(
-         'occlientdirectpairing', 'occlientdirectpairing.cpp')
-     ocsamples.append(occlientdirectpairing)
 -Alias("samples", ocsamples)
 -samples_env.AppendTarget('samples')
 -
 -src_dir = samples_env.get('SRC_DIR')
 -sec_samples_src_dir = src_dir + '/resource/csdk/stack/samples/linux/secure/'
 -sec_samples_build_dir = samples_env.get(
 -    'BUILD_DIR') + '/resource/csdk/stack/samples/linux/secure'
  
 -samples_env.Alias(
 -    "install",
 -    samples_env.Install(sec_samples_build_dir,
 -                        sec_samples_src_dir + 'oic_svr_db_server.json'))
 -samples_env.Alias(
 -    "install",
 -    samples_env.Install(sec_samples_build_dir,
 -                        sec_samples_src_dir + 'oic_svr_db_client_devowner.json'))
 -samples_env.Alias(
 -    "install",
 -    samples_env.Install(sec_samples_build_dir,
 -                        sec_samples_src_dir + 'oic_svr_db_client_nondevowner.json'))
 -samples_env.Alias(
 -    "install",
 -    samples_env.Install(sec_samples_build_dir,
 -                        sec_samples_src_dir + 'oic_amss_db.json'))
 +ocsamples += samples_env.ScanJSON('resource/csdk/stack/samples/linux/secure')
  
 -samples_env.Alias(
 -    "install",
 -    samples_env.Install(sec_samples_build_dir,
 -                        sec_samples_src_dir + 'oic_svr_db_server.dat'))
 -samples_env.Alias(
 -    "install",
 -    samples_env.Install(sec_samples_build_dir,
 -                        sec_samples_src_dir + 'oic_svr_db_client_devowner.dat'))
 -samples_env.Alias(
 -    "install",
 -    samples_env.Install(sec_samples_build_dir,
 -                        sec_samples_src_dir + 'oic_svr_db_client_nondevowner.dat'))
 -samples_env.Alias(
 -    "install",
 -    samples_env.Install(sec_samples_build_dir,
 -                        sec_samples_src_dir + 'oic_amss_db.dat'))
 +Alias("samples", ocsamples)
 +samples_env.AppendTarget('samples')
Simple merge
@@@ -465,7 -413,102 +465,6 @@@ OCStackResult FormOCEntityHandlerReques
      return OC_STACK_INVALID_PARAM;
  }
  
 -/**
 - * Find a server request in the server request list and delete
 - *
 - * @param serverRequest - server request to find and delete
 - */
 -void FindAndDeleteServerRequest(OCServerRequest * serverRequest)
 -{
 -    if(serverRequest)
 -    {
 -        OCServerRequest* out = NULL;
 -        out = RB_FIND(ServerRequestTree, &serverRequestTree, serverRequest);
 -
 -        if (out)
 -        {
 -            DeleteServerRequest(out);
 -        }
 -    }
 -}
 -
 -CAResponseResult_t ConvertEHResultToCAResult (OCEntityHandlerResult result, OCMethod method)
 -{
 -    CAResponseResult_t caResult = CA_BAD_REQ;
 -
 -    switch (result)
 -    {
 -        // Successful Client Request
 -        case OC_EH_RESOURCE_CREATED: // 2.01
 -            if (method == OC_REST_POST || method == OC_REST_PUT)
 -            {
 -                caResult = CA_CREATED;
 -            }
 -            break;
 -        case OC_EH_RESOURCE_DELETED: // 2.02
 -            if (method == OC_REST_POST || method == OC_REST_DELETE)
 -            {
 -                caResult = CA_DELETED;
 -            }
 -            break;
 -        case OC_EH_SLOW: // 2.05
 -            caResult = CA_CONTENT;
 -            break;
 -        case OC_EH_OK:
 -        case OC_EH_CHANGED: // 2.04
 -        case OC_EH_CONTENT: // 2.05
 -            if (method == OC_REST_POST || method == OC_REST_PUT)
 -            {
 -                caResult = CA_CHANGED;
 -            }
 -            else if (method == OC_REST_DELETE)
 -            {
 -                caResult = CA_DELETED;
 -            }
 -            else if (method == OC_REST_GET)
 -            {
 -                caResult = CA_CONTENT;
 -            }
 -            break;
 -        case OC_EH_VALID: // 2.03
 -            caResult = CA_VALID;
 -            break;
 -        // Unsuccessful Client Request
 -        case OC_EH_UNAUTHORIZED_REQ: // 4.01
 -            caResult = CA_UNAUTHORIZED_REQ;
 -            break;
 -        case OC_EH_BAD_OPT: // 4.02
 -            caResult = CA_BAD_OPT;
 -            break;
 -        case OC_EH_FORBIDDEN: // 4.03
 -            caResult = CA_FORBIDDEN_REQ;
 -            break;
 -        case OC_EH_RESOURCE_NOT_FOUND: // 4.04
 -            caResult = CA_NOT_FOUND;
 -            break;
 -        case OC_EH_METHOD_NOT_ALLOWED: // 4.05
 -            caResult = CA_METHOD_NOT_ALLOWED;
 -            break;
 -        case OC_EH_NOT_ACCEPTABLE: // 4.06
 -            caResult = CA_NOT_ACCEPTABLE;
 -            break;
 -        case OC_EH_INTERNAL_SERVER_ERROR: // 5.00
 -            caResult = CA_INTERNAL_SERVER_ERROR;
 -            break;
 -        case OC_EH_SERVICE_UNAVAILABLE: // 5.03
 -            caResult = CA_SERVICE_UNAVAILABLE;
 -            break;
 -        case OC_EH_RETRANSMIT_TIMEOUT: // 5.04
 -            caResult = CA_RETRANSMIT_TIMEOUT;
 -            break;
 -        default:
 -            caResult = CA_BAD_REQ;
 -            break;
 -    }
 -    return caResult;
 -}
 -
--
  /**
   * Handler function for sending a response from a single resource
   *
Simple merge
@@@ -99,15 -84,11 +99,14 @@@ def make_single_file_cpp_program(progra
  # Source files and Targets
  ######################################################################
  example_names = [
 -    'simpleserver', 'simpleclient',
 +    'simpleserver',
 +    'simpleclient',
      'simpleclientserver',
-     'directpairingclient',
 -    'devicediscoveryserver', 'devicediscoveryclient',
 -    'simpleserverHQ', 'simpleclientHQ',
 -    ]
 +    'devicediscoveryserver',
 +    'devicediscoveryclient',
 +    'simpleserverHQ',
 +    'simpleclientHQ',
 +]
  
  if target_os not in ['windows', 'msys_nt']:
      example_names += [
index a450e95,dc9fd24..1f58a4c
Binary files differ
index f2f55a5,ca853b3..48c8eb9
Binary files differ
Simple merge
Simple merge
Simple merge
@@@ -283,12 -284,11 +284,15 @@@ cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{bu
  cp resource/c_common/*.h %{buildroot}%{_includedir}
  cp resource/csdk/include/*.h %{buildroot}%{_includedir}
  cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
 -cp resource/csdk/logger/include/*.h %{buildroot}%{_includedir}
 +install -d %{buildroot}%{_includedir}/experimental/
 +cp resource/csdk/logger/include/experimental/*.h %{buildroot}%{_includedir}/experimental/
 +
 +find "%{buildroot}" -type f -perm /u+x -exec chrpath -d "{}" \;
 +find "%{buildroot}" -type f -iname "lib*.so" -exec chrpath -d "{}" \;
  
+ find "%{buildroot}" -type f -perm /u+x -exec chrpath -d "{}" \;
+ find "%{buildroot}" -type f -iname "lib*.so" -exec chrpath -d "{}" \;
  install -d %{buildroot}%{_includedir}/iotivity
  ln -fs ../resource %{buildroot}%{_includedir}/iotivity/
  ln -fs ../service %{buildroot}%{_includedir}/iotivity/