Merge branch 'upstream' into tizen

Conflicts:
	packaging/iotivity.spec

Change-Id: I0ebb075dbed68e747ac78ebfc36ef2ffb2b5a24a

diff --combined iotivity.pc.in
index 382cbc6,59bd6b5..e98ed1b
--- 1/iotivity.pc.in
--- 2/iotivity.pc.in
+++ b/iotivity.pc.in
@@@ -11,8 -11,7 +11,7 @@@ Description: IoTivity is an open sourc
  Version: @VERSION@
  URL: https://www.iotivity.org
  Requires:
- Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction \
-                       @OCPMAPI_LIB@
 -Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction
++Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction -locpmapi
  Cflags: -I${includedir}/resource \
                        -I${svcincludedir}/resource-encapsulation \
                        -I${svcincludedir}/resource-container \

diff --combined packaging/iotivity.spec
index 67fd1e2,2b7d51d..566761f
--- 1/packaging/iotivity.spec
--- 2/tools/tizen/iotivity.spec
+++ b/packaging/iotivity.spec
@@@ -1,5 -1,5 +1,5 @@@
  Name: iotivity
- Version: 1.1.0
+ Version: 1.1.1
  Release: 0
  Summary: IoT Connectivity sponsored by the OIC
  Group: Network & Connectivity/Other
@@@ -11,7 -11,11 +11,7 @@@ Source1002: %{name}-test.manifes
  BuildRequires:  gettext-tools, expat-devel
  BuildRequires:  python, libcurl-devel
  BuildRequires:  scons
 -BuildRequires:  openssl-devel
  BuildRequires:  boost-devel
 -BuildRequires:  boost-thread
 -BuildRequires:  boost-system
 -BuildRequires:  boost-filesystem
  BuildRequires:  pkgconfig(dlog)
  BuildRequires:  pkgconfig(uuid)
  BuildRequires:  pkgconfig(capi-network-wifi)
@@@ -31,11 -35,13 +31,12 @@@ Requires(post): /sbin/ldconfi
  %endif
  
  %{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP}
 -%{!?SECURED: %define SECURED 1}
  %{!?LOGGING: %define LOGGING True}
  %{!?ROUTING: %define ROUTING GW}
  %{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen}
  %{!?ES_ROLE: %define ES_ROLE enrollee}
  %{!?ES_SOFTAP_MODE: %define ES_SOFTAP_MODE MEDIATOR_SOFTAP}
 -%{!?VERBOSE: %define VERBOSE 1}
++%{!?VERBOSE: %define VERBOSE 0}
  
  %description
  An open source reference implementation of the OIC standard specifications
@@@ -101,10 -107,10 +102,10 @@@ cp %{SOURCE1001} ./%{name}-test.manifes
  %define RPM_ARCH "x86"
  %endif
  
- #VERBOSE=1
  scons -j2 --prefix=%{_prefix} \
+       VERBOSE=%{VERBOSE} \
        TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=%{TARGET_TRANSPORT} \
 -      RELEASE=%{RELEASE} SECURED=%{SECURED} LOGGING=%{LOGGING} ROUTING=%{ROUTING} \
 +      RELEASE=%{RELEASE} SECURED=1 LOGGING=%{LOGGING} ROUTING=%{ROUTING} \
        ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} ES_ROLE=%{ES_ROLE} ES_SOFTAP_MODE=%{ES_SOFTAP_MODE} \
        LIB_INSTALL_DIR=%{_libdir}
  
@@@ -114,7 -120,7 +115,7 @@@ rm -rf %{buildroot
  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
  scons install --install-sandbox=%{buildroot} --prefix=%{_prefix} \
        TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=%{TARGET_TRANSPORT} \
 -      RELEASE=%{RELEASE} SECURED=%{SECURED} LOGGING=%{LOGGING} ROUTING=%{ROUTING} \
 +      RELEASE=%{RELEASE} SECURED=1 LOGGING=%{LOGGING} ROUTING=%{ROUTING} \
        ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} ES_ROLE=%{ES_ROLE} ES_SOFTAP_MODE=%{ES_SOFTAP_MODE} \
        LIB_INSTALL_DIR=%{_libdir}
  
@@@ -149,17 -155,23 +150,21 @@@ cp out/tizen/*/%{build_mode}/resource/e
  cp out/tizen/*/%{build_mode}/resource/examples/threadingsample %{ex_install_dir}
  cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_server.dat %{ex_install_dir}
  cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_client.dat %{ex_install_dir}
 -cp out/tizen/*/%{build_mode}/libcoap.a %{buildroot}%{_libdir}
 -%if 0%{?SECURED} == 1
  mkdir -p %{ex_install_dir}/provisioning
 -mkdir -p %{ex_install_dir}/provision-sample
 +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/provisioningclient %{ex_install_dir}/provisioning/
 +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_justworks %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_randompin %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat %{ex_install_dir}/provisioning/
  
  cp ./resource/csdk/security/include/pinoxmcommon.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/security/include/securevirtualresourcetypes.h %{buildroot}%{_includedir}
  cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
  cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}
  cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir}
 -cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{buildroot}%{_libdir}/oic_svr_db_server.dat
 -cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_justworks %{ex_install_dir}/provision-sample/
 -cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{ex_install_dir}/provision-sample/
 -cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_randompin %{ex_install_dir}/provision-sample/
 -cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat %{ex_install_dir}/provision-sample/
 -
 -%endif
 -
 +cp ./resource/csdk/connectivity/api/casecurityinterface.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/connectivity/api/cacommon.h %{buildroot}%{_includedir}
  
  %if 0%{?tizen_version_major} < 3
  mkdir -p %{buildroot}/%{_datadir}/license
@@@ -167,7 -179,10 +172,8 @@@ cp LICENSE.APLv2 %{buildroot}/%{_datadi
  cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-service
  cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-test
  %endif
 -cp resource/c_common/*.h %{buildroot}%{_includedir}
 -cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
  
+ cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
  cp service/easy-setup/inc/*.h %{buildroot}%{_includedir}
  cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}
  
@@@ -184,8 -199,6 +190,8 @@@
  %{_libdir}/liboc_logger_core.so
  %{_libdir}/liboctbstack.so
  %{_libdir}/libconnectivity_abstraction.so
 +%{_libdir}/libocpmapi.so
 +%{_libdir}/libocprovision.so
  %if 0%{?tizen_version_major} < 3
  %{_datadir}/license/%{name}
  %else
@@@ -205,6 -218,11 +211,6 @@@
  %{_libdir}/librcs_container.so
  %{_libdir}/librcs_server.so
  %{_libdir}/libESEnrolleeSDK.so
 -%if 0%{?SECURED} == 1
 -%{_libdir}/libocpmapi.so
 -%{_libdir}/libocprovision.so
 -%{_libdir}/oic_svr_db_server.dat
 -%endif
  %if 0%{?tizen_version_major} < 3
  %{_datadir}/license/%{name}-service
  %else

diff --combined resource/csdk/connectivity/api/cacommon.h
index 1983fa2,a2a3fd3..be30106
--- 1/resource/csdk/connectivity/api/cacommon.h
--- 2/resource/csdk/connectivity/api/cacommon.h
+++ b/resource/csdk/connectivity/api/cacommon.h
@@@ -132,7 -132,7 +132,7 @@@ typedef char *CAToken_t
  #ifdef RA_ADAPTER
  #define MAX_ADDR_STR_SIZE_CA (256)
  #else
 -#define MAX_ADDR_STR_SIZE_CA (40)
 +#define MAX_ADDR_STR_SIZE_CA (59)
  #endif
  
  typedef enum
@@@ -514,6 -514,8 +514,8 @@@ typedef struc
      struct tcpsockets
      {
          void *threadpool;       /**< threadpool between Initialize and Start */
+         CASocket_t ipv4;        /**< IPv4 accept socket */
+         CASocket_t ipv6;        /**< IPv6 accept socket */
          void *svrlist;          /**< unicast IPv4 TCP server information*/
          int selectTimeout;      /**< in seconds */
          int listenBacklog;      /**< backlog counts*/
@@@ -523,6 -525,7 +525,7 @@@
          bool started;           /**< the TCP adapter has started */
          bool terminate;         /**< the TCP adapter needs to stop */
          bool ipv4tcpenabled;    /**< IPv4 TCP enabled by OCInit flags */
+         bool ipv6tcpenabled;    /**< IPv6 TCP enabled by OCInit flags */
      } tcp;
  #endif
  } CAGlobals_t;

diff --combined resource/csdk/stack/include/ocstackconfig.h
index 8680c7f,c3e3ba2..f5ecebb
--- 1/resource/csdk/stack/include/ocstackconfig.h
--- 2/resource/csdk/stack/include/ocstackconfig.h
+++ b/resource/csdk/stack/include/ocstackconfig.h
@@@ -33,13 -33,13 +33,13 @@@
   * Maximum length of the URI supported by client/server while processing
   * REST requests/responses.
   */
 -#define MAX_URI_LENGTH (64)
 +#define MAX_URI_LENGTH (256)
  
  /**
   * Maximum length of the query supported by client/server while processing
   * REST requests/responses.
   */
- #define MAX_QUERY_LENGTH (64)
+ #define MAX_QUERY_LENGTH (256)
  
  /**
   * Maximum length of the Manufacturer name supported by the server

diff --combined resource/csdk/stack/test/stacktests.cpp
index a5b9fe4,94c7727..74a5a92
--- 1/resource/csdk/stack/test/stacktests.cpp
--- 2/resource/csdk/stack/test/stacktests.cpp
+++ b/resource/csdk/stack/test/stacktests.cpp
@@@ -85,10 -85,11 +85,11 @@@ extern "C"  OCStackApplicationResult as
      return OC_STACK_KEEP_TRANSACTION;
  }
  
- static void resultCallback(OCDPDev_t *UNUSED1, OCStackResult UNUSED2)
+ static void resultCallback(void *UNUSED1, OCDPDev_t *UNUSED2, OCStackResult UNUSED3)
  {
      (void) (UNUSED1);
      (void) (UNUSED2);
+     (void) (UNUSED3);
  }
  
  extern "C" OCStackApplicationResult discoveryCallback(void* ctx,
@@@ -351,7 -352,7 +352,7 @@@ TEST(StackDiscovery, DISABLED_DoResourc
      InitStack(OC_CLIENT);
  
      /* Start a discovery query*/
-     char szQueryUri[64] = { 0 };
+     char szQueryUri[MAX_QUERY_LENGTH] = { 0 };
      strcpy(szQueryUri, OC_RSRVD_WELL_KNOWN_URI);
      cbData.cb = asyncDoResourcesCallback;
      cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
@@@ -393,7 -394,7 +394,7 @@@ TEST(StackResource, DISABLED_UpdateReso
      InitStack(OC_CLIENT);
  
      /* Start a discovery query*/
-     char szQueryUri[64] = { 0 };
+     char szQueryUri[MAX_QUERY_LENGTH] = { 0 };
      strcpy(szQueryUri, OC_RSRVD_WELL_KNOWN_URI);
      cbData.cb = asyncDoResourcesCallback;
      cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
@@@ -453,7 -454,7 +454,7 @@@ TEST(StackResource, CreateResourceBadUr
      OIC_LOG(INFO, TAG, "Starting CreateResourceBadUri test");
      InitStack(OC_SERVER);
  
 -    const char *uri65 = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKL";
 +    const char *uri257 = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVW";
  
      OCResourceHandle handle;
  
@@@ -476,7 -477,7 +477,7 @@@
      EXPECT_EQ(OC_STACK_INVALID_URI, OCCreateResource(&handle,
                                              "core.led",
                                              "core.rw",
 -                                            uri65, //"/a/led",
 +                                            uri257, //"/a/led",
                                              0,
                                              0,
                                              OC_DISCOVERABLE|OC_OBSERVABLE));
@@@ -1680,17 -1681,17 +1681,17 @@@ TEST(PODTests, OCCallbackData
  
  TEST(OCDoDirectPairingTests, Nullpeer)
  {
-     EXPECT_EQ(OC_STACK_INVALID_PARAM,OCDoDirectPairing(NULL, pmSel, &pinNumber, &resultCallback));
+     EXPECT_EQ(OC_STACK_INVALID_PARAM,OCDoDirectPairing(NULL, NULL, pmSel, &pinNumber, &resultCallback));
  }
  
  TEST(OCDoDirectPairingTests, NullCallback)
  {
-     EXPECT_EQ(OC_STACK_INVALID_CALLBACK,OCDoDirectPairing(&peer, pmSel, &pinNumber, NULL));
+     EXPECT_EQ(OC_STACK_INVALID_CALLBACK,OCDoDirectPairing(NULL, &peer, pmSel, &pinNumber, NULL));
  }
  
  TEST(OCDoDirectPairingTests, NullpinNumber)
  {
-     EXPECT_EQ(OC_STACK_INVALID_PARAM,OCDoDirectPairing(&peer, pmSel, NULL, &resultCallback));
+     EXPECT_EQ(OC_STACK_INVALID_PARAM,OCDoDirectPairing(NULL, &peer, pmSel, NULL, &resultCallback));
  }
  
  TEST(StackResource, MultipleResourcesDiscovery)
@@@ -1725,7 -1726,7 +1726,7 @@@
                                              NULL,
                                              OC_DISCOVERABLE|OC_OBSERVABLE));
      /* Start a discovery query*/
-     char szQueryUri[256] = "/oic/res?if=oic.if.ll";
+     char szQueryUri[MAX_QUERY_LENGTH] = "/oic/res?if=oic.if.ll";
      OCCallbackData cbData;
      cbData.cb = discoveryCallback;
      cbData.context = (void*)DEFAULT_CONTEXT_VALUE;