Update service_trigger update interface.

To deliever the content_info for updating content.

Change-Id: I83f11172850259ccbab9a207f819f680d17f9362

diff --git a/include/slave_rpc.h b/include/slave_rpc.h
index 18944ab..b141ee5 100644 (file)
--- a/include/slave_rpc.h
+++ b/include/slave_rpc.h
@@ -19,7 +19,7 @@ extern int slave_rpc_request_only(struct slave_node *slave, const char *pkgname,
 
 extern int slave_rpc_update_handle(struct slave_node *slave, int handle);
 extern int slave_rpc_ping(struct slave_node *slave);
-extern void slave_rpc_request_update(const char *pkgname, const char *id, const char *cluster, const char *category);
+extern void slave_rpc_request_update(const char *pkgname, const char *id, const char *cluster, const char *category, const char *content);
 extern int slave_rpc_handle(struct slave_node *slave);
 extern int slave_rpc_ping_freeze(struct slave_node *slave);
 extern int slave_rpc_ping_thaw(struct slave_node *slave);

diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec
index 235bbb8..39ef46c 100644 (file)
--- a/packaging/data-provider-master.spec
+++ b/packaging/data-provider-master.spec
@@ -1,6 +1,6 @@
 Name: data-provider-master
 Summary: Master service provider for liveboxes
-Version: 0.25.24
+Version: 0.25.25
 Release: 1
 Group: HomeTF/Livebox
 License: Flora

diff --git a/src/instance.c b/src/instance.c
index 04144d1..ab6669c 100644 (file)
--- a/src/instance.c
+++ b/src/instance.c
@@ -682,7 +682,7 @@ static Eina_Bool update_timer_cb(void *data)
 {
        struct inst_info *inst = (struct inst_info *)data;
 
-       slave_rpc_request_update(package_name(inst->info), inst->id, inst->cluster, inst->category);
+       slave_rpc_request_update(package_name(inst->info), inst->id, inst->cluster, inst->category, NULL);
        return ECORE_CALLBACK_RENEW;
 }
 

diff --git a/src/server.c b/src/server.c
index 2cf347c..778bfe3 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -5027,7 +5027,7 @@ static inline int update_pkg_cb(struct category *category, const char *pkgname)
        }
 
        DbgPrint("Send refresh request: %s (%s/%s)\n", pkgname, c_name, s_name);
-       slave_rpc_request_update(pkgname, "", c_name, s_name);
+       slave_rpc_request_update(pkgname, "", c_name, s_name, NULL);
 
        /* Just try to create a new package */
        if (util_free_space(IMAGE_PATH) > MINIMUM_SPACE) {
@@ -5080,7 +5080,7 @@ static struct packet *client_update(pid_t pid, int handle, const struct packet *
                /* PERMISSIONS */
                ErrPrint("Insufficient permissions [%s] - %d\n", pkgname, pid);
        } else {
-               slave_rpc_request_update(pkgname, id, instance_cluster(inst), instance_category(inst));
+               slave_rpc_request_update(pkgname, id, instance_cluster(inst), instance_category(inst), NULL);
        }
 
 out:
@@ -6248,11 +6248,12 @@ static struct packet *service_update(pid_t pid, int handle, const struct packet
        const char *id;
        const char *cluster;
        const char *category;
+       const char *content;
        char *lbid;
        int ret;
 
-       ret = packet_get(packet, "ssss", &pkgname, &id, &cluster, &category);
-       if (ret != 4) {
+       ret = packet_get(packet, "sssss", &pkgname, &id, &cluster, &category, &content);
+       if (ret != 5) {
                ErrPrint("Invalid Packet\n");
                ret = LB_STATUS_ERROR_INVALID;
                goto out;
@@ -6307,7 +6308,7 @@ static struct packet *service_update(pid_t pid, int handle, const struct packet
         * \TODO
         * Validate the update requstor.
         */
-       slave_rpc_request_update(lbid, id, cluster, category);
+       slave_rpc_request_update(lbid, id, cluster, category, content);
        DbgFree(lbid);
        ret = LB_STATUS_SUCCESS;
 

diff --git a/src/slave_rpc.c b/src/slave_rpc.c
index d316331..14e2a1f 100644 (file)
--- a/src/slave_rpc.c
+++ b/src/slave_rpc.c
@@ -640,7 +640,7 @@ HAPI int slave_rpc_ping_thaw(struct slave_node *slave)
        return LB_STATUS_SUCCESS;
 }
 
-HAPI void slave_rpc_request_update(const char *pkgname, const char *id, const char *cluster, const char *category)
+HAPI void slave_rpc_request_update(const char *pkgname, const char *id, const char *cluster, const char *category, const char *content)
 {
        struct slave_node *slave;
        struct pkg_info *info;
@@ -658,7 +658,7 @@ HAPI void slave_rpc_request_update(const char *pkgname, const char *id, const ch
                return;
        }
 
-       packet = packet_create_noack("update_content", "ssss", pkgname, id, cluster, category);
+       packet = packet_create_noack("update_content", "sssss", pkgname, id, cluster, category, content);
        if (!packet) {
                ErrPrint("Failed to create a new param\n");
                return;