#include <murphy/resource/client-api.h>
#include <murphy/resource/config-api.h>
#include <murphy/resource/manager-api.h>
+#include <murphy/resource/protocol.h>
enum {
ARG_CONFIG_FILE,
}
+static void reply_with_array(client_t *client,mrp_msg_t *msg,const char **arr)
+{
+ resource_data_t *data = client->data;
+ mrp_plugin_t *plugin = data->plugin;
+ uint16_t dim;
+ bool s;
+
+ for (dim = 0; arr[dim]; dim++)
+ ;
+
+ s = mrp_msg_append(msg, MRP_MSG_TAG_SINT16(RESPROTO_REQUEST_STATUS, 0));
+ s &= mrp_msg_append(msg, MRP_MSG_TAG_STRING_ARRAY(RESPROTO_RESOURCE_NAME,
+ dim, arr));
+ if (!s) {
+ mrp_log_error("%s: failed to build reply", plugin->instance);
+ return;
+ }
+
+ if (!mrp_transport_send(client->transp, msg))
+ mrp_log_error("%s: failed to send reply", plugin->instance);
+}
+
+static void reply_with_error(client_t *client, mrp_msg_t *msg, int16_t err)
+{
+ if (!mrp_msg_append(msg,MRP_MSG_TAG_SINT16(RESPROTO_REQUEST_STATUS,err)) ||
+ !mrp_transport_send(client->transp, msg))
+ {
+ resource_data_t *data = client->data;
+ mrp_plugin_t *plugin = data->plugin;
+
+ mrp_log_error("%s: failed to create or send reply", plugin->instance);
+ }
+}
+
+static void query_resources_request(client_t *client, mrp_msg_t *req)
+{
+ const char **names = mrp_resource_definition_get_all_names(0, NULL);
+
+ if (!names)
+ reply_with_error(client, req, ENOMEM);
+ else {
+ reply_with_array(client, req, names);
+ mrp_free(names);
+ }
+}
+
+static void query_classes_request(client_t *client, mrp_msg_t *req)
+{
+ const char **names = mrp_application_class_get_all_names(0, NULL);
+
+ if (!names)
+ reply_with_error(client, req, ENOMEM);
+ else {
+ reply_with_array(client, req, names);
+ mrp_free(names);
+ }
+}
+
+static void query_zones_request(client_t *client, mrp_msg_t *req)
+{
+ const char **names = mrp_zone_get_all_names(0, NULL);
+
+ if (!names)
+ reply_with_error(client, req, ENOMEM);
+ else {
+ reply_with_array(client, req, names);
+ mrp_free(names);
+ }
+}
+
+
static void connection_evt(mrp_transport_t *listen, void *user_data)
{
static uint32_t id;
mrp_list_append(&data->clients, &client->list);
- mrp_log_warning("%s: %s connected", plugin->instance, name);
+ mrp_log_info("%s: %s connected", plugin->instance, name);
}
void closed_evt(mrp_transport_t *transp, int error, void *user_data)
mrp_log_error("%s: connection error %d (%s)",
plugin->instance, error, strerror(error));
else
- mrp_log_warning("%s: peer closed connection", plugin->instance);
+ mrp_log_info("%s: peer closed connection", plugin->instance);
mrp_resource_client_destroy(client->rscli);
mrp_sockaddr_t *addr, socklen_t addrlen,
void *user_data)
{
- resource_data_t *data = (resource_data_t *)user_data;
+ client_t *client = (client_t *)user_data;
+ resource_data_t *data = client->data;
+ mrp_plugin_t *plugin = data->plugin;
+ uint32_t seqno = 0;
+ mrp_resproto_request_t reqtyp = -1;
+ mrp_msg_field_t *field;
+
+ MRP_UNUSED(addr);
+ MRP_UNUSED(addrlen);
+
+ MRP_ASSERT(client->transp == transp, "confused with data structures");
+
+ mrp_log_info("%s: received a message", plugin->instance);
+ mrp_msg_dump(msg, stdout);
+
+ field = mrp_msg_find(msg, RESPROTO_SEQUENCE_NO);
+
+ if (field && field->type == MRP_MSG_FIELD_UINT32)
+ seqno = field->u32;
+ else {
+ mrp_log_warning("%s: malformed message. Bad or missing "
+ "sequence number", plugin->instance);
+ return;
+ }
+
+ field = mrp_msg_find(msg, RESPROTO_REQUEST_TYPE);
+
+ if (field && field->type == MRP_MSG_FIELD_UINT16)
+ reqtyp = field->u16;
+ else {
+ mrp_log_warning("%s: malformed message. Bad or missing "
+ "request type", plugin->instance);
+ return;
+ }
- mrp_log_warning("%s: received a message", data->plugin->instance);
- //mrp_dump_msg(msg, stdout);
+ switch (reqtyp) {
+
+ case RESPROTO_QUERY_RESOURCES:
+ query_resources_request(client, msg);
+ break;
+
+ case RESPROTO_QUERY_CLASSES:
+ query_classes_request(client, msg);
+ break;
+
+ case RESPROTO_QUERY_ZONES:
+ query_zones_request(client, msg);
+ break;
+
+ default:
+ mrp_log_warning("%s: unsupported request type %d",
+ plugin->instance, reqtyp);
+ break;
+ }
}
static void recv_msg(mrp_transport_t *transp, mrp_msg_t *msg, void *user_data)
int flags = MRP_TRANSPORT_REUSEADDR;
bool stream;
- //register_messages(data);
-
data->alen = mrp_transport_resolve(NULL, addr, &data->saddr,
sizeof(data->saddr), &data->atyp);
MRP_UNUSED(event_data);
- mrp_log_warning("%s: got event 0x%x (%s):", plugin->instance, id, event);
+ mrp_log_info("%s: got event 0x%x (%s):", plugin->instance, id, event);
if (data && event) {
if (!strcmp(event, MRP_PLUGIN_EVENT_STARTED)) {
cfgfile = args[ARG_CONFIG_FILE].str;
set_default_configuration();
- mrp_log_warning("%s: built-in default configuration is in use",
- plugin->instance);
+ mrp_log_info("%s: built-in default configuration is in use",
+ plugin->instance);
initiate_transport(plugin);
--- /dev/null
+/*
+ * Copyright (c) 2012, Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Intel Corporation nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __MURPHY_RESOURCE_PROTOCOL_H__
+#define __MURPHY_RESOURCE_PROTOCOL_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <murphy/common/msg.h>
+
+
+#define RESPROTO_TAG(x) ((uint16_t)(x))
+
+#define RESPROTO_MESSAGE_END MRP_MSG_FIELD_END
+#define RESPROTO_SECTION_END RESPROTO_TAG(1)
+#define RESPROTO_ARRAY_DIMENSION RESPROTO_TAG(2)
+#define RESPROTO_SEQUENCE_NO RESPROTO_TAG(3)
+#define RESPROTO_REQUEST_TYPE RESPROTO_TAG(4)
+#define RESPROTO_REQUEST_STATUS RESPROTO_TAG(5)
+#define RESPROTO_RESOURCE_NAME RESPROTO_TAG(6)
+#define RESPROTO_RESOURCE_ID RESPROTO_TAG(7)
+#define RESPROTO_RESOURCE_GRANT RESPROTO_TAG(8)
+#define RESPROTO_RESOURCE_ADVICE RESPROTO_TAG(9)
+#define RESPROTO_ATTRIBUTE_INDEX RESPROTO_TAG(10)
+#define RESPROTO_ATTRIBUTE_NAME RESPROTO_TAG(11)
+#define RESPROTO_ATTRIBUTE_VALUE RESPROTO_TAG(12)
+
+typedef enum {
+ RESPROTO_QUERY_RESOURCES,
+ RESPROTO_QUERY_CLASSES,
+ RESPROTO_QUERY_ZONES,
+} mrp_resproto_request_t;
+
+
+#endif /* __MURPHY_RESOURCE_PROTOCOL_H__ */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ *
+ */
projects / profile / ivi / murphy.git / commitdiff