diff options
| -rw-r--r-- | nbproject/configurations.xml | 112 | ||||
| -rw-r--r-- | plugins/samples/SamplePost.c | 12 | ||||
| -rw-r--r-- | src/helper-api.c | 14 | ||||
| -rw-r--r-- | src/rest-api.c | 45 |
4 files changed, 103 insertions, 80 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index f87ca56e..93b861c7 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -16,6 +16,7 @@ <in>radio-rtlsdr.c</in> </df> <df name="samples"> + <in>ClientCtx.c</in> <in>HelloWorld.c</in> <in>SamplePost.c</in> </df> @@ -96,7 +97,6 @@ <pElem>include</pElem> <pElem>/usr/include/json-c</pElem> <pElem>/usr/include/uuid</pElem> - <pElem>/usr/include/alsa</pElem> </incDir> </cTool> </folder> @@ -105,6 +105,14 @@ <incDir> <pElem>plugins/afm-main-plugin</pElem> </incDir> + <preprocessorList> + <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem> + <Elem>__PIC__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> + <Elem>afm_main_api_EXPORTS=1</Elem> + </preprocessorList> </cTool> </folder> <folder path="0/plugins/audio"> @@ -126,6 +134,7 @@ <folder path="0/plugins/radio"> <cTool> <incDir> + <pElem>/usr/include/alsa</pElem> <pElem>/usr/include/libusb-1.0</pElem> <pElem>build/plugins</pElem> <pElem>plugins/radio</pElem> @@ -135,16 +144,8 @@ </folder> <folder path="0/plugins/samples"> <cTool> - <incDir> - <pElem>plugins/samples</pElem> - <pElem>build/plugins/samples</pElem> - </incDir> <preprocessorList> <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem> - <Elem>__PIC__=2</Elem> - <Elem>__REGISTER_PREFIX__=</Elem> - <Elem>__USER_LABEL_PREFIX__=</Elem> - <Elem>__pic__=2</Elem> </preprocessorList> </cTool> </folder> @@ -172,14 +173,6 @@ <incDir> <pElem>build/plugins/afm-main-plugin</pElem> </incDir> - <preprocessorList> - <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem> - <Elem>__PIC__=2</Elem> - <Elem>__REGISTER_PREFIX__=</Elem> - <Elem>__USER_LABEL_PREFIX__=</Elem> - <Elem>__pic__=2</Elem> - <Elem>afm_main_api_EXPORTS=1</Elem> - </preprocessorList> </cTool> </item> <item path="plugins/afm-main-plugin/utils-jbus.c" @@ -212,17 +205,46 @@ <cTool flags="2"> </cTool> </item> + <item path="plugins/samples/ClientCtx.c" ex="false" tool="0" flavor2="2"> + <cTool flags="2"> + <incDir> + <pElem>plugins/samples</pElem> + <pElem>build/plugins/samples</pElem> + </incDir> + <preprocessorList> + <Elem>__PIC__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> + <Elem>clientCtx_api_EXPORTS=1</Elem> + </preprocessorList> + </cTool> + </item> <item path="plugins/samples/HelloWorld.c" ex="false" tool="0" flavor2="2"> <cTool flags="2"> + <incDir> + <pElem>plugins/samples</pElem> + <pElem>build/plugins/samples</pElem> + </incDir> <preprocessorList> + <Elem>__PIC__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> <Elem>helloWorld_api_EXPORTS=1</Elem> </preprocessorList> </cTool> </item> <item path="plugins/samples/SamplePost.c" ex="false" tool="0" flavor2="2"> - <cTool flags="2"> + <cTool flags="0"> + <incDir> + <pElem>/usr/include/dbus-1.0</pElem> + <pElem>/usr/lib64/dbus-1.0/include</pElem> + <pElem>/usr/include/alsa</pElem> + <pElem>build/plugins/samples</pElem> + </incDir> <preprocessorList> - <Elem>samplePost_api_EXPORTS=1</Elem> + <Elem>samplePost_api_EXPORTS</Elem> </preprocessorList> </cTool> </item> @@ -259,19 +281,20 @@ </cTool> </item> <item path="src/config.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="2"> <incDir> - <pElem>include</pElem> + <pElem>src</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>include</pElem> <pElem>/usr/include/uuid</pElem> - <pElem>/usr/include/dbus-1.0</pElem> - <pElem>/usr/lib64/dbus-1.0/include</pElem> - <pElem>/usr/include/alsa</pElem> <pElem>build/src</pElem> </incDir> <preprocessorList> - <Elem>HAVE_AUDIO_PLUGIN=1</Elem> <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem> + <Elem>__PIC__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> </preprocessorList> </cTool> </item> @@ -290,14 +313,19 @@ </cTool> </item> <item path="src/helper-api.c" ex="false" tool="0" flavor2="2"> - <cTool flags="2"> + <cTool flags="0"> <incDir> - <pElem>src</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>include</pElem> + <pElem>/usr/include/json-c</pElem> <pElem>/usr/include/uuid</pElem> + <pElem>/usr/include/dbus-1.0</pElem> + <pElem>/usr/lib64/dbus-1.0/include</pElem> + <pElem>/usr/include/alsa</pElem> <pElem>build/src</pElem> </incDir> + <preprocessorList> + <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem> + </preprocessorList> </cTool> </item> <item path="src/http-svc.c" ex="false" tool="0" flavor2="2"> @@ -312,19 +340,20 @@ </cTool> </item> <item path="src/main.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="2"> <incDir> - <pElem>include</pElem> + <pElem>src</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>include</pElem> <pElem>/usr/include/uuid</pElem> - <pElem>/usr/include/dbus-1.0</pElem> - <pElem>/usr/lib64/dbus-1.0/include</pElem> - <pElem>/usr/include/alsa</pElem> <pElem>build/src</pElem> </incDir> <preprocessorList> - <Elem>HAVE_AUDIO_PLUGIN=1</Elem> <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem> + <Elem>__PIC__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> </preprocessorList> </cTool> </item> @@ -352,30 +381,25 @@ <pElem>include</pElem> <pElem>/usr/include/json-c</pElem> <pElem>/usr/include/uuid</pElem> + <pElem>/usr/include/dbus-1.0</pElem> + <pElem>/usr/lib64/dbus-1.0/include</pElem> <pElem>/usr/include/alsa</pElem> <pElem>build/src</pElem> </incDir> <preprocessorList> - <Elem>HAVE_AUDIO_PLUGIN=1</Elem> <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem> </preprocessorList> </cTool> </item> <item path="src/session.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="2"> <incDir> - <pElem>include</pElem> + <pElem>src</pElem> <pElem>/usr/include/json-c</pElem> <pElem>/usr/include/uuid</pElem> - <pElem>/usr/include/dbus-1.0</pElem> - <pElem>/usr/lib64/dbus-1.0/include</pElem> - <pElem>/usr/include/alsa</pElem> + <pElem>include</pElem> <pElem>build/src</pElem> </incDir> - <preprocessorList> - <Elem>HAVE_AUDIO_PLUGIN=1</Elem> - <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem> - </preprocessorList> </cTool> </item> </conf> diff --git a/plugins/samples/SamplePost.c b/plugins/samples/SamplePost.c index 9828349a..e419be45 100644 --- a/plugins/samples/SamplePost.c +++ b/plugins/samples/SamplePost.c @@ -47,14 +47,10 @@ STATIC json_object* UploadAppli (AFB_request *request, AFB_PostItem *item) { // This is called after PostForm and then after DonePostForm if (item == NULL) { - AFB_PostCtx *postFileCtx = getPostContext(request); - if (postFileCtx != NULL) { - - // Do something intelligent here to install application - - postFileCtx->errcode = MHD_HTTP_OK; // or error is something went wrong; - postFileCtx->jresp = jsonNewMessage(AFB_SUCCESS,"UploadFile Post Appli=%s done", getPostPath (request)); - } + // Do something intelligent here to install application + request->errcode = MHD_HTTP_OK; // or error is something went wrong; + request->jresp = jsonNewMessage(AFB_SUCCESS,"UploadFile Post Appli=%s done", getPostPath (request)); + // Note: should not return here in order getPostedFile to clear Post resources. } // upload multi iteration logic is handle by getPostedFile diff --git a/src/helper-api.c b/src/helper-api.c index 12539978..ad0daf69 100644 --- a/src/helper-api.c +++ b/src/helper-api.c @@ -124,11 +124,9 @@ PUBLIC json_object* getPostFile (AFB_request *request, AFB_PostItem *item, char* } // We have a context but last Xform iteration fail or application set a message - if (postFileCtx->jresp != NULL) { - jresp = postFileCtx->jresp; // retrieve previous error from postCtx - if (postFileCtx->errcode != 0) request->errcode=postFileCtx->errcode; - } - else jresp = jsonNewMessage(AFB_FAIL,"getPostFile Post Request done"); + if (request->jresp != NULL) { + jresp = request->jresp; // retrieve previous error from postCtx + } else jresp = jsonNewMessage(AFB_FAIL,"getPostFile Post Request done"); // Error or not let's free all resources close(postFileCtx->fd); @@ -164,7 +162,6 @@ PUBLIC json_object* getPostFile (AFB_request *request, AFB_PostItem *item, char* // Create an application specific context postFileCtx = calloc (1, sizeof(AFB_PostCtx)); // May place anything here until post->completeCB handle resources liberation - postFileCtx->path = strdup (filepath); // attach application to postHandle postHandle->ctx = (void*) postFileCtx; // May place anything here until post->completeCB handle resources liberation @@ -175,8 +172,8 @@ PUBLIC json_object* getPostFile (AFB_request *request, AFB_PostItem *item, char* strncat (filepath, "/", sizeof(filepath)); strncat (filepath, destination, sizeof(filepath)); } else strncpy (filepath, destination, sizeof(filepath)); - + // make sure destination directory exist destDir = opendir (filepath); if (destDir == NULL) { @@ -189,6 +186,9 @@ PUBLIC json_object* getPostFile (AFB_request *request, AFB_PostItem *item, char* strncat (filepath, "/", sizeof(filepath)); strncat (filepath, item->filename, sizeof(filepath)); + postFileCtx->path = strdup (filepath); + if (verbose) fprintf(stderr, "getPostFile path=%s\n", filepath); + if((postFileCtx->fd = open(filepath, O_RDWR |O_CREAT, S_IRWXU|S_IRGRP)) <= 0) { postFileCtx->jresp= jsonNewMessage(AFB_FAIL,"Fail to Create destination File=[%s] error=%s\n", filepath, strerror(errno)); goto ExitOnError; diff --git a/src/rest-api.c b/src/rest-api.c index dd5c59b9..b0d7af00 100644 --- a/src/rest-api.c +++ b/src/rest-api.c @@ -51,7 +51,7 @@ PUBLIC void endPostRequest(AFB_PostHandle *postHandle) { // Check of apiurl is declare in this plugin and call it STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) { - json_object *jresp, *jcall; + json_object *jresp, *jcall, *jreqt; int idx, status, sig; AFB_clientCtx *clientCtx; AFB_plugin *plugin = request->plugins[plugidx]; @@ -79,9 +79,9 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) if (!strcmp(plugin->apis[idx].name, request->api)) { // Request was found and at least partially executed - request->jresp = json_object_new_object(); + jreqt = json_object_new_object(); json_object_get (afbJsonType); // increate jsontype reference count - json_object_object_add (request->jresp, "jtype", afbJsonType); + json_object_object_add (jreqt, "jtype", afbJsonType); // prepare an object to store calling values jcall=json_object_new_object(); @@ -95,7 +95,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) // Plugin aborted somewhere during its execution json_object_object_add(jcall, "status", json_object_new_string ("abort")); json_object_object_add(jcall, "info" , json_object_new_string ("Plugin broke during execution")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); } else { @@ -106,7 +106,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) request->errcode = MHD_HTTP_UNPROCESSABLE_ENTITY; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("Setting Timeout Handler Failed")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); return AFB_DONE; } } @@ -123,7 +123,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) request->errcode=MHD_HTTP_INSUFFICIENT_STORAGE; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("Client Session Context Full !!!")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); return (AFB_DONE); }; @@ -137,7 +137,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("exist")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_CREATE Session already exist")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); return (AFB_DONE); } @@ -145,7 +145,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_CREATE Invalid Initial Token")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); return (AFB_DONE); } else { json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid)); @@ -160,7 +160,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_REFRESH Broken Exchange Token Chain")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); return (AFB_DONE); } else { json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid)); @@ -174,7 +174,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("empty")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_CLOSE Not a Valid Access Token")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); return (AFB_DONE); } else { json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid)); @@ -188,7 +188,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_CHECK Invalid Active Token")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); return (AFB_DONE); } break; @@ -198,8 +198,11 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) // Effectively CALL PLUGIN API with a subset of the context jresp = plugin->apis[idx].callback(request, context); + // prefix response with request object; + request->jresp = jreqt; + // Store context in case it was updated by plugins - clientCtx->contexts[plugidx] = request->context; + if (request->context != NULL) clientCtx->contexts[plugidx] = request->context; // handle intermediary Post Iterates out of band if ((jresp == NULL) && (request->errcode == MHD_HTTP_OK)) return (AFB_SUCCESS); @@ -267,7 +270,7 @@ ExitOnError: // This CB is call for every item with a form post it reformat iterator values // and callback Plugin API for each Item within PostForm. -doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key, +STATIC int doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *mimetype, const char *encoding, const char *data, uint64_t offset, size_t size) { @@ -304,7 +307,7 @@ doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key, if (status != AFB_SUCCESS) return MHD_NO; // let's allow iterator to move to next item - return (MHD_YES); + return MHD_YES; } STATIC void freeRequest (AFB_request *request) { @@ -322,7 +325,7 @@ STATIC AFB_request *createRequest (struct MHD_Connection *connection, AFB_sessio // Start with a clean request request = calloc (1, sizeof (AFB_request)); char *urlcpy1, *urlcpy2; - char *baseapi, *baseurl; + char *baseapi, *baseurl; // Extract plugin urlpath from request and make two copy because strsep overload copy urlcpy1 = urlcpy2 = strdup(url); @@ -368,14 +371,16 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co AFB_PostHandle *postHandle; AFB_PostRequest postRequest; int ret; - + + // fprintf (stderr, "doRestAPI method=%s posthandle=0x%x\n", method, con_cls); + // if post data may come in multiple calls if (0 == strcmp(method, MHD_HTTP_METHOD_POST)) { const char *encoding, *param; int contentlen = -1; postHandle = *con_cls; - // This is the initial post event let's create form post structure POST datas come in multiple events + // This is the initial post event let's create form post structure POST data come in multiple events if (postHandle == NULL) { // allocate application POST processor handle to zero @@ -394,15 +399,13 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co // Form post is handle through a PostProcessor and call API once per form key if (strcasestr(encoding, FORM_CONTENT) != NULL) { - if (verbose) fprintf(stderr, "Create PostForm[uid=%d]\n", postHandle->uid); + if (verbose) fprintf(stderr, "Create doPostIterate[uid=%d posthandle=0x%x]\n", postHandle->uid, postHandle); request = createRequest (connection, session, url); if (request->jresp != NULL) goto ProcessApiCall; - - postHandle = malloc(sizeof (AFB_PostHandle)); // allocate application POST processor handle postHandle->type = AFB_POST_FORM; - postHandle->pp = MHD_create_post_processor (connection, MAX_POST_SIZE, doPostIterate, postHandle); postHandle->private= (void*)request; + postHandle->pp = MHD_create_post_processor (connection, MAX_POST_SIZE, &doPostIterate, postHandle); if (NULL == postHandle->pp) { fprintf(stderr,"OOPS: Internal error fail to allocate MHD_create_post_processor\n"); |