#include "bt-otpserver.h"
#include "bluetooth-api.h"
+#include <cynara-client.h>
#undef LOG_TAG
#define LOG_TAG "BLUETOOTH_OTP"
FILE *fp;
char file_path[BT_FILE_PATH_MAX_LEN] = {0, };
int length;
+ char err_msg[256] = {0, };
snprintf(file_path, BT_FILE_PATH_MAX_LEN, "%s%s",
directory, selected_object->name);
fp = fopen(file_path, "r");
if (!fp) {
- BT_DBG("fopen() failed : %s", strerror(errno));
+ cynara_strerror(errno, err_msg, sizeof(err_msg));
+ BT_ERR("fopen() failed : %s", err_msg);
return;
}
gsize len = 0;
int written;
int fd;
+ char err_msg[256] = {0, };
BT_DBG("");
return TRUE;
}
- BT_DBG("Received data length %d, remote_addr = %s", len, remote_addr);
+ BT_DBG("Received data length %zu, remote_addr = %s", len, remote_addr);
if (!oacp_op->fp) {
char file_path[BT_FILE_PATH_MAX_LEN] = {0, };
BT_DBG("file_path = [%s]", file_path);
fp = fopen(file_path, "w");
if (!fp) {
- BT_DBG("fopen() failed : %s", strerror(errno));
+ cynara_strerror(errno, err_msg, sizeof(err_msg));
+ BT_ERR("fopen() failed : %s", err_msg);
goto fail;
}
oacp_op->fp = fp;
if (oacp_op->length_sofar <= oacp_op->length) {
written = fwrite(buffer, 1, len, oacp_op->fp);
oacp_op->length_sofar += written;
- BT_DBG("written [%d], length_sofar [%lu], received_buff_len [%d], size [%lu]",
+ BT_DBG("written [%d], length_sofar [%u], received_buff_len [%zu], size [%u]",
written, oacp_op->length_sofar, len, oacp_op->length);
}
_bt_otp_start_write_on_fd();
else if (oacp_op->opcode == OACP_WRITE)
_bt_otp_start_read_on_fd();
+ } else {
+ /* Close fd if oacp_op is NULL */
+ close(fd);
}
g_dbus_method_invocation_return_value(invocation, NULL);
}
{
void *handle;
char *error;
- int ret;
+ int ret = BLUETOOTH_ERROR_NONE;
/* check ARCH 64 or 32*/
if (!access(FILEPATH_ARCH_64, 0)) {
dlerror(); /* Clear any existing error */
int (*fun)(char *) = (int (*)(char *))dlsym(handle,
- "bt_app_control_send_launch_request");
+ "bt_app_control_send_launch_request");
if ((error = dlerror()) != NULL) {
BT_ERR("Can not load symbol : %s", dlerror());
return BLUETOOTH_ERROR_INTERNAL;
}
- ret = fun(absolute_path);
+ if (fun)
+ ret = fun(absolute_path);
dlclose(handle);
return ret;
index = 0;
object = _bt_otp_client_find_object(otp_object_list, prev_obj_id, &index);
+ if (!object) {
+ BT_ERR("Object is NULL");
+ return;
+ }
oacp_create = FALSE;
update_obj_metadata_charc_value(object);
selected_object = object;
if (opcode == OACP_WRITE)
mode = (uint8_t)value[9] & 0xFF;
- BT_INFO("Offset = %lu, Length = %lu", object_offset, length, mode);
+ BT_INFO("Offset = %u, Length = %u", object_offset, length);
if (oacp_op) {
if (otc_connection_status) {
(uint64_t)(value[3] & 0xFF) << 16 |
(uint64_t)(value[2] & 0xFF) << 8 |
(uint64_t)(value[1] & 0xFF);
- BT_INFO("Object ID [%llu]", object_id);
+ BT_INFO("Object ID [%llu]", (unsigned long long int)object_id);
if (selected_object && selected_object->id == object_id)
goto fail;
char new_abs_filepath[BT_FILE_PATH_MAX_LEN] = {0, };
int ret = BLUETOOTH_ERROR_NONE;
FILE *fp = NULL;
+ char err_msg[256] = {0, };
object = (struct object_metadata *) g_slist_nth_data(otp_object_list, curr_obj_index);
if (!object)
fp = fopen(new_abs_filepath, "a");
if (!fp) {
- BT_DBG("fopen() failed : %s", strerror(errno));
+ cynara_strerror(errno, err_msg, sizeof(err_msg));
+ BT_ERR("fopen() failed : %s", err_msg);
ret = BLUETOOTH_ATT_ERROR_INTERNAL;
goto fail;
}
*len = info->value_length - offset;
*value = (char *)malloc(sizeof(char)*(*len));
+ if (*value == NULL)
+ return BLUETOOTH_ATT_ERROR_INTERNAL;
+
memcpy(*value, info->char_value, *len);
return BLUETOOTH_ATT_ERROR_NONE;