#include <sensor_info.h>
#include <sensor_handler.h>
#include <sensor_utils.h>
+#include <sensor_types_private.h>
#include <command_types.h>
#include "permission_checker.h"
#include "application_sensor_handler.h"
-#define PRIV_DELIMINATOR ";"
-
using namespace sensor;
using namespace ipc;
switch (msg.type()) {
case CMD_MANAGER_CONNECT:
err = manager_connect(ch, msg); break;
- case CMD_MANAGER_DISCONNECT:
- err = manager_disconnect(ch, msg); break;
case CMD_MANAGER_SENSOR_LIST:
err = manager_get_sensor_list(ch, msg); break;
case CMD_LISTENER_CONNECT:
err = listener_connect(ch, msg); break;
- case CMD_LISTENER_DISCONNECT:
- err = listener_disconnect(ch, msg); break;
case CMD_LISTENER_START:
err = listener_start(ch, msg); break;
case CMD_LISTENER_STOP:
err = listener_get_data(ch, msg); break;
case CMD_PROVIDER_CONNECT:
err = provider_connect(ch, msg); break;
- case CMD_PROVIDER_DISCONNECT:
- err = provider_disconnect(ch, msg); break;
case CMD_PROVIDER_PUBLISH:
err = provider_publish(ch, msg); break;
case CMD_HAS_PRIVILEGE:
return OP_SUCCESS;
}
-int server_channel_handler::manager_disconnect(channel *ch, message &msg)
-{
- m_manager->deregister_channel(ch);
- return send_reply(ch, OP_SUCCESS);
-}
-
int server_channel_handler::manager_get_sensor_list(channel *ch, message &msg)
{
ipc::message reply;
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;
return OP_SUCCESS;
}
-int server_channel_handler::listener_disconnect(channel *ch, message &msg)
-{
- auto it = m_listener_ids.find(ch);
- retv_if(it == m_listener_ids.end(), -EINVAL);
-
- uint32_t id = it->second;
-
- retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
- -EACCES, "Permission denied");
-
- delete m_listeners[id];
- m_listeners.erase(id);
- m_listener_ids.erase(ch);
-
- _D("Disconnected sensor_listener[%u]", id);
-
- return send_reply(ch, OP_SUCCESS);
-}
-
int server_channel_handler::listener_start(channel *ch, message &msg)
{
cmd_listener_start_t buf;
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);
int server_channel_handler::provider_connect(channel *ch, message &msg)
{
- retvm_if(!has_privileges(ch->get_fd(), PRIV_APPLICATION_SENSOR_WRITE),
- -EACCES, "Permission denied");
-
sensor_info info;
info.clear();
info.deserialize(msg.body(), msg.size());
return send_reply(ch, OP_SUCCESS);
}
-int server_channel_handler::provider_disconnect(channel *ch, message &msg)
-{
- auto it = m_app_sensors.find(ch);
- retv_if(it == m_app_sensors.end(), -EINVAL);
-
- sensor_info info = it->second->get_sensor_info();
-
- m_manager->deregister_sensor(info.get_uri());
- m_app_sensors.erase(ch);
-
- return send_reply(ch, OP_SUCCESS);
-}
-
int server_channel_handler::provider_publish(channel *ch, message &msg)
{
auto it = m_app_sensors.find(ch);
bool server_channel_handler::has_privileges(int fd, std::string priv)
{
std::vector<std::string> privileges;
- privileges = utils::tokenize(priv, PRIV_DELIMINATOR);
+ privileges = utils::tokenize(priv, PRIV_DELIMITER);
for (auto it = privileges.begin(); it != privileges.end(); ++it) {
if (!has_privilege(fd, *it))
projects / platform / core / system / sensord.git / blobdiff