X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FSamplePost.c;h=f484d1315f08cbedbffb984ffce5d36e4c3b01b5;hb=469e619ac45402471ea7d8c792ffc06e79346ef2;hp=c4b9bc2ef1b36fb6d466fd934cec19605181b1fc;hpb=3f13bc8ca416e6318bcbd199113a2cd69b11b2b6;p=src%2Fapp-framework-binder.git
diff --git a/plugins/samples/SamplePost.c b/plugins/samples/SamplePost.c
index c4b9bc2e..f484d131 100644
--- a/plugins/samples/SamplePost.c
+++ b/plugins/samples/SamplePost.c
@@ -2,137 +2,93 @@
* 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 .
+ * 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
+#include
+#include
+#include
-#include "local-def.h"
+#include "afb-plugin.h"
-// In this case or handle is quite basic
-typedef struct {
- int fd;
-} appPostCtx;
+// Sample Generic Ping Debug API
+static void getPingTest(struct afb_req request)
+{
+ static int pingcount = 0;
+ json_object *query = afb_req_json(request);
-// This function is call when PostForm processing is completed
-STATIC void DonePostForm (AFB_request *request) {
- AFB_PostHandle *postHandle = (AFB_PostHandle*)request->post->data;
- appPostCtx *appCtx= postHandle->ctx;
-
- // Close upload file ID
- close (appCtx->fd);
-
- // Free application specific handle
- free (postHandle->ctx);
-
- if (verbose) fprintf (stderr, "DonePostForm upload done\n");
+ afb_req_success_f(request, query, "Ping Binder Daemon count=%d", ++pingcount);
}
+// With content-type=json data are directly avaliable in request->post->data
+static void GetJsonByPost (struct afb_req request)
+{
+ struct afb_arg arg;
+ json_object* jresp;
+ json_object *query = afb_req_json(request);
-// WARNING: PostForm callback are call multiple time (one or each key within form)
-// When processing POST_JSON request->data hold a PostHandle and not data directly as for POST_JSON
-STATIC json_object* ProcessPostForm (AFB_request *request, AFB_PostItem *item) {
-
- AFB_PostHandle *postHandle;
- appPostCtx *appCtx;
- char filepath[512];
-
- // When Post is fully processed the same callback is call with a item==NULL
- if (item == NULL) {
- // Close file, Free handle
-
- request->errcode = MHD_HTTP_OK;
- return(jsonNewMessage(AFB_SUCCESS,"File [%s] uploaded at [%s] error=\n", item->filename, request->config->sessiondir));
- }
-
- // Let's make sure this is a valid PostForm request
- if (!request->post && request->post->type != AFB_POST_FORM) {
- request->errcode = MHD_HTTP_FORBIDDEN;
- return(jsonNewMessage(AFB_FAIL,"This is not a valid PostForm request\n"));
- } else {
- // In AFB_POST_FORM case post->data is a PostForm handle
- postHandle = (AFB_PostHandle*) request->post->data;
- appCtx = (appPostCtx*) postHandle->ctx;
- }
-
- // Check this is a file element
- if (0 != strcmp (item->key, "file")) {
- request->errcode = MHD_HTTP_FORBIDDEN;
- return (jsonNewMessage(AFB_FAIL,"No File within element key=%s\n", item->key));
- }
-
- // This is the 1st Item iteration let's open output file and allocate necessary resources
- if (postHandle->ctx == NULL) {
- int fd;
-
- strncpy (filepath, request->config->sessiondir, sizeof(filepath));
- strncat (filepath, "/", sizeof(filepath));
- strncat (filepath, item->filename, sizeof(filepath));
+ arg = afb_req_get(request, "");
+ jresp = arg.value ? json_tokener_parse(arg.value) : NULL;
+ afb_req_success_f(request, jresp, "GetJsonByPost query={%s}", json_object_to_json_string(query));
+}
- if((fd = open(request->config->sessiondir, O_RDONLY)) < 0) {
- request->errcode = MHD_HTTP_FORBIDDEN;
- return (jsonNewMessage(AFB_FAIL,"Fail to Upload file [%s] at [%s] error=\n", item->filename, request->config->sessiondir, strerror(errno)));
- };
+// Upload a file and execute a function when upload is done
+static void Uploads (struct afb_req request, const char *destination)
+{
+ afb_req_fail_f(request, "unimplemented", "destination: %s", destination);
+}
- // Create an application specific context
- appCtx = malloc (sizeof(appPostCtx)); // May place anything here until post->completeCB handle resources liberation
- appCtx->fd = fd;
-
- // attach application to postHandle
- postHandle->ctx = (void*) appCtx; // May place anything here until post->completeCB handle resources liberation
- postHandle->completeCB = (AFB_apiCB)DonePostForm; // CallBack when Form Processing is finished
-
- } else {
- // this is not the call, FD is already open
- appCtx = (appPostCtx*) postHandle->ctx;
- }
+// Upload a file and execute a function when upload is done
+static void UploadAppli (struct afb_req request)
+{
+ Uploads(request, "applications");
+}
- // We have something to write
- if (item->len > 0) {
-
- if (!write (appCtx->fd, item->data, item->len)) {
- request->errcode = MHD_HTTP_FORBIDDEN;
- return (jsonNewMessage(AFB_FAIL,"Fail to write file [%s] at [%s] error=\n", item->filename, strerror(errno)));
- }
- }
-
- // every event should return Sucess or Form processing stop
- request->errcode = MHD_HTTP_OK;
- return NULL;
+// Simples Upload case just upload a file
+static void UploadMusic (struct afb_req request)
+{
+ Uploads(request, "musics");
}
-// This function is call when Client Session Context is removed
-// Note: when freeCtxCB==NULL standard free/malloc is called
-STATIC void clientContextFree(AFB_clientCtx *client) {
- fprintf (stderr,"Plugin[%s] Closing Session uuid=[%s]\n", client->plugin->prefix, client->uuid);
- free (client->ctx);
+// PostForm callback is called multiple times (one or each key within form, or once per file buffer)
+// When file has been fully uploaded call is call with item==NULL
+static void UploadImage (struct afb_req request)
+{
+ Uploads(request, "images");
}
-STATIC AFB_restapi pluginApis[]= {
- {"ping" , AFB_SESSION_NONE , (AFB_apiCB)apiPingTest ,"Ping Rest Test Service"},
- {"upload" , AFB_SESSION_NONE , (AFB_apiCB)ProcessPostForm ,"Demo for file upload"},
+
+// NOTE: this sample does not use session to keep test a basic as possible
+// in real application upload-xxx should be protected with AFB_SESSION_CHECK
+static const struct AFB_restapi pluginApis[]= {
+ {"ping" , AFB_SESSION_NONE , getPingTest ,"Ping Rest Test Service"},
+ {"upload-json" , AFB_SESSION_NONE , GetJsonByPost ,"Demo for Json Buffer on Post"},
+ {"upload-image" , AFB_SESSION_NONE , UploadImage ,"Demo for file upload"},
+ {"upload-music" , AFB_SESSION_NONE , UploadMusic ,"Demo for file upload"},
+ {"upload-appli" , AFB_SESSION_NONE , UploadAppli ,"Demo for file upload"},
{NULL}
};
-PUBLIC AFB_plugin *afsvRegister () {
- AFB_plugin *plugin = malloc (sizeof (AFB_plugin));
- plugin->type = AFB_PLUGIN_JSON;
- plugin->info = "Application Framework Binder Service";
- plugin->prefix= "post"; // url base
- plugin->apis = pluginApis;
- plugin->handle= (void*) "What ever you want";
- plugin->freeCtxCB= (void*) clientContextFree;
-
- return (plugin);
-};
\ No newline at end of file
+static const struct AFB_plugin plugin_desc = {
+ .type = AFB_PLUGIN_JSON,
+ .info = "Sample with Post Upload Files",
+ .prefix = "post",
+ .apis = pluginApis
+};
+
+const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)
+{
+ return &plugin_desc;
+};