changing the license to apache 2

[src/app-framework-binder.git] / plugins / afm-main-plugin / afm-main-plugin.c

diff --git a/plugins/afm-main-plugin/afm-main-plugin.c b/plugins/afm-main-plugin/afm-main-plugin.c
index d86e926..efa83ba 100644 (file)
--- a/plugins/afm-main-plugin/afm-main-plugin.c
+++ b/plugins/afm-main-plugin/afm-main-plugin.c
@@ -2,18 +2,17 @@
  * Copyright (C) 2015 "IoT.bzh"
  * Author "Fulup Ar Foll"
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #define _GNU_SOURCE         /* See feature_test_macros(7) */
@@ -23,7 +22,9 @@
 
 #include "afb-plugin.h"
 #include "afb-req-itf.h"
+#include "afb-poll-itf.h"
 
+#include "utils-sbus.h"
 #include "utils-jbus.h"
 
 static const char _auto_[]      = "auto";
@@ -91,7 +92,7 @@ static void call_appid(struct afb_req request, const char *method)
 {
        struct json_object *obj;
        char *sid;
-       const char *id = afb_req_argument(request, _id_);
+       const char *id = afb_req_value(request, _id_);
        if (id == NULL) {
                afb_req_fail(request, "bad-request", "missing 'id'");
                return;
@@ -114,7 +115,7 @@ static void call_appid(struct afb_req request, const char *method)
 static void call_runid(struct afb_req request, const char *method)
 {
        struct json_object *obj;
-       const char *id = afb_req_argument(request, _runid_);
+       const char *id = afb_req_value(request, _runid_);
        if (id == NULL) {
                afb_req_fail(request, "bad-request", "missing 'runid'");
                return;
@@ -151,13 +152,13 @@ static void start(struct afb_req request)
        int rc;
 
        /* get the id */
-       id = afb_req_argument(request, _id_);
+       id = afb_req_value(request, _id_);
        if (id == NULL) {
                afb_req_fail(request, "bad-request", "missing 'id'");
                return;
        }
        /* get the mode */
-       mode = afb_req_argument(request, _mode_);
+       mode = afb_req_value(request, _mode_);
        if (mode == NULL || !strcmp(mode, _auto_)) {
                mode = interface->mode == AFB_MODE_REMOTE ? _remote_ : _local_;
        }
@@ -221,8 +222,8 @@ static void install(struct afb_req request)
 
        /* get the argument */
        arg = afb_req_get(request, "widget");
-       filename = arg.value;
-       if (filename == NULL || !arg.is_file) {
+       filename = arg.path;
+       if (filename == NULL) {
                afb_req_fail(request, "bad-request", "missing 'widget' file");
                return;
        }
@@ -276,14 +277,33 @@ static const struct AFB_plugin plug_desc = {
        .apis = plug_apis
 };
 
+static struct sbus_itf sbusitf;
+
 const struct AFB_plugin *pluginRegister(const struct AFB_interface *itf)
 {
+       struct sbus *sbus;
+
+       if (interface != NULL)
+               return NULL;
+
        interface = itf;
+       sbusitf.wait = itf->pollitf->wait;
+       sbusitf.open = itf->pollitf->open;
+       sbusitf.on_readable = itf->pollitf->on_readable;
+       sbusitf.on_writable = itf->pollitf->on_writable;
+       sbusitf.on_hangup = itf->pollitf->on_hangup;
+       sbusitf.close = itf->pollitf->close;
+
+       sbus = sbus_session(&sbusitf, itf->pollclosure);
+       if (sbus == NULL) {
+               fprintf(stderr, "ERROR: %s:%d: can't connect to DBUS session\n", __FILE__, __LINE__);
+               return NULL;
+       }
 
-       jbus = create_jbus_session("/org/AGL/afm/user");
+       jbus = create_jbus(sbus, "/org/AGL/afm/user");
         if (jbus)
                return &plug_desc;
-       fprintf(stderr, "ERROR: %s:%d: can't connect to DBUS session\n", __FILE__, __LINE__);
+       sbus_unref(sbus);
        return NULL;
 }