Integrated WIFI/ETHERNET adapters to single IPAdapter.
authorErich Keane <erich.keane@intel.com>
Mon, 4 May 2015 23:09:37 +0000 (16:09 -0700)
committerErich Keane <erich.keane@intel.com>
Tue, 5 May 2015 15:30:34 +0000 (15:30 +0000)
commitb2b9c7d9e130e14c07d42f2b2f07baa90108c336
treeddbd746f01474560a8b64a734428521eff1c4051
parentc699b0b143c0939e25779e52b78555e8d4627527
Integrated WIFI/ETHERNET adapters to single IPAdapter.

Removed all eth,wifi adapter files and created ipadater files for easy access.
Sconscripts,Resource Layer modified to adapt IPV4 instead of ethernet and wifi.
Added network monitoring code for ipadapter.
As its interface change and on 4 platforms, many changes are inevitable.

Change-Id: Ib4db996e8a29ffc7f8955e9d0d7280c023d3d64d
Signed-off-by: jw1103.kim <jw1103.kim@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/752
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
87 files changed:
arduino.scons
auto_build.sh
build_common/SConscript
build_common/linux/SConscript
resource/csdk/connectivity/SConscript
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/api/cainterface.h
resource/csdk/connectivity/build/How_To_Build.txt
resource/csdk/connectivity/build/SConscript
resource/csdk/connectivity/build/arduino/arduino.scons
resource/csdk/connectivity/build/tizen/SConscript
resource/csdk/connectivity/build/tizen/gbsbuild.sh
resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
resource/csdk/connectivity/build/tizen/scons/SConscript
resource/csdk/connectivity/inc/caadapterinterface.h
resource/csdk/connectivity/inc/caadapternetdtls.h
resource/csdk/connectivity/inc/caadapterutils.h
resource/csdk/connectivity/inc/cainterfacecontroller.h
resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h
resource/csdk/connectivity/inc/caipadapter.h [moved from resource/csdk/connectivity/inc/caethernetadapter.h with 66% similarity]
resource/csdk/connectivity/inc/caipadapter_singlethread.h [moved from resource/csdk/connectivity/inc/caethernetadapter_singlethread.h with 72% similarity]
resource/csdk/connectivity/inc/caipinterface.h [moved from resource/csdk/connectivity/inc/cawifiinterface.h with 54% similarity]
resource/csdk/connectivity/inc/caipinterface_singlethread.h [moved from resource/csdk/connectivity/inc/caethernetinterface_singlethread.h with 77% similarity]
resource/csdk/connectivity/inc/canetworkconfigurator.h
resource/csdk/connectivity/inc/caremotehandler.h
resource/csdk/connectivity/inc/caretransmission.h
resource/csdk/connectivity/inc/caretransmission_singlethread.h
resource/csdk/connectivity/inc/cawifiadapter_singlethread.h [deleted file]
resource/csdk/connectivity/inc/cawifiinterface_singlethread.h [deleted file]
resource/csdk/connectivity/samples/android/sample_service/jni/ResourceModel.c
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/jar/caipinterface.java [moved from resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/jar/CAWiFiInterface.java with 76% similarity]
resource/csdk/connectivity/samples/arduino/SConscript
resource/csdk/connectivity/samples/arduino/casample.cpp
resource/csdk/connectivity/samples/linux/sample_main.c
resource/csdk/connectivity/samples/tizen/SConscript
resource/csdk/connectivity/samples/tizen/casample.c
resource/csdk/connectivity/samples/tizen/scons/SConscript
resource/csdk/connectivity/src/SConscript
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
resource/csdk/connectivity/src/adapter_util/caadapterutils.c
resource/csdk/connectivity/src/bt_le_adapter/caleadapter_singlethread.c
resource/csdk/connectivity/src/caconnectivitymanager.c
resource/csdk/connectivity/src/caconnectivitymanager_singlethread.c
resource/csdk/connectivity/src/cainterfacecontroller.c
resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/connectivity/src/camessagehandler_singlethread.c
resource/csdk/connectivity/src/canetworkconfigurator.c
resource/csdk/connectivity/src/caremotehandler.c
resource/csdk/connectivity/src/caretransmission.c
resource/csdk/connectivity/src/caretransmission_singlethread.c
resource/csdk/connectivity/src/ethernet_adapter/SConscript [deleted file]
resource/csdk/connectivity/src/ethernet_adapter/arduino/caethernetnwmonitor.cpp [deleted file]
resource/csdk/connectivity/src/ethernet_adapter/caethernetadapter_singlethread.c [deleted file]
resource/csdk/connectivity/src/ethernet_adapter/linux/caethernetclient.c [deleted file]
resource/csdk/connectivity/src/ip_adapter/SConscript [new file with mode: 0644]
resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c [new file with mode: 0644]
resource/csdk/connectivity/src/ip_adapter/android/org_iotivity_jar_caipinterface.h [new file with mode: 0644]
resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.cpp [moved from resource/csdk/connectivity/src/ethernet_adapter/arduino/caethernetadapterutils.cpp with 76% similarity]
resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h [moved from resource/csdk/connectivity/src/ethernet_adapter/arduino/caethernetadapterutils.h with 86% similarity]
resource/csdk/connectivity/src/ip_adapter/arduino/caipclient_eth.cpp [moved from resource/csdk/connectivity/src/ethernet_adapter/arduino/caethernetclient.cpp with 67% similarity]
resource/csdk/connectivity/src/ip_adapter/arduino/caipclient_wifi.cpp [moved from resource/csdk/connectivity/src/wifi_adapter/arduino/cawificlient.cpp with 66% similarity]
resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor.cpp [moved from resource/csdk/connectivity/src/wifi_adapter/arduino/cawifinwmonitor.cpp with 57% similarity]
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_eth.cpp [moved from resource/csdk/connectivity/src/ethernet_adapter/arduino/caethernetserver.cpp with 66% similarity]
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_wifi.cpp [moved from resource/csdk/connectivity/src/wifi_adapter/arduino/cawifiserver.cpp with 60% similarity]
resource/csdk/connectivity/src/ip_adapter/caipadapter.c [new file with mode: 0644]
resource/csdk/connectivity/src/ip_adapter/caipadapter_singlethread.c [new file with mode: 0644]
resource/csdk/connectivity/src/ip_adapter/caipclient.c [new file with mode: 0644]
resource/csdk/connectivity/src/ip_adapter/caipserver.c [new file with mode: 0644]
resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c [new file with mode: 0644]
resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c [new file with mode: 0644]
resource/csdk/connectivity/src/wifi_adapter/SConscript [deleted file]
resource/csdk/connectivity/src/wifi_adapter/android/cawificlient.c [deleted file]
resource/csdk/connectivity/src/wifi_adapter/android/com_iotivity_jar_cawifiinterface.h [deleted file]
resource/csdk/connectivity/src/wifi_adapter/cawifiadapter_singlethread.c [deleted file]
resource/csdk/connectivity/src/wifi_adapter/linux/cawificlient.c [deleted file]
resource/csdk/connectivity/src/wifi_adapter/tizen/cawificlient.c [deleted file]
resource/csdk/connectivity/test/ca_api_unittest.cpp
resource/csdk/stack/include/internal/ocobserve.h
resource/csdk/stack/include/internal/ocresourcehandler.h
resource/csdk/stack/include/internal/ocserverrequest.h
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/ocobserve.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c