From 9e15bfa79304b30f89ace27ad196c476336a4cdb Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Thu, 2 Feb 2017 19:08:49 +0900 Subject: [PATCH] Clean up log messages in CA Layer. - To make sure of analysis, Debug level is replaced with Info level. - Remove unnecessary Logs of BLE and CA common. Change-Id: Ifab4d264c7347e8575e008ca1bd7fd7deed03b9d Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/17023 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- .../src/adapter_util/cafragmentation.c | 18 ----- .../src/bt_le_adapter/android/caleclient.c | 43 ++--------- .../src/bt_le_adapter/android/calenwmonitor.c | 37 +++------- .../src/bt_le_adapter/android/calestate.c | 13 ++-- .../src/bt_le_adapter/android/caleutils.c | 7 +- .../connectivity/src/bt_le_adapter/caleadapter.c | 83 ++++------------------ .../csdk/connectivity/src/caconnectivitymanager.c | 2 - resource/csdk/connectivity/src/camessagehandler.c | 5 +- .../csdk/connectivity/src/canetworkconfigurator.c | 10 --- resource/csdk/connectivity/src/caprotocolmessage.c | 8 +-- .../src/ip_adapter/android/caifaddrs.c | 1 - .../bt_le_manager/android/caleconnectionmanager.c | 14 ---- .../bt_le_manager/android/camanagerdevice.c | 7 -- .../bt_le_manager/android/camanagerleutil.c | 11 --- resource/csdk/routing/src/routingutility.c | 10 --- resource/csdk/stack/src/ocpayloadparse.c | 1 - 16 files changed, 40 insertions(+), 230 deletions(-) diff --git a/resource/csdk/connectivity/src/adapter_util/cafragmentation.c b/resource/csdk/connectivity/src/adapter_util/cafragmentation.c index 9b0bee2..67bd00b 100644 --- a/resource/csdk/connectivity/src/adapter_util/cafragmentation.c +++ b/resource/csdk/connectivity/src/adapter_util/cafragmentation.c @@ -123,8 +123,6 @@ CAResult_t CAGenerateHeader(uint8_t *header, CABLEPacketSecure_t secure, const uint8_t destPort) { - OIC_LOG(DEBUG, TAG, "IN"); - VERIFY_NON_NULL(header, TAG, "header is NULL"); if (sourcePort > CA_SUPPORTED_BLE_MAX_PORT || @@ -171,8 +169,6 @@ CAResult_t CAMakeFirstDataSegment(uint8_t *dataSegment, const uint8_t *dataHeader, const uint8_t *lengthHeader) { - OIC_LOG(DEBUG, TAG, "IN"); - VERIFY_NON_NULL(dataSegment, TAG, "dataSegment is NULL"); VERIFY_NON_NULL(dataHeader, TAG, "dataHeader is NULL"); VERIFY_NON_NULL(lengthHeader, TAG, "lengthHeader is NULL"); @@ -180,9 +176,6 @@ CAResult_t CAMakeFirstDataSegment(uint8_t *dataSegment, memcpy(dataSegment, dataHeader, CA_BLE_HEADER_SIZE); memcpy(dataSegment + CA_BLE_HEADER_SIZE, lengthHeader, CA_BLE_LENGTH_HEADER_SIZE); memcpy(dataSegment + CA_BLE_HEADER_SIZE + CA_BLE_LENGTH_HEADER_SIZE, data, dataLength); - - OIC_LOG(DEBUG, TAG, "OUT"); - return CA_STATUS_OK; } @@ -194,8 +187,6 @@ CAResult_t CAMakeRemainDataSegment(uint8_t *dataSegment, const uint8_t *dataHeader, uint16_t mtuSize) { - OIC_LOG(DEBUG, TAG, "IN"); - VERIFY_NON_NULL(dataSegment, TAG, "dataSegment is NULL"); VERIFY_NON_NULL(dataHeader, TAG, "dataHeader is NULL"); @@ -209,9 +200,6 @@ CAResult_t CAMakeRemainDataSegment(uint8_t *dataSegment, memcpy(dataSegment, dataHeader, CA_BLE_HEADER_SIZE); memcpy(dataSegment + CA_BLE_HEADER_SIZE, sourceData + index, segmentPayloadLength); - - OIC_LOG(DEBUG, TAG, "OUT"); - return CA_STATUS_OK; } @@ -221,8 +209,6 @@ CAResult_t CAParseHeader(const uint8_t *header, CABLEPacketSecure_t *secureFlag, uint16_t *destPort) { - OIC_LOG(DEBUG, TAG, "IN"); - VERIFY_NON_NULL(header, TAG, "header is NULL"); *startFlag = CAGetBits(header[0], CA_BLE_START_POS, CA_BLE_START_LEN); @@ -230,8 +216,6 @@ CAResult_t CAParseHeader(const uint8_t *header, *secureFlag = CAGetBits(header[1], CA_BLE_SECURE_POS, CA_BLE_SECURE_LEN); *destPort = CAGetBits(header[1], CA_BLE_DESTINATION_PORT_POS, CA_BLE_DESTINATION_PORT_LEN); - OIC_LOG(DEBUG, TAG, "OUT"); - return CA_STATUS_OK; } @@ -239,7 +223,6 @@ CAResult_t CAParseHeaderPayloadLength(uint8_t *header, size_t headerLength, uint32_t *dataLength) { - OIC_LOG(DEBUG, TAG, "IN"); VERIFY_NON_NULL(header, TAG, "header is NULL"); if (headerLength != CA_BLE_LENGTH_HEADER_SIZE) @@ -253,6 +236,5 @@ CAResult_t CAParseHeaderPayloadLength(uint8_t *header, *dataLength |= header[CA_BLE_HEADER_SIZE+idx]; } - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c index 68314c7..1c63fb4 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c @@ -179,7 +179,6 @@ static void CALEScanThread(void* object) jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -267,8 +266,6 @@ static void CALEScanThread(void* object) CAResult_t CALEClientStartScanWithInterval() { - OIC_LOG(DEBUG, TAG, "IN - CALEClientStartScanWithInterval"); - if (g_isWorkingScanThread) { OIC_LOG(DEBUG, TAG, "scan interval logic already running"); @@ -290,7 +287,6 @@ CAResult_t CALEClientStartScanWithInterval() return CA_STATUS_FAILED; } - OIC_LOG(DEBUG, TAG, "OUT - CALEClientStartScanWithInterval"); return CA_STATUS_OK; } @@ -334,7 +330,6 @@ CAResult_t CALECreateJniInterfaceObject() jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -415,7 +410,6 @@ CAResult_t CALEClientInitialize() jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -514,7 +508,6 @@ void CALEClientTerminate() jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -618,7 +611,6 @@ CAResult_t CALEClientDestroyJniInterface() jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -692,7 +684,6 @@ void CALEClientSendFinish(JNIEnv *env, jobject gatt) CAResult_t CALEClientSendNegotiationMessage(const char* address) { - OIC_LOG_V(DEBUG, TAG, "CALEClientSendNegotiationMessage(%s)", address); VERIFY_NON_NULL(address, TAG, "address is null"); return CALEClientSendUnicastMessageImpl(address, NULL, 0); @@ -702,7 +693,6 @@ CAResult_t CALEClientSendUnicastMessage(const char* address, const uint8_t* data, const uint32_t dataLen) { - OIC_LOG_V(DEBUG, TAG, "CALEClientSendUnicastMessage(%s, %p)", address, data); VERIFY_NON_NULL(address, TAG, "address is null"); VERIFY_NON_NULL(data, TAG, "data is null"); @@ -726,7 +716,6 @@ CAResult_t CALEClientSendMulticastMessage(const uint8_t* data, jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -884,7 +873,7 @@ CAResult_t CALEClientIsThereScannedDevices(JNIEnv *env, const char* address) CAResult_t CALEClientSendUnicastMessageImpl(const char* address, const uint8_t* data, const uint32_t dataLen) { - OIC_LOG_V(DEBUG, TAG, "CALEClientSendUnicastMessageImpl, address: %s, data: %p", address, + OIC_LOG_V(INFO, TAG, "CALEClientSendUnicastMessageImpl, address: %s, data: %p", address, data); VERIFY_NON_NULL(address, TAG, "address is null"); @@ -899,7 +888,6 @@ CAResult_t CALEClientSendUnicastMessageImpl(const char* address, const uint8_t* jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) { @@ -947,8 +935,6 @@ CAResult_t CALEClientSendUnicastMessageImpl(const char* address, const uint8_t* goto error_exit; } - OIC_LOG_V(DEBUG, TAG, "remote device address is %s", setAddress); - if (!strcmp(setAddress, address)) { (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress); @@ -1356,8 +1342,6 @@ CAResult_t CALEClientStartScan() jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); - res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) { @@ -1599,7 +1583,6 @@ CAResult_t CALEClientStopScan() jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) { @@ -2205,7 +2188,6 @@ static void CALEWriteCharacteristicThread(void* object) jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -2704,7 +2686,6 @@ CAResult_t CALEClientCreateUUIDList() jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -2990,15 +2971,13 @@ bool CALEClientIsDeviceInScanDeviceList(JNIEnv *env, const char* remoteAddress) { (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress); (*env)->DeleteLocalRef(env, jni_setAddress); + OIC_LOG_V(INFO, TAG, "[%s] exist in scanned device list", remoteAddress); return true; } (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress); (*env)->DeleteLocalRef(env, jni_setAddress); } - - OIC_LOG_V(DEBUG, TAG, "[%s] doesn't exist in scanned device list", remoteAddress); - return false; } @@ -3169,7 +3148,6 @@ CAResult_t CALEClientAddGattobjToList(JNIEnv *env, jobject gatt) bool CALEClientIsGattObjInList(JNIEnv *env, const char* remoteAddress) { - OIC_LOG(DEBUG, TAG, "CALEClientIsGattObjInList"); VERIFY_NON_NULL(env, TAG, "env is null"); VERIFY_NON_NULL_RET(remoteAddress, TAG, "remoteAddress is null", true); @@ -3464,8 +3442,6 @@ CAResult_t CALEClientRemoveGattObjForAddr(JNIEnv *env, jstring addr) jstring CALEClientGetLEAddressFromBTDevice(JNIEnv *env, jobject bluetoothDevice) { - OIC_LOG(DEBUG, TAG, "CALEClientGetLEAddressFromBTDevice"); - VERIFY_NON_NULL_RET(env, TAG, "env", NULL); VERIFY_NON_NULL_RET(bluetoothDevice, TAG, "bluetoothDevice", NULL); @@ -3931,7 +3907,6 @@ void CAStopLEGattClient() jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { - OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer"); res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL); if (JNI_OK != res) @@ -4013,7 +3988,7 @@ CAResult_t CAUpdateCharacteristicsToGattServer(const char *remoteAddress, const uint32_t dataLen, CALETransferType_t type, int32_t position) { - OIC_LOG(DEBUG, TAG, "call CALEClientSendUnicastMessage"); + OIC_LOG(INFO, TAG, "call CALEClientSendUnicastMessage"); VERIFY_NON_NULL(remoteAddress, TAG, "remoteAddress is null"); if (LE_UNICAST != type || position < 0) @@ -4048,7 +4023,6 @@ void CASetLEClientThreadPoolHandle(ca_thread_pool_t handle) CAResult_t CAGetLEAddress(char **local_address) { VERIFY_NON_NULL(local_address, TAG, "local_address"); - OIC_LOG(INFO, TAG, "CAGetLEAddress is not support"); return CA_NOT_SUPPORTED; } @@ -4127,7 +4101,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattConnectionStateChangeCallback(J CACheckJNIException(env); goto error_exit; } - OIC_LOG_V(DEBUG, TAG, "CALeGattConnectionStateChangeCallback - address [%s]", address); + OIC_LOG_V(INFO, TAG, "CALeGattConnectionStateChangeCallback - address [%s]", address); if (state_connected == newstate) { @@ -4462,9 +4436,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattCharacteristicChangedCallback( jbyte *jni_byte_responseData = (jbyte*) (*env)->GetByteArrayElements(env, data, &isCopy); CACheckJNIException(env); - OIC_LOG_V(DEBUG, TAG, "CALeGattCharacteristicChangedCallback - raw data received : %p", - jni_byte_responseData); - uint8_t* receivedData = OICMalloc(length); if (!receivedData) { @@ -4492,7 +4463,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattCharacteristicChangedCallback( return; } - OIC_LOG_V(DEBUG, TAG, "CALeGattCharacteristicChangedCallback - data. : %p, %d", + OIC_LOG_V(INFO, TAG, "CALeGattCharacteristicChangedCallback - data. : %p, %d", receivedData, length); uint32_t sentLength = 0; @@ -4569,8 +4540,8 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattMtuChangedCallback(JNIEnv *env, jint mtu, jint status) { - OIC_LOG_V(INFO, TAG, "caLeGattMtuChangedCallback - mtu[%d-including Header size 3 byte)", mtu); - OIC_LOG_V(INFO, TAG, "caLeGattMtuChangedCallback - status %d", status); + OIC_LOG_V(INFO, TAG, "caLeGattMtuChangedCallback - status %d, " + "mtu[%d-including Header size 3 byte]", mtu, status); (void)obj; diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c index 82bc169..0e1bbf7 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c @@ -108,7 +108,6 @@ CAResult_t CAStopLEAdapter() CAResult_t CAInitLENwkMonitorMutexVaraibles() { - OIC_LOG(DEBUG, TAG, "IN"); if (NULL == g_bleDeviceStateChangedCbMutex) { g_bleDeviceStateChangedCbMutex = oc_mutex_new(); @@ -130,27 +129,20 @@ CAResult_t CAInitLENwkMonitorMutexVaraibles() } } - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } void CATerminateLENwkMonitorMutexVaraibles() { - OIC_LOG(DEBUG, TAG, "IN"); - oc_mutex_free(g_bleDeviceStateChangedCbMutex); g_bleDeviceStateChangedCbMutex = NULL; oc_mutex_free(g_bleConnectionStateChangedCbMutex); g_bleConnectionStateChangedCbMutex = NULL; - - OIC_LOG(DEBUG, TAG, "OUT"); } CAResult_t CAGetLEAdapterState() { - OIC_LOG(DEBUG, TAG, "IN"); - if (!g_jvm) { OIC_LOG(ERROR, TAG, "g_jvm is null"); @@ -188,14 +180,11 @@ CAResult_t CAGetLEAdapterState() (*g_jvm)->DetachCurrentThread(g_jvm); } - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } CAResult_t CAInitializeLENetworkMonitor() { - OIC_LOG(DEBUG, TAG, "IN"); - CAResult_t res = CAInitLENwkMonitorMutexVaraibles(); if (CA_STATUS_OK != res) { @@ -206,32 +195,24 @@ CAResult_t CAInitializeLENetworkMonitor() CALENetworkMonitorJNISetContext(); CALENetworkMonitorJniInit(); - OIC_LOG(DEBUG, TAG, "OUT"); - return CA_STATUS_OK; - } void CATerminateLENetworkMonitor() { - OIC_LOG(DEBUG, TAG, "IN"); + OIC_LOG(DEBUG, TAG, "CATerminateLENetworkMonitor"); CATerminateLENwkMonitorMutexVaraibles(); - - OIC_LOG(DEBUG, TAG, "OUT"); } CAResult_t CASetLEAdapterStateChangedCb(CALEDeviceStateChangedCallback callback) { - OIC_LOG(DEBUG, TAG, "IN"); - OIC_LOG(DEBUG, TAG, "Setting CALEDeviceStateChangedCallback"); oc_mutex_lock(g_bleDeviceStateChangedCbMutex); CALESetAdapterStateCallback(callback); oc_mutex_unlock(g_bleDeviceStateChangedCbMutex); - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } @@ -243,21 +224,19 @@ CAResult_t CAUnSetLEAdapterStateChangedCb() CAResult_t CASetLENWConnectionStateChangedCb(CALEConnectionStateChangedCallback callback) { - OIC_LOG(DEBUG, TAG, "IN"); + OIC_LOG(DEBUG, TAG, "CASetLENWConnectionStateChangedCb"); oc_mutex_lock(g_bleConnectionStateChangedCbMutex); g_bleConnectionStateChangedCallback = callback; oc_mutex_unlock(g_bleConnectionStateChangedCbMutex); - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } CAResult_t CAUnsetLENWConnectionStateChangedCb() { - OIC_LOG(DEBUG, TAG, "IN"); + OIC_LOG(DEBUG, TAG, "CAUnsetLENWConnectionStateChangedCb"); oc_mutex_lock(g_bleConnectionStateChangedCbMutex); g_bleConnectionStateChangedCallback = NULL; oc_mutex_unlock(g_bleConnectionStateChangedCbMutex); - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } @@ -296,7 +275,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeStateChangedCallback(JNIEnv *env, j VERIFY_NON_NULL_VOID(env, TAG, "env is null"); VERIFY_NON_NULL_VOID(obj, TAG, "obj is null"); - OIC_LOG_V(DEBUG, TAG, "CaLeClientInterface - Network State Changed : status(%d)", status); + OIC_LOG_V(INFO, TAG, "CaLeClientInterface - Network State Changed : status(%d)", status); if (!g_bleDeviceStateChangedCallback) { @@ -399,7 +378,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattNWConnectionStateChangeCallback jint status, jint newState) { - OIC_LOG_V(DEBUG, TAG, "CALeGattNWConnectionStateChangeCallback - status %d, newstate %d", + OIC_LOG_V(INFO, TAG, "CALeGattNWConnectionStateChangeCallback - status %d, newstate %d", status, newState); VERIFY_NON_NULL_VOID(env, TAG, "env"); VERIFY_NON_NULL_VOID(obj, TAG, "obj"); @@ -428,7 +407,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattNWConnectionStateChangeCallback { if (g_bleConnectionStateChangedCallback) { - OIC_LOG_V(DEBUG, TAG, "LE Disconnected state is %d, %s", newState, address); + OIC_LOG_V(DEBUG, TAG, "LE Disconnected state is %s", address); g_bleConnectionStateChangedCallback(CA_ADAPTER_GATT_BTLE, address, false); } } @@ -500,7 +479,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattNWServicesDiscoveredCallback(JN jobject gatt, jint status) { - OIC_LOG_V(DEBUG, TAG, "caLeGattNWServicesDiscoveredCallback - status %d", status); + OIC_LOG_V(INFO, TAG, "caLeGattNWServicesDiscoveredCallback - status %d", status); VERIFY_NON_NULL_VOID(env, TAG, "env"); VERIFY_NON_NULL_VOID(obj, TAG, "obj"); VERIFY_NON_NULL_VOID(gatt, TAG, "gatt"); @@ -529,7 +508,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattNWDescriptorWriteCallback(JNIEn jobject gatt, jint status) { - OIC_LOG_V(DEBUG, TAG, "caLeGattNWDescriptorWriteCallback - status %d", status); + OIC_LOG_V(INFO, TAG, "caLeGattNWDescriptorWriteCallback - status %d", status); VERIFY_NON_NULL_VOID(env, TAG, "env"); VERIFY_NON_NULL_VOID(obj, TAG, "obj"); VERIFY_NON_NULL_VOID(gatt, TAG, "gatt"); diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/calestate.c b/resource/csdk/connectivity/src/bt_le_adapter/android/calestate.c index 206f46c..c407b1c 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/calestate.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/calestate.c @@ -134,7 +134,6 @@ bool CALEIsDeviceInList(const char* remoteAddress, if (!strcmp(remoteAddress, state->address)) { - OIC_LOG(DEBUG, TAG, "the device is already set"); return true; } else @@ -143,7 +142,7 @@ bool CALEIsDeviceInList(const char* remoteAddress, } } - OIC_LOG(DEBUG, TAG, "there are no the device in list."); + OIC_LOG(INFO, TAG, "there are no the device in list."); return false; } @@ -176,7 +175,7 @@ CAResult_t CALERemoveAllDeviceState(u_arraylist_t *deviceList, CAResult_t CALEResetDeviceStateForAll(u_arraylist_t *deviceList, oc_mutex deviceListMutex) { - OIC_LOG(DEBUG, TAG, "CALEClientResetDeviceStateForAll"); + OIC_LOG(DEBUG, TAG, "CALEResetDeviceStateForAll"); VERIFY_NON_NULL(deviceList, TAG, "deviceList is null"); oc_mutex_lock(deviceListMutex); @@ -243,8 +242,6 @@ CALEState_t* CALEGetStateInfo(const char* remoteAddress, VERIFY_NON_NULL_RET(deviceList, TAG, "deviceList is null", NULL); uint32_t length = u_arraylist_length(deviceList); - OIC_LOG_V(DEBUG, TAG, "length of deviceStateList : %d", length); - OIC_LOG_V(DEBUG, TAG, "target address : %s", remoteAddress); for (uint32_t index = 0; index < length; index++) { @@ -255,16 +252,14 @@ CALEState_t* CALEGetStateInfo(const char* remoteAddress, continue; } - OIC_LOG_V(DEBUG, TAG, "state address : %s (idx: %d)", state->address, index); - if (!strcmp(state->address, remoteAddress)) { - OIC_LOG(DEBUG, TAG, "found state"); return state; } + OIC_LOG_V(DEBUG, TAG, "state addr[%s, %d]", state->address, index); } - OIC_LOG_V(DEBUG, TAG, "[%s] doesn't exist in deviceStateList", remoteAddress); + OIC_LOG_V(DEBUG, TAG, "[%s] doesn't exist in deviceStateList", remoteAddress, length); return NULL; } diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c index c72abd8..7abefa6 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c @@ -405,7 +405,7 @@ jint CALEGetConstantsValue(JNIEnv *env, const char* classType, const char* name) jobject CALEGetRemoteDevice(JNIEnv *env, jstring address) { - OIC_LOG(DEBUG, TAG, "IN - CALEGetRemoteDevice"); + OIC_LOG(DEBUG, TAG, "CALEGetRemoteDevice"); VERIFY_NON_NULL_RET(env, TAG, "env is null", NULL); VERIFY_NON_NULL_RET(address, TAG, "address is null", NULL); @@ -453,8 +453,6 @@ jobject CALEGetRemoteDevice(JNIEnv *env, jstring address) OIC_LOG(ERROR, TAG, "jni_obj_device is null"); goto error_exit; } - - OIC_LOG(DEBUG, TAG, "OUT - CALEGetRemoteDevice"); return jni_obj_device; error_exit: @@ -464,7 +462,7 @@ error_exit: jstring CALEGetAddressFromGatt(JNIEnv *env, jobject gatt) { - OIC_LOG(DEBUG, TAG, "IN - CALEGetAddressFromGatt"); + OIC_LOG(DEBUG, TAG, "CALEGetAddressFromGatt"); VERIFY_NON_NULL_RET(env, TAG, "env is null", NULL); VERIFY_NON_NULL_RET(gatt, TAG, "gatt is null", NULL); @@ -492,6 +490,5 @@ jstring CALEGetAddressFromGatt(JNIEnv *env, jobject gatt) return NULL; } - OIC_LOG(DEBUG, TAG, "OUT - CALEGetAddressFromGatt"); return jni_address; } diff --git a/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c b/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c index 1b31ee1..1a1fe21 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c @@ -578,8 +578,6 @@ static CAResult_t CALEGetPortsFromSenderInfo(const char *leAddress, static CAResult_t CAInitLEServerQueues() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); - oc_mutex_lock(g_bleAdapterThreadPoolMutex); CAResult_t result = CAInitLEServerSenderQueue(); @@ -610,15 +608,11 @@ static CAResult_t CAInitLEServerQueues() g_dataBleServerReceiverHandlerState = true; oc_mutex_unlock(g_bleAdapterThreadPoolMutex); - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } static CAResult_t CAInitLEClientQueues() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); - oc_mutex_lock(g_bleAdapterThreadPoolMutex); CAResult_t result = CAInitLEClientSenderQueue(); @@ -649,14 +643,12 @@ static CAResult_t CAInitLEClientQueues() g_dataBleClientReceiverHandlerState = true; oc_mutex_unlock(g_bleAdapterThreadPoolMutex); - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } static CAResult_t CAInitLEServerReceiverQueue() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CAInitLEServerReceiverQueue"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CAInitLEServerReceiverQueue"); // Check if the message queue is already initialized if (g_bleServerReceiverQueue) { @@ -691,13 +683,12 @@ static CAResult_t CAInitLEServerReceiverQueue() return CA_STATUS_FAILED; } - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } static CAResult_t CAInitLEClientReceiverQueue() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CAInitLEClientReceiverQueue"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CAInitLEClientReceiverQueue"); // Check if the message queue is already initialized if (g_bleClientReceiverQueue) { @@ -732,13 +723,12 @@ static CAResult_t CAInitLEClientReceiverQueue() return CA_STATUS_FAILED; } - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } static CAResult_t CAInitLEServerSenderQueue() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CAInitLEServerSenderQueue"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CAInitLEServerSenderQueue"); // Check if the message queue is already initialized if (g_bleServerSendQueueHandle) { @@ -765,7 +755,6 @@ static CAResult_t CAInitLEServerSenderQueue() return CA_STATUS_FAILED; } - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } @@ -794,7 +783,7 @@ static void CALEClearSenderInfo() static CAResult_t CAInitLEClientSenderQueue() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CAInitLEClientSenderQueue"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CAInitLEClientSenderQueue"); if (g_bleClientSendQueueHandle) { @@ -819,8 +808,6 @@ static CAResult_t CAInitLEClientSenderQueue() g_bleClientSendQueueHandle = NULL; return CA_STATUS_FAILED; } - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT - CAInitLEClientSenderQueue"); return CA_STATUS_OK; } @@ -847,8 +834,6 @@ static void CAStopLEQueues() static void CATerminateLEQueues() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); - CAQueueingThreadDestroy(g_bleClientSendQueueHandle); OICFree(g_bleClientSendQueueHandle); g_bleClientSendQueueHandle = NULL; @@ -866,8 +851,6 @@ static void CATerminateLEQueues() g_bleClientReceiverQueue = NULL; CALEClearSenderInfo(); - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); } static CAResult_t CALEGetSenderInfo(const char *leAddress, @@ -914,7 +897,7 @@ static CAResult_t CALEGetSenderInfo(const char *leAddress, static void CALEDataReceiverHandler(void *threadData, CABLEAdapter_t receiverType) { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CALEDataReceiverHandler"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CALEDataReceiverHandler"); oc_mutex bleReceiveDataMutex = NULL; bool dataBleReceiverHandlerState = false; @@ -1198,22 +1181,17 @@ static void CALEDataReceiverHandler(void *threadData, CABLEAdapter_t receiverTyp } } oc_mutex_unlock(bleReceiveDataMutex); - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT - CALEDataReceiverHandler"); } static void CALEServerDataReceiverHandler(void *threadData) { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CALEServerDataReceiverHandler"); CALEDataReceiverHandler(threadData, ADAPTER_SERVER); - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); } static void CALEClientDataReceiverHandler(void *threadData) { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CALEClientDataReceiverHandler"); CALEDataReceiverHandler(threadData, ADAPTER_CLIENT); - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); } static void CALEServerSendDataThread(void *threadData) @@ -2303,7 +2281,7 @@ static CAResult_t CALEServerSendDataSingleThread(const uint8_t *data, static CAResult_t CAInitLEAdapterMutex() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CAInitLEAdapterMutex"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CAInitLEAdapterMutex"); if (NULL == g_bleIsServerMutex) { @@ -2401,13 +2379,12 @@ static CAResult_t CAInitLEAdapterMutex() } } - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } static void CATerminateLEAdapterMutex() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CATerminateLEAdapterMutex"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CATerminateLEAdapterMutex"); oc_mutex_free(g_bleIsServerMutex); g_bleIsServerMutex = NULL; @@ -2435,8 +2412,6 @@ static void CATerminateLEAdapterMutex() oc_mutex_free(g_bleClientReceiveDataMutex); g_bleClientReceiveDataMutex = NULL; - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); } /** @@ -2640,7 +2615,7 @@ static CAResult_t CALEAdapterClientSendData(const CAEndpoint_t *remoteEndpoint, static CAResult_t CALEAdapterGattServerStart() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "Before CAStartLEGattServer"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CALEAdapterGattServerStart"); if (caglobals.bleFlags & CA_LE_SERVER_DISABLE) { @@ -2710,7 +2685,7 @@ static CAResult_t CALEAdapterGattServerStop() static CAResult_t CALEAdapterGattClientStart() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "Before CAStartLEGattClient"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CALEAdapterGattClientStart"); CAResult_t result = CAStartLEGattClient(); @@ -2827,7 +2802,7 @@ CAResult_t CAInitializeLE(CARegisterConnectivityCallback registerCallback, CAErrorHandleCallback errorCallback, ca_thread_pool_t handle) { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CAInitializeLE"); //Input validation VERIFY_NON_NULL(registerCallback, CALEADAPTER_TAG, "RegisterConnectivity callback is null"); @@ -2906,23 +2881,16 @@ CAResult_t CAInitializeLE(CARegisterConnectivityCallback registerCallback, }; registerCallback(connHandler); - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); - return CA_STATUS_OK; } static CAResult_t CAStartLE() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "CAStartLE"); - return CAStartLEAdapter(); } static CAResult_t CAStopLE() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); - #ifdef __WITH_DTLS__ CAdeinitSslAdapter(); #endif @@ -2948,15 +2916,12 @@ static CAResult_t CAStopLE() break; } oc_mutex_unlock(g_bleIsServerMutex); - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); - return CAStopLEAdapter(); } static void CATerminateLE() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN - CATerminateLE"); + OIC_LOG(DEBUG, CALEADAPTER_TAG, "CATerminateLE"); CASetLEReqRespServerCallback(NULL); CASetLEReqRespClientCallback(NULL); @@ -2992,8 +2957,6 @@ static void CATerminateLE() #endif CATerminateLEAdapterMutex(); - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT - CATerminateLE"); } static CAResult_t CAStartLEListeningServer() @@ -3110,11 +3073,9 @@ static CAResult_t CAStartLEDiscoveryServer() static CAResult_t CAReadLEData() { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); #ifdef SINGLE_THREAD CACheckLEData(); #endif - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } @@ -3212,10 +3173,10 @@ static int32_t CASendLEUnicastData(const CAEndpoint_t *endpoint, oc_mutex_unlock(g_bleIsServerMutex); OIC_LOG(ERROR, CALEADAPTER_TAG, "Send unicast data for client failed" ); - if (g_errorHandler) - { - g_errorHandler(endpoint, data, dataLen, result); - } + if (g_errorHandler) + { + g_errorHandler(endpoint, data, dataLen, result); + } return -1; } } @@ -3524,8 +3485,6 @@ static CAResult_t CALEAdapterClientSendData(const CAEndpoint_t *remoteEndpoint, const uint8_t *data, uint32_t dataLen) { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); - VERIFY_NON_NULL(data, CALEADAPTER_TAG, "Param data is NULL"); #ifndef SINGLE_THREAD VERIFY_NON_NULL_RET(g_bleClientSendQueueHandle, CALEADAPTER_TAG, @@ -3552,7 +3511,6 @@ static CAResult_t CALEAdapterClientSendData(const CAEndpoint_t *remoteEndpoint, CAQueueingThreadAddData(g_bleClientSendQueueHandle, bleData, sizeof(CALEData_t)); oc_mutex_unlock(g_bleClientSendDataMutex); #endif - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } @@ -3692,8 +3650,6 @@ static CAResult_t CALEAdapterClientReceivedData(const char *remoteAddress, uint32_t dataLength, uint32_t *sentLength) { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); - //Input validation VERIFY_NON_NULL(data, CALEADAPTER_TAG, "Data is null"); VERIFY_NON_NULL(sentLength, CALEADAPTER_TAG, "Sent data length holder is null"); @@ -3734,32 +3690,23 @@ static CAResult_t CALEAdapterClientReceivedData(const char *remoteAddress, *sentLength = dataLength; #endif - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); return CA_STATUS_OK; } static void CASetLEAdapterThreadPoolHandle(ca_thread_pool_t handle) { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); - oc_mutex_lock(g_bleAdapterThreadPoolMutex); g_bleAdapterThreadPool = handle; oc_mutex_unlock(g_bleAdapterThreadPoolMutex); - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); } static void CASetLEReqRespAdapterCallback(CANetworkPacketReceivedCallback callback) { - OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); - oc_mutex_lock(g_bleAdapterReqRespCbMutex); g_networkPacketReceivedCallback = callback; oc_mutex_unlock(g_bleAdapterReqRespCbMutex); - - OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT"); } static void CALEErrorHandler(const char *remoteAddress, diff --git a/resource/csdk/connectivity/src/caconnectivitymanager.c b/resource/csdk/connectivity/src/caconnectivitymanager.c index e051f38..b0bd2e9 100644 --- a/resource/csdk/connectivity/src/caconnectivitymanager.c +++ b/resource/csdk/connectivity/src/caconnectivitymanager.c @@ -354,8 +354,6 @@ CAResult_t CASendResponse(const CAEndpoint_t *object, const CAResponseInfo_t *re CAResult_t CASelectNetwork(CATransportAdapter_t interestedNetwork) { - OIC_LOG_V(DEBUG, TAG, "Selected network : %d", interestedNetwork); - if (!g_isInitialized) { return CA_STATUS_NOT_INITIALIZED; diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c index 1ad9b33..04dc46e 100644 --- a/resource/csdk/connectivity/src/camessagehandler.c +++ b/resource/csdk/connectivity/src/camessagehandler.c @@ -1374,10 +1374,8 @@ static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu) if (NULL != data->remoteEndpoint) { CALogAdapterTypeInfo(data->remoteEndpoint->adapter); - OIC_LOG(DEBUG, ANALYZER_TAG, "-------------------------------------------------"); OIC_LOG_V(DEBUG, ANALYZER_TAG, "Address = [%s]:[%d]", data->remoteEndpoint->addr, data->remoteEndpoint->port); - OIC_LOG(DEBUG, ANALYZER_TAG, "-------------------------------------------------"); } switch(data->dataType) @@ -1440,7 +1438,6 @@ static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu) OIC_LOG(DEBUG, ANALYZER_TAG, "Coap Token"); OIC_LOG_BUFFER(DEBUG, ANALYZER_TAG, (const uint8_t *) info->token, info->tokenLength); OIC_LOG_V(DEBUG, ANALYZER_TAG, "Res URI = [%s]", info->resourceUri); - OIC_LOG(DEBUG, ANALYZER_TAG, "-------------------------------------------------"); if (CA_FORMAT_APPLICATION_CBOR == info->payloadFormat) { @@ -1460,7 +1457,7 @@ static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu) OIC_LOG_V(DEBUG, ANALYZER_TAG, "CoAP Header size = [%lu]", pdu->length - payloadLen); OIC_LOG_V(DEBUG, ANALYZER_TAG, "CoAP Payload"); - OIC_LOG_BUFFER(DEBUG, ANALYZER_TAG, pdu->data, payloadLen); +// OIC_LOG_BUFFER(DEBUG, ANALYZER_TAG, pdu->data, payloadLen); OIC_LOG_V(DEBUG, ANALYZER_TAG, "CoAP Payload Size = [%lu]", payloadLen); OIC_LOG(DEBUG, ANALYZER_TAG, "================================================="); } diff --git a/resource/csdk/connectivity/src/canetworkconfigurator.c b/resource/csdk/connectivity/src/canetworkconfigurator.c index 848d2be..49393bd 100644 --- a/resource/csdk/connectivity/src/canetworkconfigurator.c +++ b/resource/csdk/connectivity/src/canetworkconfigurator.c @@ -73,11 +73,9 @@ CAResult_t CAAddNetworkType(CATransportAdapter_t transportType) { case CA_ADAPTER_IP: #ifndef IP_ADAPTER - OIC_LOG(DEBUG, TAG, "Add network type(IP) - Not Supported"); return CA_NOT_SUPPORTED; #else - OIC_LOG(DEBUG, TAG, "Add network type(IP)"); if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_IP)) { goto exit; @@ -90,11 +88,9 @@ CAResult_t CAAddNetworkType(CATransportAdapter_t transportType) case CA_ADAPTER_RFCOMM_BTEDR: #ifndef EDR_ADAPTER - OIC_LOG(DEBUG, TAG, "Add network type(EDR) - Not Supported"); return CA_NOT_SUPPORTED; #else - OIC_LOG(DEBUG, TAG, "Add network type(EDR)"); if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_RFCOMM)) { goto exit; @@ -107,11 +103,9 @@ CAResult_t CAAddNetworkType(CATransportAdapter_t transportType) case CA_ADAPTER_GATT_BTLE: #ifndef LE_ADAPTER - OIC_LOG(DEBUG, TAG, "Add network type(LE) - Not Supported"); return CA_NOT_SUPPORTED; #else - OIC_LOG(DEBUG, TAG, "Add network type(LE)"); if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_GATT)) { goto exit; @@ -125,7 +119,6 @@ CAResult_t CAAddNetworkType(CATransportAdapter_t transportType) #ifdef RA_ADAPTER case CA_ADAPTER_REMOTE_ACCESS: - OIC_LOG(DEBUG, TAG, "Add network type(RA)"); if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_RA)) { goto exit; @@ -138,7 +131,6 @@ CAResult_t CAAddNetworkType(CATransportAdapter_t transportType) #ifdef TCP_ADAPTER case CA_ADAPTER_TCP: - OIC_LOG(DEBUG, TAG, "Add network type(TCP)"); if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_TCP)) { goto exit; @@ -151,11 +143,9 @@ CAResult_t CAAddNetworkType(CATransportAdapter_t transportType) case CA_ADAPTER_NFC: #ifndef NFC_ADAPTER - OIC_LOG(DEBUG, TAG, "Add network type(NFC) - Not Supported"); return CA_NOT_SUPPORTED; #else - OIC_LOG(DEBUG, TAG, "Add network type(NFC)"); if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_NFC)) { goto exit; diff --git a/resource/csdk/connectivity/src/caprotocolmessage.c b/resource/csdk/connectivity/src/caprotocolmessage.c index 64f0acb..71c093e 100644 --- a/resource/csdk/connectivity/src/caprotocolmessage.c +++ b/resource/csdk/connectivity/src/caprotocolmessage.c @@ -534,9 +534,7 @@ CAResult_t CAParseHeadOption(uint32_t code, const CAInfo_t *info, coap_list_t ** } else { - OIC_LOG_V(DEBUG, TAG, "Head opt ID: %d", id); - OIC_LOG_V(DEBUG, TAG, "Head opt data: %s", (info->options + i)->optionData); - OIC_LOG_V(DEBUG, TAG, "Head opt length: %d", (info->options + i)->optionLength); + OIC_LOG_V(DEBUG, TAG, "Head opt ID[%d], length[%d]", id, (info->options + i)->optionLength); int ret = coap_insert(optlist, CACreateNewOptionNode(id, (info->options + i)->optionLength, (info->options + i)->optionData), @@ -1232,12 +1230,12 @@ CAPayloadFormat_t CAConvertFormat(uint16_t format) #ifdef WITH_BWT bool CAIsSupportedBlockwiseTransfer(CATransportAdapter_t adapter) { - OIC_LOG_V(INFO, TAG, "adapter value is %d", adapter); if (CA_ADAPTER_IP & adapter || CA_ADAPTER_NFC & adapter || CA_DEFAULT_ADAPTER == adapter) { return true; } + OIC_LOG_V(INFO, TAG, "adapter value of BWT is %d", adapter); return false; } #endif @@ -1245,12 +1243,12 @@ bool CAIsSupportedBlockwiseTransfer(CATransportAdapter_t adapter) #ifdef WITH_TCP bool CAIsSupportedCoAPOverTCP(CATransportAdapter_t adapter) { - OIC_LOG_V(INFO, TAG, "adapter value is %d", adapter); if (CA_ADAPTER_GATT_BTLE & adapter || CA_ADAPTER_RFCOMM_BTEDR & adapter || CA_ADAPTER_TCP & adapter || CA_DEFAULT_ADAPTER == adapter) { return true; } + OIC_LOG_V(INFO, TAG, "adapter value of CoAP/TCP is %d", adapter); return false; } #endif diff --git a/resource/csdk/connectivity/src/ip_adapter/android/caifaddrs.c b/resource/csdk/connectivity/src/ip_adapter/android/caifaddrs.c index eadc2a4..2cef4a8 100644 --- a/resource/csdk/connectivity/src/ip_adapter/android/caifaddrs.c +++ b/resource/csdk/connectivity/src/ip_adapter/android/caifaddrs.c @@ -196,7 +196,6 @@ CAResult_t CAGetIfaddrsUsingNetlink(struct ifaddrs **ifap) goto exit; case RTM_NEWADDR: - OIC_LOG(DEBUG, TAG, "RTM_NEWADDR"); node = CAParsingAddr(recvMsg); state = CA_MEMORY_ALLOC_FAILED; VERIFY_NON_NULL(node); diff --git a/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c index 2c02fce..f9631d9 100644 --- a/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c +++ b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c @@ -435,9 +435,6 @@ JNIEXPORT void JNICALL Java_org_iotivity_ca_CaLeClientInterface_caManagerLeGattConnectionStateChangeCB( JNIEnv *env, jobject obj, jobject gatt, jint status, jint newState) { - OIC_LOG_V(INFO, TAG, "caManagerLeGattConnectionStateChangeCB - status %d, newState %d", - status, newState); - VERIFY_NON_NULL_VOID(env, TAG, "env"); VERIFY_NON_NULL_VOID(obj, TAG, "obj"); VERIFY_NON_NULL_VOID(gatt, TAG, "gatt"); @@ -460,12 +457,8 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeGattConnectionStateChangeCB( return; } - OIC_LOG_V(DEBUG, TAG, "caManagerLeGattConnectionStateChangeCB - address [%s]", address); - if (GATT_SUCCESS == status && state_connected == newState) // le connected { - OIC_LOG(DEBUG, TAG, "LE is connected"); - CAResult_t res = CAManagerReadRemoteRssi(env, gatt); if (CA_STATUS_OK != res) { @@ -475,8 +468,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeGattConnectionStateChangeCB( } else if (state_disconnected == newState)// le disconnected { - OIC_LOG(DEBUG, TAG, "LE is disconnected"); - if (LINK_LOSS == status || REMOTE_DISCONNECT == status) { if (!CAManagerIsInACDataList(env, jni_address)) @@ -517,7 +508,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J jobject gatt, jint status) { - OIC_LOG_V(INFO, TAG, "caManagerLeServicesDiscoveredCallback - status %d", status); VERIFY_NON_NULL_VOID(env, TAG, "env"); VERIFY_NON_NULL_VOID(obj, TAG, "obj"); VERIFY_NON_NULL_VOID(gatt, TAG, "gatt"); @@ -546,8 +536,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J return; } - OIC_LOG_V(DEBUG, TAG, "ServicesDiscovered device : %s", address); - if (CAManagerIsConnectedDeviceAddress(env, g_context, jni_address, g_connectedDeviceSet)) { OIC_LOG(INFO, TAG, "AC list - the address will be added to ACData list"); @@ -565,8 +553,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J (*env)->ReleaseStringUTFChars(env, jni_address, address); (*env)->DeleteLocalRef(env, jni_address); - - OIC_LOG(INFO, TAG, "ServicesDiscovery is successful"); } else { diff --git a/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.c index cbdde51..9e183f9 100644 --- a/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.c +++ b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.c @@ -111,7 +111,6 @@ void CAManagerTerminateMutexVariables() static CAManagerACData_t *CAManagerCreateACData(jstring jaddress) { - OIC_LOG(DEBUG, TAG, "IN - CAManagerCreateACData"); VERIFY_NON_NULL_RET(jaddress, TAG, "jaddress", NULL); // create AC data @@ -124,8 +123,6 @@ static CAManagerACData_t *CAManagerCreateACData(jstring jaddress) data->address = jaddress; data->isAutoConnecting = false; - - OIC_LOG(DEBUG, TAG, "OUT - CAManagerCreateACData"); return data; } @@ -185,8 +182,6 @@ bool CAManagerIsInACDataList(JNIEnv *env, jstring jaddress) void CAManagerAddACData(JNIEnv *env, jstring jaddress) { - OIC_LOG(DEBUG, TAG, "IN - CAManagerAddACData"); - VERIFY_NON_NULL_VOID(env, TAG, "env"); VERIFY_NON_NULL_VOID(jaddress, TAG, "jaddress"); @@ -206,8 +201,6 @@ void CAManagerAddACData(JNIEnv *env, jstring jaddress) { OIC_LOG(DEBUG, TAG, "the address is already in ACData list"); } - - OIC_LOG(DEBUG, TAG, "OUT - CAManagerAddACData"); } CAResult_t CAManagerRemoveACData(JNIEnv *env, jstring jaddress) diff --git a/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.c index eaec1d1..54fb2c3 100644 --- a/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.c +++ b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.c @@ -215,8 +215,6 @@ bool CAManagerControlAdapter(JNIEnv *env, bool control_flag) CAResult_t CAManagerReadRemoteRssi(JNIEnv *env, jobject bluetoothGatt) { - OIC_LOG(DEBUG, TAG, "CAManagerReadRemoteRssi"); - VERIFY_NON_NULL(env, TAG, "env is null"); VERIFY_NON_NULL(bluetoothGatt, TAG, "bluetoothGatt is null"); @@ -227,7 +225,6 @@ CAResult_t CAManagerReadRemoteRssi(JNIEnv *env, jobject bluetoothGatt) } // get BluetoothGatt class - OIC_LOG(DEBUG, TAG, "get BluetoothGatt class"); jclass jni_cid_BluetoothGatt = (*env)->FindClass(env, CLASSPATH_BT_GATT); if (!jni_cid_BluetoothGatt) { @@ -235,7 +232,6 @@ CAResult_t CAManagerReadRemoteRssi(JNIEnv *env, jobject bluetoothGatt) return CA_STATUS_FAILED; } - OIC_LOG(DEBUG, TAG, "discovery gatt services method"); jmethodID jni_mid_readRemoteRssi = (*env)->GetMethodID(env, jni_cid_BluetoothGatt, "readRemoteRssi", "()Z"); if (!jni_mid_readRemoteRssi) @@ -244,7 +240,6 @@ CAResult_t CAManagerReadRemoteRssi(JNIEnv *env, jobject bluetoothGatt) return CA_STATUS_FAILED; } // call disconnect gatt method - OIC_LOG(DEBUG, TAG, "CALL API - request readremoteRssi"); jboolean ret = (*env)->CallBooleanMethod(env, bluetoothGatt, jni_mid_readRemoteRssi); if (!ret) { @@ -613,7 +608,6 @@ bool CAManagerAddConnectedDeviceAddress(JNIEnv *env, jobject context, bool CAManagerIsConnectedDeviceAddress(JNIEnv *env, jobject context, jstring address, jobject set) { - OIC_LOG(DEBUG, TAG, "CAManagerIsConnectedDeviceAddress"); VERIFY_NON_NULL_RET(env, TAG, "env", false); VERIFY_NON_NULL_RET(context, TAG, "context", false); @@ -722,7 +716,6 @@ jobject CAManagerCreateSetString(JNIEnv *env) bool CAManagerCallFuncSetString(JNIEnv *env, jstring address, jobject set, CASetMethod_t method_type) { - OIC_LOG(DEBUG, TAG, "CAManagerCallFuncSetString"); VERIFY_NON_NULL_RET(env, TAG, "env", false); VERIFY_NON_NULL_RET(address, TAG, "address", false); VERIFY_NON_NULL_RET(set, TAG, "set", false); @@ -738,17 +731,14 @@ bool CAManagerCallFuncSetString(JNIEnv *env, jstring address, jobject set, switch (method_type) { case CM_CONTAINS: - OIC_LOG(DEBUG, TAG, "java/util/HashSet.contains"); jni_mid_setMethod = (*env)->GetMethodID(env, jni_cls_set, "contains", "(Ljava/lang/Object;)Z"); break; case CM_ADD: - OIC_LOG(DEBUG, TAG, "java/util/HashSet.add"); jni_mid_setMethod = (*env)->GetMethodID(env, jni_cls_set, "add", "(Ljava/lang/Object;)Z"); break; case CM_REMOVE: - OIC_LOG(DEBUG, TAG, "java/util/HashSet.remove"); jni_mid_setMethod = (*env)->GetMethodID(env, jni_cls_set, "remove", "(Ljava/lang/Object;)Z"); break; @@ -762,6 +752,5 @@ bool CAManagerCallFuncSetString(JNIEnv *env, jstring address, jobject set, } jboolean res = (*env)->CallBooleanMethod(env, set, jni_mid_setMethod, address); - OIC_LOG_V(DEBUG, TAG, "method return result : %d", res); return res; } diff --git a/resource/csdk/routing/src/routingutility.c b/resource/csdk/routing/src/routingutility.c index 6900e66..409c49a 100644 --- a/resource/csdk/routing/src/routingutility.c +++ b/resource/csdk/routing/src/routingutility.c @@ -80,7 +80,6 @@ void RMSetStackMode(OCMode mode) OCStackResult RMAddInfo(const char *destination, void *message, bool isRequest, bool *doPost) { - OIC_LOG(DEBUG, TAG, "IN"); RM_NULL_CHECK_WITH_RET(message, TAG, "options"); CAHeaderOption_t **options = NULL; @@ -214,14 +213,12 @@ OCStackResult RMAddInfo(const char *destination, void *message, bool isRequest, *options = optionPtr; } - OIC_LOG(DEBUG, TAG, "OUT"); return OC_STACK_OK; } OCStackResult RMUpdateInfo(CAHeaderOption_t **options, uint8_t *numOptions, CAEndpoint_t *endpoint) { - OIC_LOG(DEBUG, TAG, "IN"); RM_NULL_CHECK_WITH_RET(options, TAG, "options"); RM_NULL_CHECK_WITH_RET(*options, TAG, "invalid option"); RM_NULL_CHECK_WITH_RET(numOptions, TAG, "numOptions"); @@ -284,13 +281,11 @@ OCStackResult RMUpdateInfo(CAHeaderOption_t **options, uint8_t *numOptions, OICFree(*options); *options = NULL; } - OIC_LOG(DEBUG, TAG, "OUT"); return OC_STACK_OK; } void RMGetRouteOptionIndex(const CAHeaderOption_t *options, uint8_t numOptions, int8_t *index) { - OIC_LOG(DEBUG, TAG, "IN"); RM_NULL_CHECK_VOID(index, TAG, "index"); if (NULL == options) @@ -309,12 +304,10 @@ void RMGetRouteOptionIndex(const CAHeaderOption_t *options, uint8_t numOptions, break; } } - OIC_LOG(DEBUG, TAG, "OUT"); } OCStackResult RMCreateRouteOption(const RMRouteOption_t *optValue, CAHeaderOption_t *options) { - OIC_LOG(DEBUG, RM_TAG, "IN"); RM_NULL_CHECK_WITH_RET(optValue, RM_TAG, "optValue"); RM_NULL_CHECK_WITH_RET(options, RM_TAG, "options"); @@ -426,13 +419,11 @@ OCStackResult RMCreateRouteOption(const RMRouteOption_t *optValue, CAHeaderOptio OIC_LOG_V(INFO, RM_TAG, "Option Length is %d", options->optionLength); OICFree(tempData); - OIC_LOG(DEBUG, RM_TAG, "OUT"); return OC_STACK_OK; } OCStackResult RMParseRouteOption(const CAHeaderOption_t *options, RMRouteOption_t *optValue) { - OIC_LOG(DEBUG, RM_TAG, "IN"); RM_NULL_CHECK_WITH_RET(options, RM_TAG, "options"); RM_NULL_CHECK_WITH_RET(optValue, RM_TAG, "optValue"); if (0 == options->optionLength) @@ -504,6 +495,5 @@ OCStackResult RMParseRouteOption(const CAHeaderOption_t *options, RMRouteOption_ OIC_LOG_V(INFO, RM_TAG, "Option Sender Addr is [%u][%u]", optValue->srcGw, optValue->srcEp); OIC_LOG_V(INFO, RM_TAG, "Option Dest Addr is [%u][%u]", optValue->destGw, optValue->destEp); OIC_LOG_V(INFO, RM_TAG, "Message Type is [%u]", optValue->msgType); - OIC_LOG(DEBUG, RM_TAG, "OUT"); return OC_STACK_OK; } diff --git a/resource/csdk/stack/src/ocpayloadparse.c b/resource/csdk/stack/src/ocpayloadparse.c index e6738f5..2327e46 100755 --- a/resource/csdk/stack/src/ocpayloadparse.c +++ b/resource/csdk/stack/src/ocpayloadparse.c @@ -62,7 +62,6 @@ OCStackResult OCParsePayload(OCPayload **outPayload, OCPayloadType payloadType, OIC_LOG_V(INFO, TAG, "CBOR Parsing size: %zu of Payload Type: %d, Payload:", payloadSize, payloadType); - OIC_LOG_BUFFER(DEBUG, TAG, payload, payloadSize); CborParser parser; CborValue rootValue; -- 2.7.4