Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-ws & websocket: Fix writing very long data
[src/app-framework-binder.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
91c7aae
..
150b781
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-17,7
+17,6
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
@@
-284,7
+283,6
@@
static struct afb_hsrv *start_http_server()
/*---------------------------------------------------------
| execute_command
/*---------------------------------------------------------
| execute_command
- |
+--------------------------------------------------------- */
static void on_sigchld(int signum, siginfo_t *info, void *uctx)
+--------------------------------------------------------- */
static void on_sigchld(int signum, siginfo_t *info, void *uctx)
@@
-397,6
+395,7
@@
static int execute_command()
{
struct sigaction siga;
char port[20];
{
struct sigaction siga;
char port[20];
+ const char *token;
int rc;
/* check whether a command is to execute or not */
int rc;
/* check whether a command is to execute or not */
@@
-427,8
+426,9
@@
static int execute_command()
}
else {
/* instanciate arguments and environment */
}
else {
/* instanciate arguments and environment */
- if (instanciate_command_args(port, config->token) >= 0
- && instanciate_environ(port, config->token) >= 0) {
+ token = afb_session_initial_token();
+ if (instanciate_command_args(port, token) >= 0
+ && instanciate_environ(port, token) >= 0) {
/* run */
if (!SELF_PGROUP)
setpgid(0, 0);
/* run */
if (!SELF_PGROUP)
setpgid(0, 0);
@@
-504,8
+504,8
@@
static void startup_call_current(struct startup_req *sreq)
sreq->xreq.context.validated = 1;
sreq->api = strndup(api, verb - api);
sreq->verb = strndup(verb + 1, json - verb - 1);
sreq->xreq.context.validated = 1;
sreq->api = strndup(api, verb - api);
sreq->verb = strndup(verb + 1, json - verb - 1);
- sreq->xreq.api = sreq->api;
- sreq->xreq.verb = sreq->verb;
+ sreq->xreq.
request.
api = sreq->api;
+ sreq->xreq.
request.
verb = sreq->verb;
sreq->xreq.json = json_tokener_parse(json + 1);
if (sreq->api && sreq->verb && sreq->xreq.json) {
afb_xreq_process(&sreq->xreq, main_apiset);
sreq->xreq.json = json_tokener_parse(json + 1);
if (sreq->api && sreq->verb && sreq->xreq.json) {
afb_xreq_process(&sreq->xreq, main_apiset);
@@
-525,7
+525,7
@@
static void run_startup_calls()
list = config->calls;
if (list) {
sreq = calloc(1, sizeof *sreq);
list = config->calls;
if (list) {
sreq = calloc(1, sizeof *sreq);
- sreq->session = afb_session_create(
"startup",
3600);
+ sreq->session = afb_session_create(3600);
sreq->current = list;
startup_call_current(sreq);
}
sreq->current = list;
startup_call_current(sreq);
}