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>

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: 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: 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>

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>

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>

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>

- 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>

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>

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: I85c3694c663a447a842b6e77b6b06487d9e54e0e
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29380Reviewed-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>

For the SWIG output:
renamed oc_collection_add_supported_rt to collectionAddSupportedResourceType
renamed oc_collection_add_mandatory_rt to collectionAddMandatoryResourceType

some other cleanup in code order.

Change-Id: I898f9f50a4fba7e0569635ea176f0eb526613667
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29379Tested-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 mapping for oc_assert_role and oc_send_ping
into the Java output.

Change-Id: I32f1fbf8c8be41920e0bbf127dbd4d1897167fd2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29373Reviewed-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>

One of the few remaining SWIGTYPEs is from the uint8_t
comming from oc_collection.i including stdint.i in the
project will tell it how to handle uint8_t data types.

Change-Id: Ie609469e37a3a6d9effbe1e9652da3f4f26da6aa
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29376Reviewed-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>

This is a port and continuation of the work started
on the iotivity-constrained repository.

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

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

Change-Id: I5c351785f22d733517eac0b139c86b0f756b64ad
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27955Tested-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>

In C code when regestering a callback object a context pointer
with user data can be passed through to the callback handler.

Originally the Java binding were developed to allow passing user
data in the form of a Java Object. However this is completely
unneeded in Java since developers can acheve the same goal by
adding a member verable to there implementation of the handler
interface.

By removing this we are also presenting the code in a way that
more closely resembles what a Java developer would expect to
see.

Change-Id: I7b929935ad36cae0686d2fea3ab3e9f86c8b1cc5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29292Tested-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>

Remove DeleteLocalRef calls that were causing errors in Android.

These calls are not strictly necessary and seemingly caused no
harm on Linux or Windows.

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

The code for intializing the storage for credentials has been
moved from each Android sample app into the JNI layer.  Going
forward, Android apps no longer need to handle this detail of
the implementation.

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

Every time a header file from the port directory is include
it should be included using #include "path/*.h" this is
the way the includes are used across the rest of the project.

I also updated the build scrips. Due using hard coded paths
some work arounds ended up makin it into the build scripts.

Part of this work merged the 3 different versions of oc_clock.i
into a single version with an ifdef for linux. The major
difference between the different versions is the inclusion
of oc_config.h and that is handled in the build scripts.

Change-Id: Icbc5c5d692a9eb87e1902ed1165c897ebdb0b8c0
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27925Tested-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: I286809682f3f43a0774e87f7802ea8a286e2679d
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27910Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Change-Id: I9bc9808a94cf5e08509f092b022b53a1f29e692c
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27878Tested-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: Iff12fe7064ae3b3e948948ea384f733d31e5ea4d
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27850Tested-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>

There were some SWIGTTYPES that were introduced due to code
reorganization and missing import statments.

Change-Id: I87e71ec8dac7b6543e050da643bd9724194b2fd9
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27861Tested-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>

Some paths were incorrect in particular the 32-bit build. This
is mostly a result of always building and testing the 64-bit
build and not always doing the same due diligance for 32-bit.

Change-Id: I78906e4fa4dd4eb63894523ad743ab8132494c7b
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27858Tested-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 factors out the processing of oc_collection.h into its
own swig interface.

Change-Id: I33ddbe4d205fd59eace1710ceef6bf650d6df179
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27817Tested-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 update removes the need to detect the OS inside
the Java code when calculating the wait time for the
condition variables.

IoTivity-lite already contained code to convert from the
ticks-per-second values returned from OCMain.mainPoll
and OCClock.clockTime functions to seconds.

The OCClock.OC_CLOCK_SECOND contains the number of clock
tick-per-second as long as oc_config.h properly defines
the OC_CLOCK_CONF_TICKS_PER_SECOND macro. The values
return from functions that are in number of clock ticks
can simply be divided by OC_CLOCK_SECOND value to convert
that value to a number of seconds.

Change-Id: Ifa537fc308cd392db406bfb9fc09972feda9e875
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27791Reviewed-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>

This handles the types that were being converted to a SWIGTYPE

This also tells swig ignores some of the code that is generating
warnings when building the SWIG output.

Change-Id: I71a43f0febf1d6882fce8ecbc4f5ab1cd6658130
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27786Tested-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 exposes the oc_obt.h header to Java using SWIG.

This also adds an implementation of the onboarding tool in java.

Modification of how masks are handled to properly convert the
masks to and from enum types in the jni code.

Change-Id: I743ba9983d138249771bade740e5fa81d798ce43
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27737Reviewed-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: Iad48a9c70512f68ed39c75ba4cae26e400269ba6
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27729Tested-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>

Until now we have been building the debug build of windows with
security off. And without security on Linux. This commit changes
the build options to build with security enabled for debug and
release.

Some minor modifications to make the samples work better when
security is enabled.

Change-Id: I45a2184e421ca6a537a97cfa0ab8e03c27b8e4ee
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27723Tested-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>

Add the JCALL# macros to the code to make the code build for
both C and C++.

Changed the name of the jni_callback_data struct to
jni_callback_data_t the struct keyword required when using the
the struct as a parameter was messing with the SWIG parser. By
using typedef we are able to use the struct throughout the code
without prefixing the struct with the keyword struck.

Move the AttachCurrentThread code and DetachCurrentThread
code into its own functions. This reduces repitition of code.

Updated the way structs were processed by SWIG. This actually
simplified the code and made it so the structs no longer produce
compiliation error when built for C instead of C++

Change-Id: I385a32d94e996dbbe14591a04f02957204578fca
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27701Tested-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: I6e31266c89a1541a2688fd69d3ae3c19d5c79b48
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27643Tested-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: I4ed5d4caa5566850a2bd44ed8ac22be591aecbfc
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27615Tested-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>

The ocArrayToStringArray function had a build error from GCC
complaining about returning a local variable. This value
is a typedef and did not produce an error when build and
tested on Windows. This modifies the code so it takes a pointer
instead avoiding the error.

Change-Id: I111afe6e317080e45f8ba60ae5653868aa5fb019
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/27605Reviewed-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>