changing the license to apache 2

[src/app-framework-binder.git] / src / afb-api-so.c

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 2616e0b..093a8a9 100644 (file)
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -2,22 +2,17 @@
  * Copyright (C) 2016 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
- * 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/>.
- * 
- * Contain all generic part to handle REST/API
- * 
- *  https://www.gnu.org/software/libmicrohttpd/tutorial.html [search 'largepost.c']
+ * 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
@@ -56,21 +51,15 @@ static int api_timeout = 15;
 
 static const char plugin_register_function[] = "pluginRegister";
 
-static const struct afb_poll_itf upoll_itf = {
+static const struct afb_pollitf upollitf = {
+       .wait = (void*)upoll_wait,
+       .open = (void*)upoll_open,
        .on_readable = (void*)upoll_on_readable,
        .on_writable = (void*)upoll_on_writable,
        .on_hangup = (void*)upoll_on_hangup,
        .close = (void*)upoll_close
 };
 
-static struct afb_poll itf_poll_open(int fd, void *closure)
-{
-       struct afb_poll result;
-       result.data = upoll_open(fd, closure);
-       result.itf = result.data ? &upoll_itf : NULL;
-       return result;
-}
-
 static void free_context(struct api_so_desc *desc, void *context)
 {
        void (*cb)(void*);
@@ -198,7 +187,8 @@ int afb_api_so_add_plugin(const char *path)
        /* init the interface */
        desc->interface.verbosity = 0;
        desc->interface.mode = AFB_MODE_LOCAL;
-       desc->interface.poll_open = itf_poll_open;
+       desc->interface.pollitf = &upollitf;
+       desc->interface.pollclosure = NULL;
 
        /* init the plugin */
        desc->plugin = pluginRegisterFct(&desc->interface);