GitLab

Add new swig interfaces to use C API from Java.
Add Makefile to build the swig module.

Change-Id: I55d8af5ca5ad73e3bb89f21824f74cffa8599ed0
Signed-off-by: Javier Guerra Melgares <javier.guerra@dekra.com>

Our scirpts always copy the hand made bitmasks over top
of the ones generated by swig so we missed that they were
being generated twice. If the order the command are run is
reversed it will cause issues because we will get the SWIG
output not the hand crafted output that is expected.

Change-Id: I3ea3fe3121490056f1e1c721342ddc450ec11d32
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29457Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Due to changes in include paths of oc_obt.h and oc_pki.h
some of the SWIG interface files have been modified to
handle those changes for this merge

- oc_acl.i is no longer needed an has been deleted
- oc_acl.i has been removed from build_swig.sh script
  the line of code has already been commented out.
- no longer need to include oc_acl.i in oc_obt.i
- handle OCSecurityAce, OCAceResource, OCAceConnectionType,
  OCAceWildcard, and oc_acepermissions_t in oc_obt.i
- No longer need to declare oc_sp_types_t in oc_pki.i

Change-Id: I0ffa44f582aafb6667e07bca097d7963552bfbc2
Signed-off-by: George Nash <george.nash@intel.com>

Change-Id: I62bbed3ed2609d5ef6ff73010de9c18c21b81a24
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29449Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: Ieea9e704c6ae60166d0f59bbdbd354c200459c07
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29441Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

I also renamed the placeholder README files to
.gitignore files.  I did this based on a stackoverflow
discusion reguarding placeholder files for empty
directories. README files should contain useful information
for developers.

Change-Id: I0e8db6300ec2fe4041e870341625d68e3c21b92c
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29406Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: I5d9dfb4d2e8ad98bf3fd5b863750aac8e0bfd1f0
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29436Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: I5574133bbe946edf08ca2f147f6b91d7720b154b
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29448Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

- Removed #include "security/oc_acl.h" from oc_obt.h
- Added forward declaration of oc_ace_res_s and typedef of oc_ace_res_t
- Added forward declaration of oc_sec_ace_s and typedef of oc_sec_ace_t
- moved enum oc_ace_connection_type_t from oc_acl.h to oc_obt.h
- moved enum oc_ace_wildcart_t from oc_acl.h to oc_obt.h
- moved enum oc_ace_permission_t from oc_acl.h to oc_obt.h
- removed typedef of oc_ace_res_t from oc_acl.h it is now forward declared in oc_obt.h
- removed typedef of oc_sec_ace_t from oc_acl.h is it now forward declared in oc_obt.h

The header file oc_acl.h is not part of the public API
by including is in a public header file we are inadvertently
making it part of the public API since the only way to build
code that includes oc_obt.h was to also include the internal
header oc_acl.h

This moves the parts of oc_acl.h that were required for oc_obt.h
from oc_acl.h to oc_obt.h and reverses the include order so the
internal header now relies on the public header.

Change-Id: Ia9e6bcde832880912de8e7e8e2e370001ad69847
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29444Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Kishen Maloor <kishen.maloor@intel.com>

Change-Id: I55a5723a2fe706b06f84b30bc82308b6c8096892
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29445Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>

- Removed #include "security/oc_sp.h"
- Moved oc_sp_type_t enum from oc_sp.h to oc_pki.h
- oc_pki.h is now included in oc_sp.h

The header file oc_sp.h is not part of the public
API by placing it in a public header file we are
inadvertently making it part of the public API since
the only way to build code that included oc_pki.h was
to also include the internal header oc_sp.h.

The only part of oc_sp.h that is need in the public API
is the oc_sp_type_t enum. So this was moved from the internal
header file to the public header file and the include order
was reversed so the privet header no longer shows up in the
public header file.

Change-Id: If5dc7e84dbc574dc251f1d274730c033c4c9cec8
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29443Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Kishen Maloor <kishen.maloor@intel.com>

Change-Id: I0871778dcae9cf4aa0b1e1e63d9ab5e73c5a5411
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29440Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>

Change-Id: Idc2a5410719d7268223a4cd207ee69bec82e7e9e
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29434Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: I6c26b878872a4b3c07afa783efd04582ce9d9830
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29410Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Updates the OBT to use the new Random PIN APIs.
This OBT is now functionally equivalent with
obtmain.c

Tested with smart_home_server_linux.c

Change-Id: Iedbd85a2747145bd6e2170166196c6addba4b086
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29428Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Updates client/server apps to use Java O-O wrappers
for SWIG generated code.

Change-Id: I87209ac132c91d863bd221732a16ab27a28dd0d7
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29430Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: I913c4876092bcc8d90ab00d708ee86519de0848a
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29429Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Also adds OcUtils for remaining static methods in OCMain.
Includes sample apps modified to use the new Java classes.

Change-Id: I4d69e3608967d573509488209acfa3e80b751024
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29427Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Need to ensure thread was attached and CallVoidMethod().

Change-Id: I0b3e6fb2a281eccd7b02ba173b5aef0b20919210
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29431Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Updates the OBT to use the new Random PIN APIs.
This OBT is now functionally equivalent with
obtmain.c

Tested with smart_home_server_linux.c

Change-Id: Ib5a9e4972b18dd48c6bbc56182d88f9dfd69eaff
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29409Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

This reduces the size of the OCMain and removes
the need to prefix all of the code from oc_rep.h with the
prefix rep since they are now all part of the OCRep class.

Change-Id: Ib8954e3046c91dd9bcbaf7a737a5835f1be89498
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29405Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

This change to bring back the previous code is necessary for a call
to GetJavaVM() to be generated in Java_org_iotivity_OCObtJNI_init()
in oc_obt_wrap.c

Change-Id: Ibc87595ae3b68dbf2a2c5411600b2d1dc5c0b304
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29407Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: I6a354a54a4dcbfcd0f19b17bccecd429aeaa3c34
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29408

Minor updates to recently committed swig interface files.

Change-Id: I3e41ba093c15181e5fdf229df6d9d2633b981f79
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29402Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Visual Studio solution changes: (*.vcxproj files)
 - add oc_main.h to Headers
 - add oc_clock_util.h to Headers
 - moved oc_session_events.h from Core to Headers
 - moved oc_signal_event_loop.h from port to Headers
 - add c-timestamp\timestamp.h to Core
 - add timestamp_compare.c, timestamp_format.c, timestamp_parse.c,
       timestamp_tm.c, timestamp_valid.c, and oc_clock.c to the build

This makes it possible to build and use code from oc_clock_util.h without linker errors
Also updates the organization of the files to more closely reflect the project setting.

Change-Id: Iac2f6112bd01a2e4ac98cbf7e56a554f25c3c761
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29403Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Kishen Maloor <kishen.maloor@intel.com>

replaced instances of 1.e09 with macro OC_NSEC_PER_SEC set to 1000000000

The value 1.e09 resolves to a double type and causes the following compiler warning

"warning C4244: 'initializing': conversion from 'double' to 'oc_clock_time_t',
 possible loss of data"

Change-Id: Ida8fc8dd71c188a7c2c5695fb9e5dcf4323e8e86
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29404Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Kishen Maloor <kishen.maloor@intel.com>

- simplified the swig interface code for oc_obt_init
- added oc_obt_shutdown to swig interface file
- added oc_obt_request_random_pin function
- added oc_obt_perform_random_pin_otm function
	- pin and pin_len are exposed as a single java string

Change-Id: Iabe3c82925a7ed0391a7270a2789c1bfa4c32953
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29401Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Expose the oc_random_pin_cb_t as OCRandomPinHandler.
Also add the setRandomPinHandler function to Java.

Change-Id: Id95f43fa281d0a741cad1cbe1d1b4e637c89db99
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29399Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

This adds the typemaps and code to map the native factory
presets callback code to the OCFactoryPresetsHandler in
for SWIG java code generatation.

Change-Id: Ib516bf34dba6b1c9626e935384d8e3b133a97a18
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29396Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Also includes sample apps modified to use the new Java classes.

This only wraps the resource related classes.
Future commits will address cbor representations.

Change-Id: I783d6fa51b0cc03d3967f7b09fc3baa20d591287
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29345Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Since the poll loop is now in the jni layer, there is no need
to expose oc_main_poll() as a public api.

Change-Id: Idc744b917854623b14e418c0c295674fdcb51bef
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29395Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: Ia4b7b622ff06ded0ffdf29cabab915d50d3ab660
Signed-off-by: George Nash <george.nash@intel.com>

java.util.ArrayList cannot be found if not running on the
main thread.  Only java.lang.* classes can be found if not
running on the main thread.  All other class references
must be found at startup for future use.

Change-Id: I51a7d0246bd4c2682e53d34990f8d078700b5f33
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29392Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: I23ad3532b416b9952910084ae1e7091f6d128ae2
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29393Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>

Change-Id: I04dea9d0742389be17fb00dcf002875d86c3321c
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29381Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: Ie771322c59b255167e98e5e9fa1de66d21bd3d82
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29390Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>

This change frees CoAP transactions bound to a peer at the upper
layer following the close of a (D)TLS connection or upon a connection
failure when the (D)TLS peer object is freed. This avoids reestablishing
a connection due to retransmissions of a CONfirmable transaction which is
especially helpful in instances where a (D)TLS session cannot be
established (for e.g. incorrect or expired credentials).

Change-Id: Ic12af03430c31d384f2b4a4d444bdaebe97d006e
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29389Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>

This change adds new onboarding APIs to oc_obt for handling the Random PIN
OTM. Specifically, it introduces two new APIs: one for requesting the peer
device to generate (and display) a Random PIN, and one for executing the
Random PIN OTM sequence in a TLS_PSK handshake that employs the PIN in
deriving the symmetric key used for the handshake.

OBT implementations are expected to invoke the first API and following a
success response, accept the PIN via user input using any means defined by
the application. Subsequently, the OBT invokes the second API, supplying
the PIN for carrying out the entire OTM sequence.

The sample onboarding_tool has been updated to support Random PIN OTM using
these two APIs.

This change also adds a new API oc_obt_shutdown() to be called by OBT
implementations when they're about to terminate. This frees all internally
allocated resources.

Change-Id: I8ef2df9ffc08aa34c658c6d4c80ea1077a1bc9d9
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29388Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>

This change restructures oc_obt to seaprate out the core request sequences
for the different OTMs from common functions that apply to all OTM
sequences and other horizontal security provisioning functions.

As a result, each OTM may be implemented in individual modules thus
improving their maintainability. A new internal header oc_obt_internal.h
contains all the common internal structures and APIs to be harnessed by
all OTM implementations.

Change-Id: Ib8eea60a63423f64ab62e9cd1da90d200cf9ba0b
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29387Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>