msg.disclose((char *)&buf);
- sensor_listener_proxy *listener;
+ sensor_listener_proxy *listener = NULL;
listener = new(std::nothrow) sensor_listener_proxy(listener_id,
buf.sensor, m_manager, ch);
retvm_if(!listener, OP_ERROR, "Failed to allocate memory");
- retvm_if(!has_privileges(ch->get_fd(), listener->get_required_privileges()),
- -EACCES, "Permission denied");
+
+ if (!has_privileges(ch->get_fd(), listener->get_required_privileges())) {
+ delete listener;
+ listener = NULL;
+ _E("Permission denied[%d, %s]", listener_id,
+ m_listeners[listener_id]->get_required_privileges().c_str());
+ return -EACCES;
+ }
buf.listener_id = listener_id;
reply.enclose((const char *)&buf, sizeof(buf));
reply.header()->err = OP_SUCCESS;
- if (!ch->send_sync(&reply))
+ if (!ch->send_sync(&reply)) {
+ delete listener;
return OP_ERROR;
+ }
_I("Connected sensor_listener[fd(%d) -> id(%u)]", ch->get_fd(), listener_id);
m_listeners[listener_id] = listener;
auto it = m_listeners.find(id);
retv_if(it == m_listeners.end(), -EINVAL);
retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
- -EACCES, "Permission denied");
+ -EACCES, "Permission denied[%d, %s]",
+ id, m_listeners[id]->get_required_privileges().c_str());
int ret = m_listeners[id]->start();
- retv_if(ret < 0, ret);
+ retvm_if(ret < 0, ret, "Failed to start listener[%d]", id);
return send_reply(ch, OP_SUCCESS);
}
auto it = m_listeners.find(id);
retv_if(it == m_listeners.end(), -EINVAL);
retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
- -EACCES, "Permission denied");
+ -EACCES, "Permission denied[%d, %s]",
+ id, m_listeners[id]->get_required_privileges().c_str());
int ret = m_listeners[id]->stop();
- retv_if(ret < 0, ret);
+ retvm_if(ret < 0, ret, "Failed to stop listener[%d]", id);
return send_reply(ch, OP_SUCCESS);
}
auto it = m_listeners.find(id);
retv_if(it == m_listeners.end(), -EINVAL);
retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
- -EACCES, "Permission denied");
+ -EACCES, "Permission denied[%d, %s]",
+ id, m_listeners[id]->get_required_privileges().c_str());
switch (buf.attribute) {
case SENSORD_ATTRIBUTE_INTERVAL:
int server_channel_handler::listener_attr_str(channel *ch, message &msg)
{
- cmd_listener_attr_str_t buf;
- msg.disclose((char *)&buf);
- uint32_t id = buf.listener_id;
+ uint32_t id;
+ cmd_listener_attr_str_t *buf;
+
+ buf = (cmd_listener_attr_str_t *) new(std::nothrow) char[msg.size()];
+ retvm_if(!buf, -ENOMEM, "Failed to allocate memory");
+ msg.disclose((char *)buf);
+
+ id = buf->listener_id;
auto it = m_listeners.find(id);
- retv_if(it == m_listeners.end(), -EINVAL);
- retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
- -EACCES, "Permission denied");
+ if (it == m_listeners.end()) {
+ delete [] buf;
+ return -EINVAL;
+ }
- int ret = m_listeners[id]->set_attribute(buf.attribute, buf.value, buf.len);
- retv_if(ret < 0, ret);
+ if (!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges())) {
+ _E("Permission denied[%d, %s]", id, m_listeners[id]->get_required_privileges().c_str());
+ delete [] buf;
+ return -EACCES;
+ }
+
+ int ret = m_listeners[id]->set_attribute(buf->attribute, buf->value, buf->len);
+ if (ret < 0) {
+ delete [] buf;
+ return ret;
+ }
+ delete [] buf;
return send_reply(ch, OP_SUCCESS);
}
auto it = m_listeners.find(id);
retv_if(it == m_listeners.end(), -EINVAL);
retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
- -EACCES, "Permission denied");
+ -EACCES, "Permission denied[%d, %s]",
+ id, m_listeners[id]->get_required_privileges().c_str());
int ret = m_listeners[id]->get_data(&data, &len);
retv_if(ret < 0, ret);